archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

style cleanup: define float sizes for interpolation functions, add retirn's on newlines (to better add breakpoints).

Browse Source
This commit is contained in:
Campbell Barton
2012-10-01 06:18:45 +00:00
parent df298490b8
commit ae32c946e1
2 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/imbuf/IMB_imbuf.h
View File

@@ -410,10 +410,10 @@ void bicubic_interpolation(struct ImBuf *in, struct ImBuf *out, float u, float v
void neareast_interpolation(struct ImBuf *in, struct ImBuf *out, float u, float v, int xout, int yout); void neareast_interpolation(struct ImBuf *in, struct ImBuf *out, float u, float v, int xout, int yout);
void bilinear_interpolation(struct ImBuf *in, struct ImBuf *out, float u, float v, int xout, int yout); void bilinear_interpolation(struct ImBuf *in, struct ImBuf *out, float u, float v, int xout, int yout);
void bicubic_interpolation_color(struct ImBuf *in, unsigned char *col, float *col_float, float u, float v); void bicubic_interpolation_color(struct ImBuf *in, unsigned char col[4], float col_float[4], float u, float v);
void neareast_interpolation_color(struct ImBuf *in, unsigned char *col, float *col_float, float u, float v); void neareast_interpolation_color(struct ImBuf *in, unsigned char col[4], float col_float[4], float u, float v);
void bilinear_interpolation_color(struct ImBuf *in, unsigned char *col, float *col_float, float u, float v); void bilinear_interpolation_color(struct ImBuf *in, unsigned char col[4], float col_float[4], float u, float v);
void bilinear_interpolation_color_wrap(struct ImBuf *in, unsigned char *col, float *col_float, float u, float v); void bilinear_interpolation_color_wrap(struct ImBuf *in, unsigned char col[4], float col_float[4], float u, float v);
/** /**
* *

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

@@ -125,15 +125,16 @@ static float P(float k)
} }
#endif #endif
void bicubic_interpolation_color(struct ImBuf *in, unsigned char *outI, float *outF, float u, float v) void bicubic_interpolation_color(struct ImBuf *in, unsigned char outI[4], float outF[4], float u, float v)
{ {
int i, j, n, m, x1, y1; int i, j, n, m, x1, y1;
unsigned char *dataI; unsigned char *dataI;
float a, b, w, wx, wy[4], outR, outG, outB, outA, *dataF; float a, b, w, wx, wy[4], outR, outG, outB, outA, *dataF;
/* sample area entirely outside image? */ /* sample area entirely outside image? */
if (ceil(u) < 0 || floor(u) > in->x - 1 || ceil(v) < 0 || floor(v) > in->y - 1) if (ceil(u) < 0 || floor(u) > in->x - 1 || ceil(v) < 0 || floor(v) > in->y - 1) {
return; return;
}
/* ImBuf in must have a valid rect or rect_float, assume this is already checked */ /* ImBuf in must have a valid rect or rect_float, assume this is already checked */
@@ -226,11 +227,12 @@ void bicubic_interpolation_color(struct ImBuf *in, unsigned char *outI, float *o
void bicubic_interpolation(ImBuf *in, ImBuf *out, float u, float v, int xout, int yout) void bicubic_interpolation(ImBuf *in, ImBuf *out, float u, float v, int xout, int yout)
{ {
unsigned char *outI = NULL; unsigned char *outI = NULL;
float *outF = NULL; float *outF = NULL;
if (in == NULL || (in->rect == NULL && in->rect_float == NULL)) return; if (in == NULL || (in->rect == NULL && in->rect_float == NULL)) {
return;
}
pixel_from_buffer(out, &outI, &outF, xout, yout); /* gcc warns these could be uninitialized, but its ok */ pixel_from_buffer(out, &outI, &outF, xout, yout); /* gcc warns these could be uninitialized, but its ok */
@@ -239,7 +241,7 @@ void bicubic_interpolation(ImBuf *in, ImBuf *out, float u, float v, int xout, in
/* function assumes out to be zero'ed, only does RGBA */ /* function assumes out to be zero'ed, only does RGBA */
/* BILINEAR INTERPOLATION */ /* BILINEAR INTERPOLATION */
void bilinear_interpolation_color(struct ImBuf *in, unsigned char *outI, float *outF, float u, float v) void bilinear_interpolation_color(struct ImBuf *in, unsigned char outI[4], float outF[4], float u, float v)
{ {
float *row1, *row2, *row3, *row4, a, b; float *row1, *row2, *row3, *row4, a, b;
unsigned char *row1I, *row2I, *row3I, *row4I; unsigned char *row1I, *row2I, *row3I, *row4I;
@@ -257,7 +259,9 @@ void bilinear_interpolation_color(struct ImBuf *in, unsigned char *outI, float *
y2 = (int)ceil(v); y2 = (int)ceil(v);
/* sample area entirely outside image? */ /* sample area entirely outside image? */
if (x2 < 0 || x1 > in->x - 1 || y2 < 0 || y1 > in->y - 1) return; if (x2 < 0 || x1 > in->x - 1 || y2 < 0 || y1 > in->y - 1) {
return;
}
if (outF) { if (outF) {
/* sample including outside of edges of image */ /* sample including outside of edges of image */
@@ -315,7 +319,7 @@ void bilinear_interpolation_color(struct ImBuf *in, unsigned char *outI, float *
/* Note about wrapping, the u/v still needs to be within the image bounds, /* Note about wrapping, the u/v still needs to be within the image bounds,
* just the interpolation is wrapped. * just the interpolation is wrapped.
* This the same as bilinear_interpolation_color except it wraps rather than using empty and emptyI */ * This the same as bilinear_interpolation_color except it wraps rather than using empty and emptyI */
void bilinear_interpolation_color_wrap(struct ImBuf *in, unsigned char *outI, float *outF, float u, float v) void bilinear_interpolation_color_wrap(struct ImBuf *in, unsigned char outI[4], float outF[4], float u, float v)
{ {
float *row1, *row2, *row3, *row4, a, b; float *row1, *row2, *row3, *row4, a, b;
unsigned char *row1I, *row2I, *row3I, *row4I; unsigned char *row1I, *row2I, *row3I, *row4I;
@@ -331,7 +335,9 @@ void bilinear_interpolation_color_wrap(struct ImBuf *in, unsigned char *outI, fl
y2 = (int)ceil(v); y2 = (int)ceil(v);
/* sample area entirely outside image? */ /* sample area entirely outside image? */
if (x2 < 0 || x1 > in->x - 1 || y2 < 0 || y1 > in->y - 1) return; if (x2 < 0 || x1 > in->x - 1 || y2 < 0 || y1 > in->y - 1) {
return;
}
/* wrap interpolation pixels - main difference from bilinear_interpolation_color */ /* wrap interpolation pixels - main difference from bilinear_interpolation_color */
if (x1 < 0) x1 = in->x + x1; if (x1 < 0) x1 = in->x + x1;
@@ -378,11 +384,12 @@ void bilinear_interpolation_color_wrap(struct ImBuf *in, unsigned char *outI, fl
void bilinear_interpolation(ImBuf *in, ImBuf *out, float u, float v, int xout, int yout) void bilinear_interpolation(ImBuf *in, ImBuf *out, float u, float v, int xout, int yout)
{ {
unsigned char *outI = NULL; unsigned char *outI = NULL;
float *outF = NULL; float *outF = NULL;
if (in == NULL || (in->rect == NULL && in->rect_float == NULL)) return; if (in == NULL || (in->rect == NULL && in->rect_float == NULL)) {
return;
}
pixel_from_buffer(out, &outI, &outF, xout, yout); /* gcc warns these could be uninitialized, but its ok */ pixel_from_buffer(out, &outI, &outF, xout, yout); /* gcc warns these could be uninitialized, but its ok */
@@ -391,7 +398,7 @@ void bilinear_interpolation(ImBuf *in, ImBuf *out, float u, float v, int xout, i
/* function assumes out to be zero'ed, only does RGBA */ /* function assumes out to be zero'ed, only does RGBA */
/* NEAREST INTERPOLATION */ /* NEAREST INTERPOLATION */
void neareast_interpolation_color(struct ImBuf *in, unsigned char *outI, float *outF, float u, float v) void neareast_interpolation_color(struct ImBuf *in, unsigned char outI[4], float outF[4], float u, float v)
{ {
float *dataF; float *dataF;
unsigned char *dataI; unsigned char *dataI;
@@ -403,7 +410,9 @@ void neareast_interpolation_color(struct ImBuf *in, unsigned char *outI, float *
y1 = (int)(v); y1 = (int)(v);
/* sample area entirely outside image? */ /* sample area entirely outside image? */
if (x1 < 0 || x1 > in->x - 1 || y1 < 0 || y1 > in->y - 1) return; if (x1 < 0 || x1 > in->x - 1 || y1 < 0 || y1 > in->y - 1) {
return;
}
/* sample including outside of edges of image */ /* sample including outside of edges of image */
if (x1 < 0 || y1 < 0) { if (x1 < 0 || y1 < 0) {
@@ -440,11 +449,12 @@ void neareast_interpolation_color(struct ImBuf *in, unsigned char *outI, float *
void neareast_interpolation(ImBuf *in, ImBuf *out, float x, float y, int xout, int yout) void neareast_interpolation(ImBuf *in, ImBuf *out, float x, float y, int xout, int yout)
{ {
unsigned char *outI = NULL; unsigned char *outI = NULL;
float *outF = NULL; float *outF = NULL;
if (in == NULL || (in->rect == NULL && in->rect_float == NULL)) return; if (in == NULL || (in->rect == NULL && in->rect_float == NULL)) {
return;
}
pixel_from_buffer(out, &outI, &outF, xout, yout); /* gcc warns these could be uninitialized, but its ok */ pixel_from_buffer(out, &outI, &outF, xout, yout); /* gcc warns these could be uninitialized, but its ok */