diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-04-01 04:34:00 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-04-01 08:22:28 +0400 |
| commit | 617557b08ea94e2b65a1697ddf0b79651204d92b (patch) | |
| tree | 50b24bab075b42fa20456140c9a9681cfb01325b /source/blender/imbuf/intern/scaling.c | |
| parent | 2c00ecc738c04dc5dc22d4a6b81a1e937526ba6d (diff) | |
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
Diffstat (limited to 'source/blender/imbuf/intern/scaling.c')
| -rw-r--r-- | source/blender/imbuf/intern/scaling.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/source/blender/imbuf/intern/scaling.c b/source/blender/imbuf/intern/scaling.c index 3c24864c671..d9cec1f3047 100644 --- a/source/blender/imbuf/intern/scaling.c +++ b/source/blender/imbuf/intern/scaling.c @@ -821,13 +821,13 @@ static void q_scale_float(float *in, float *out, int in_width, * * NOTE: disabled, due to unacceptable inaccuracy and quality loss, see bug #18609 (ton) */ -static int q_scale_linear_interpolation( +static bool q_scale_linear_interpolation( struct ImBuf *ibuf, int newx, int newy) { if ((newx >= ibuf->x && newy <= ibuf->y) || (newx <= ibuf->x && newy >= ibuf->y)) { - return FALSE; + return false; } if (ibuf->rect) { @@ -853,7 +853,7 @@ static int q_scale_linear_interpolation( ibuf->x = newx; ibuf->y = newy; - return TRUE; + return true; } static ImBuf *scaledownx(struct ImBuf *ibuf, int newx) @@ -1141,12 +1141,12 @@ static ImBuf *scaleupx(struct ImBuf *ibuf, int newx) if (ibuf->rect == NULL && ibuf->rect_float == NULL) return (ibuf); if (ibuf->rect) { - do_rect = TRUE; + do_rect = true; _newrect = MEM_mallocN(newx * ibuf->y * sizeof(int), "scaleupx"); if (_newrect == NULL) return(ibuf); } if (ibuf->rect_float) { - do_float = TRUE; + do_float = true; _newrectf = MEM_mallocN(newx * ibuf->y * sizeof(float) * 4, "scaleupxf"); if (_newrectf == NULL) { if (_newrect) MEM_freeN(_newrect); @@ -1298,7 +1298,8 @@ static ImBuf *scaleupy(struct ImBuf *ibuf, int newy) float val_bf, nval_bf, diff_bf; float val_gf, nval_gf, diff_gf; float val_rf, nval_rf, diff_rf; - int x, y, do_rect = FALSE, do_float = FALSE, skipx; + int x, y, skipx; + bool do_rect = false, do_float = false; val_a = nval_a = diff_a = val_b = nval_b = diff_b = 0; val_g = nval_g = diff_g = val_r = nval_r = diff_r = 0; @@ -1308,12 +1309,12 @@ static ImBuf *scaleupy(struct ImBuf *ibuf, int newy) if (ibuf->rect == NULL && ibuf->rect_float == NULL) return (ibuf); if (ibuf->rect) { - do_rect = TRUE; + do_rect = true; _newrect = MEM_mallocN(ibuf->x * newy * sizeof(int), "scaleupy"); if (_newrect == NULL) return(ibuf); } if (ibuf->rect_float) { - do_float = TRUE; + do_float = true; _newrectf = MEM_mallocN(ibuf->x * newy * sizeof(float) * 4, "scaleupyf"); if (_newrectf == NULL) { if (_newrect) MEM_freeN(_newrect); @@ -1527,16 +1528,17 @@ struct ImBuf *IMB_scalefastImBuf(struct ImBuf *ibuf, unsigned int newx, unsigned { unsigned int *rect, *_newrect, *newrect; struct imbufRGBA *rectf, *_newrectf, *newrectf; - int x, y, do_float = FALSE, do_rect = FALSE; + int x, y; + bool do_float = false, do_rect = false; int ofsx, ofsy, stepx, stepy; rect = NULL; _newrect = NULL; newrect = NULL; rectf = NULL; _newrectf = NULL; newrectf = NULL; if (ibuf == NULL) return(NULL); - if (ibuf->rect) do_rect = TRUE; - if (ibuf->rect_float) do_float = TRUE; - if (do_rect == FALSE && do_float == FALSE) return(ibuf); + if (ibuf->rect) do_rect = true; + if (ibuf->rect_float) do_float = true; + if (do_rect == false && do_float == false) return(ibuf); if (newx == ibuf->x && newy == ibuf->y) return(ibuf); |