sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

code cleanup: remove redundant float casts

Browse Source
This commit is contained in:
Campbell Barton 2012-08-02 11:33:21 +00:00
parent b9378a3083
commit ce3293b2d9
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/image.c
View File

@ -603,7 +603,7 @@ static ImBuf *add_ibuf_size(unsigned int width, unsigned int height, const char
if (floatbuf) { if (floatbuf) {
ibuf = IMB_allocImBuf(width, height, depth, IB_rectfloat); 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; ibuf->profile = IB_PROFILE_LINEAR_RGB;
} }
else { else {

4
source/blender/editors/sculpt_paint/paint_image.c
View File

@ -801,7 +801,7 @@ static int project_paint_PickColor(const ProjPaintState *ps, float pt[2], float
if (rgba_fp) { if (rgba_fp) {
if (ibuf->rect_float) { 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 { else {
char *tmp_ch = ((char *)ibuf->rect) + ((xi + yi * ibuf->x) * 4); 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); //memset(projPixel, 0, size);
if (ibuf->rect_float) { 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[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[1] = projPixel->newColor.f[1] = projPixel->pixel.f_pt[1];
projPixel->origColor.f[2] = projPixel->newColor.f[2] = projPixel->pixel.f_pt[2]; projPixel->origColor.f[2] = projPixel->newColor.f[2] = projPixel->pixel.f_pt[2];

18
source/blender/imbuf/intern/imageprocess.c
View File

@ -88,7 +88,7 @@ static void pixel_from_buffer(struct ImBuf *ibuf, unsigned char **outI, float **
*outI = (unsigned char *)ibuf->rect + offset; *outI = (unsigned char *)ibuf->rect + offset;
if (ibuf->rect_float) 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) { if (outF) {
/* sample including outside of edges of image */ /* sample including outside of edges of image */
if (x1 < 0 || y1 < 0) row1 = empty; 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; 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; 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; 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); a = u - floorf(u);
b = v - floorf(v); b = v - floorf(v);
@ -338,10 +338,10 @@ void bilinear_interpolation_color_wrap(struct ImBuf *in, unsigned char *outI, fl
if (outF) { if (outF) {
/* sample including outside of edges of image */ /* sample including outside of edges of image */
row1 = (float *)in->rect_float + in->x * y1 * 4 + 4 * x1; row1 = in->rect_float + in->x * y1 * 4 + 4 * x1;
row2 = (float *)in->rect_float + in->x * y2 * 4 + 4 * x1; row2 = in->rect_float + in->x * y2 * 4 + 4 * x1;
row3 = (float *)in->rect_float + in->x * y1 * 4 + 4 * x2; row3 = in->rect_float + in->x * y1 * 4 + 4 * x2;
row4 = (float *)in->rect_float + in->x * y2 * 4 + 4 * x2; row4 = in->rect_float + in->x * y2 * 4 + 4 * x2;
a = u - floorf(u); a = u - floorf(u);
b = v - floorf(v); b = v - floorf(v);

2
source/blender/imbuf/intern/radiance_hdr.c
View File

@ -213,7 +213,7 @@ struct ImBuf *imb_loadhdr(unsigned char *mem, size_t size, int flags)
/* read in and decode the actual data */ /* read in and decode the actual data */
sline = (RGBE *)MEM_mallocN(sizeof(RGBE) * width, "radhdr_read_tmpscan"); 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++) { for (y = 0; y < height; y++) {
ptr = freadcolrs(sline, ptr, width); ptr = freadcolrs(sline, ptr, width);

2
source/blender/imbuf/intern/scaling.c
View File

@ -1313,7 +1313,7 @@ static ImBuf *scaleupy(struct ImBuf *ibuf, int newy)
rect += 2 * skipx; rect += 2 * skipx;
} }
if (do_float) { if (do_float) {
rectf = ((float *)ibuf->rect_float) + 4 * (x - 1); rectf = ibuf->rect_float + 4 * (x - 1);
newrectf = _newrectf + 4 * (x - 1); newrectf = _newrectf + 4 * (x - 1);
val_af = rectf[0]; val_af = rectf[0];

2
source/blender/render/intern/source/envmap.c
View File

@ -476,7 +476,7 @@ static void render_envmap(Render *re, EnvMap *env)
ibuf->profile = IB_PROFILE_LINEAR_RGB; ibuf->profile = IB_PROFILE_LINEAR_RGB;
/* envmap renders without alpha */ /* 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) for (y = ibuf->x * ibuf->y - 1; y >= 0; y--, alpha += 4)
*alpha = 1.0; *alpha = 1.0;