From ce3293b2d9907cadd7bd88d3b85d9923c4d83e7f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 2 Aug 2012 11:33:21 +0000 Subject: code cleanup: remove redundant float casts --- source/blender/blenkernel/intern/image.c | 2 +- source/blender/editors/sculpt_paint/paint_image.c | 4 ++-- source/blender/imbuf/intern/imageprocess.c | 18 +++++++++--------- source/blender/imbuf/intern/radiance_hdr.c | 2 +- source/blender/imbuf/intern/scaling.c | 2 +- source/blender/render/intern/source/envmap.c | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 658be1fb494..02fc5a9a62e 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -603,7 +603,7 @@ static ImBuf *add_ibuf_size(unsigned int width, unsigned int height, const char if (floatbuf) { ibuf = IMB_allocImBuf(width, height, depth, IB_rectfloat); - rect_float = (float *)ibuf->rect_float; + rect_float = ibuf->rect_float; ibuf->profile = IB_PROFILE_LINEAR_RGB; } else { diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index 306724de301..789c77f16ae 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -801,7 +801,7 @@ static int project_paint_PickColor(const ProjPaintState *ps, float pt[2], float if (rgba_fp) { if (ibuf->rect_float) { - copy_v4_v4(rgba_fp, ((float *)ibuf->rect_float + ((xi + yi * ibuf->x) * 4))); + copy_v4_v4(rgba_fp, (ibuf->rect_float + ((xi + yi * ibuf->x) * 4))); } else { char *tmp_ch = ((char *)ibuf->rect) + ((xi + yi * ibuf->x) * 4); @@ -1503,7 +1503,7 @@ static ProjPixel *project_paint_uvpixel_init( //memset(projPixel, 0, size); if (ibuf->rect_float) { - projPixel->pixel.f_pt = (float *)ibuf->rect_float + ((x_px + y_px * ibuf->x) * 4); + projPixel->pixel.f_pt = ibuf->rect_float + ((x_px + y_px * ibuf->x) * 4); projPixel->origColor.f[0] = projPixel->newColor.f[0] = projPixel->pixel.f_pt[0]; projPixel->origColor.f[1] = projPixel->newColor.f[1] = projPixel->pixel.f_pt[1]; projPixel->origColor.f[2] = projPixel->newColor.f[2] = projPixel->pixel.f_pt[2]; diff --git a/source/blender/imbuf/intern/imageprocess.c b/source/blender/imbuf/intern/imageprocess.c index 5c389925274..e0483f70e72 100644 --- a/source/blender/imbuf/intern/imageprocess.c +++ b/source/blender/imbuf/intern/imageprocess.c @@ -88,7 +88,7 @@ static void pixel_from_buffer(struct ImBuf *ibuf, unsigned char **outI, float ** *outI = (unsigned char *)ibuf->rect + offset; if (ibuf->rect_float) - *outF = (float *)ibuf->rect_float + offset; + *outF = ibuf->rect_float + offset; } /************************************************************************** @@ -258,16 +258,16 @@ void bilinear_interpolation_color(struct ImBuf *in, unsigned char *outI, float * if (outF) { /* sample including outside of edges of image */ if (x1 < 0 || y1 < 0) row1 = empty; - else row1 = (float *)in->rect_float + in->x * y1 * 4 + 4 * x1; + else row1 = in->rect_float + in->x * y1 * 4 + 4 * x1; if (x1 < 0 || y2 > in->y - 1) row2 = empty; - else row2 = (float *)in->rect_float + in->x * y2 * 4 + 4 * x1; + else row2 = in->rect_float + in->x * y2 * 4 + 4 * x1; if (x2 > in->x - 1 || y1 < 0) row3 = empty; - else row3 = (float *)in->rect_float + in->x * y1 * 4 + 4 * x2; + else row3 = in->rect_float + in->x * y1 * 4 + 4 * x2; if (x2 > in->x - 1 || y2 > in->y - 1) row4 = empty; - else row4 = (float *)in->rect_float + in->x * y2 * 4 + 4 * x2; + else row4 = in->rect_float + in->x * y2 * 4 + 4 * x2; a = u - floorf(u); b = v - floorf(v); @@ -338,10 +338,10 @@ void bilinear_interpolation_color_wrap(struct ImBuf *in, unsigned char *outI, fl if (outF) { /* sample including outside of edges of image */ - row1 = (float *)in->rect_float + in->x * y1 * 4 + 4 * x1; - row2 = (float *)in->rect_float + in->x * y2 * 4 + 4 * x1; - row3 = (float *)in->rect_float + in->x * y1 * 4 + 4 * x2; - row4 = (float *)in->rect_float + in->x * y2 * 4 + 4 * x2; + row1 = in->rect_float + in->x * y1 * 4 + 4 * x1; + row2 = in->rect_float + in->x * y2 * 4 + 4 * x1; + row3 = in->rect_float + in->x * y1 * 4 + 4 * x2; + row4 = in->rect_float + in->x * y2 * 4 + 4 * x2; a = u - floorf(u); b = v - floorf(v); diff --git a/source/blender/imbuf/intern/radiance_hdr.c b/source/blender/imbuf/intern/radiance_hdr.c index 2ba1ebf90b5..4cd50484a64 100644 --- a/source/blender/imbuf/intern/radiance_hdr.c +++ b/source/blender/imbuf/intern/radiance_hdr.c @@ -213,7 +213,7 @@ struct ImBuf *imb_loadhdr(unsigned char *mem, size_t size, int flags) /* read in and decode the actual data */ sline = (RGBE *)MEM_mallocN(sizeof(RGBE) * width, "radhdr_read_tmpscan"); - rect_float = (float *)ibuf->rect_float; + rect_float = ibuf->rect_float; for (y = 0; y < height; y++) { ptr = freadcolrs(sline, ptr, width); diff --git a/source/blender/imbuf/intern/scaling.c b/source/blender/imbuf/intern/scaling.c index 810cb88c06e..a57926f0202 100644 --- a/source/blender/imbuf/intern/scaling.c +++ b/source/blender/imbuf/intern/scaling.c @@ -1313,7 +1313,7 @@ static ImBuf *scaleupy(struct ImBuf *ibuf, int newy) rect += 2 * skipx; } if (do_float) { - rectf = ((float *)ibuf->rect_float) + 4 * (x - 1); + rectf = ibuf->rect_float + 4 * (x - 1); newrectf = _newrectf + 4 * (x - 1); val_af = rectf[0]; diff --git a/source/blender/render/intern/source/envmap.c b/source/blender/render/intern/source/envmap.c index 5879a9bd66d..26bd482af69 100644 --- a/source/blender/render/intern/source/envmap.c +++ b/source/blender/render/intern/source/envmap.c @@ -476,7 +476,7 @@ static void render_envmap(Render *re, EnvMap *env) ibuf->profile = IB_PROFILE_LINEAR_RGB; /* envmap renders without alpha */ - alpha = ((float *)ibuf->rect_float) + 3; + alpha = ibuf->rect_float + 3; for (y = ibuf->x * ibuf->y - 1; y >= 0; y--, alpha += 4) *alpha = 1.0; -- cgit v1.2.3