Merge w/ trunk: r52086-r52534 (As with last time, the game engine was not merged)soc-2012-swiss_cheese

1 files changed, 173 insertions, 57 deletions

diff --git a/source/blender/blenlib/intern/math_interp.c b/source/blender/blenlib/intern/math_interp.c
index 742669354a9..5a9e8244a46 100644
--- a/source/blender/blenlib/intern/math_interp.c
+++ b/source/blender/blenlib/intern/math_interp.c
@@ -60,12 +60,44 @@ static float P(float k)
 }
 #endif
 
+static void vector_from_float(const float *data, float vector[4], int components)
+{
+	if (components == 1) {
+		vector[0] = data[0];
+	}
+	else if (components == 3) {
+		copy_v3_v3(vector, data);
+	}
+	else {
+		copy_v4_v4(vector, data);
+	}
+}
+
+static void vector_from_byte(const unsigned char *data, float vector[4], int components)
+{
+	if (components == 1) {
+		vector[0] = data[0];
+	}
+	else if (components == 3) {
+		vector[0] = data[0];
+		vector[1] = data[1];
+		vector[2] = data[2];
+	}
+	else {
+		vector[0] = data[0];
+		vector[1] = data[1];
+		vector[2] = data[2];
+		vector[3] = data[3];
+	}
+}
+
 /* BICUBIC INTERPOLATION */
-void BLI_bicubic_interpolation(const float *buffer, float *output, int width, int height, int components, float u, float v)
+BLI_INLINE void bicubic_interpolation(const unsigned char *byte_buffer, const float *float_buffer,
+                                      unsigned char *byte_output, float *float_output, int width, int height,
+                                      int components, float u, float v)
 {
 	int i, j, n, m, x1, y1;
 	float a, b, w, wx, wy[4], out[4];
-	const float *data;
 
 	/* sample area entirely outside image? */
 	if (ceil(u) < 0 || floor(u) > width - 1 || ceil(v) < 0 || floor(v) > height - 1) {
@@ -92,6 +124,8 @@ void BLI_bicubic_interpolation(const float *buffer, float *output, int width, in
 		CLAMP(x1, 0, width - 1);
 		wx = P(n - a);
 		for (m = -1; m <= 2; m++) {
+			float data[4];
+
 			y1 = j + m;
 			CLAMP(y1, 0, height - 1);
 			/* normally we could do this */
@@ -99,14 +133,19 @@ void BLI_bicubic_interpolation(const float *buffer, float *output, int width, in
 			/* except that would call P() 16 times per pixel therefor pow() 64 times, better precalc these */
 			w = wx * wy[m + 1];
 
-			data = buffer + width * y1 * 4 + 4 * x1;
+			if (float_output) {
+				const float *float_data = float_buffer + width * y1 * components + components * x1;
 
-			if (components == 1) {
-				out[0] += data[0] * w;
+				vector_from_float(float_data, data, components);
+			}
+			else {
+				const unsigned char *byte_data = byte_buffer + width * y1 * components + components * x1;
+
+				vector_from_byte(byte_data, data, components);
 			}
-			else if (components == 2) {
+
+			if (components == 1) {
 				out[0] += data[0] * w;
-				out[1] += data[1] * w;
 			}
 			else if (components == 3) {
 				out[0] += data[0] * w;
@@ -131,14 +170,21 @@ void BLI_bicubic_interpolation(const float *buffer, float *output, int width, in
 			x1 = i + n;
 			y1 = j + m;
 			if (x1 > 0 && x1 < width && y1 > 0 && y1 < height) {
-				data = in->rect_float + width * y1 * 4 + 4 * x1;
+				float data[4];
 
-				if (components == 1) {
-					out[0] += data[0] * P(n - a) * P(b - m);
+				if (float_output) {
+					const float *float_data = float_buffer + width * y1 * components + components * x1;
+
+					vector_from_float(float_data, data, components);
 				}
-				else if (components == 2) {
+				else {
+					const unsigned char *byte_data = byte_buffer + width * y1 * components + components * x1;
+
+					vector_from_byte(byte_data, data, components);
+				}
+
+				if (components == 1) {
 					out[0] += data[0] * P(n - a) * P(b - m);
-					out[1] += data[1] * P(n - a) * P(b - m);
 				}
 				else if (components == 3) {
 					out[0] += data[0] * P(n - a) * P(b - m);
@@ -156,33 +202,54 @@ void BLI_bicubic_interpolation(const float *buffer, float *output, int width, in
 	}
 #endif
 
-	if (components == 1) {
-		output[0] = out[0];
-	}
-	else if (components == 2) {
-		output[0] = out[0];
-		output[1] = out[1];
-	}
-	else if (components == 3) {
-		output[0] = out[0];
-		output[1] = out[1];
-		output[2] = out[2];
+	if (float_output) {
+		if (components == 1) {
+			float_output[0] = out[0];
+		}
+		else if (components == 3) {
+			copy_v3_v3(float_output, out);
+		}
+		else {
+			copy_v4_v4(float_output, out);
+		}
 	}
 	else {
-		output[0] = out[0];
-		output[1] = out[1];
-		output[2] = out[2];
-		output[3] = out[3];
+		if (components == 1) {
+			byte_output[0] = out[0];
+		}
+		else if (components == 3) {
+			byte_output[0] = out[0];
+			byte_output[1] = out[1];
+			byte_output[2] = out[2];
+		}
+		else {
+			byte_output[0] = out[0];
+			byte_output[1] = out[1];
+			byte_output[2] = out[2];
+			byte_output[3] = out[3];
+		}
 	}
 }
 
+void BLI_bicubic_interpolation_fl(const float *buffer, float *output, int width, int height,
+                                  int components, float u, float v)
+{
+	bicubic_interpolation(NULL, buffer, NULL, output, width, height, components, u, v);
+}
+
+void BLI_bicubic_interpolation_char(const unsigned char *buffer, unsigned char *output, int width, int height,
+                                    int components, float u, float v)
+{
+	bicubic_interpolation(buffer, NULL, output, NULL, width, height, components, u, v);
+}
+
 /* BILINEAR INTERPOLATION */
-void BLI_bilinear_interpolation(const float *buffer, float *output, int width, int height, int components, float u, float v)
+BLI_INLINE void bilinear_interpolation(const unsigned char *byte_buffer, const float *float_buffer,
+                                       unsigned char *byte_output, float *float_output, int width, int height,
+                                       int components, float u, float v)
 {
-	const float *row1, *row2, *row3, *row4;
 	float a, b;
 	float a_b, ma_b, a_mb, ma_mb;
-	float empty[4] = {0.0f, 0.0f, 0.0f, 0.0f};
 	int y1, y2, x1, x2;
 
 	/* ImBuf in must have a valid rect or rect_float, assume this is already checked */
@@ -197,39 +264,88 @@ void BLI_bilinear_interpolation(const float *buffer, float *output, int width, i
 		return;
 	}
 
-	/* sample including outside of edges of image */
-	if (x1 < 0 || y1 < 0) row1 = empty;
-	else row1 = buffer + width * y1 * 4 + 4 * x1;
+	if (float_output) {
+		const float *row1, *row2, *row3, *row4;
+		float empty[4] = {0.0f, 0.0f, 0.0f, 0.0f};
 
-	if (x1 < 0 || y2 > height - 1) row2 = empty;
-	else row2 = buffer + width * y2 * 4 + 4 * x1;
+		/* sample including outside of edges of image */
+		if (x1 < 0 || y1 < 0) row1 = empty;
+		else row1 = float_buffer + width * y1 * components + components * x1;
 
-	if (x2 > width - 1 || y1 < 0) row3 = empty;
-	else row3 = buffer + width * y1 * 4 + 4 * x2;
+		if (x1 < 0 || y2 > height - 1) row2 = empty;
+		else row2 = float_buffer + width * y2 * components + components * x1;
 
-	if (x2 > width - 1 || y2 > height - 1) row4 = empty;
-	else row4 = buffer + width * y2 * 4 + 4 * x2;
+		if (x2 > width - 1 || y1 < 0) row3 = empty;
+		else row3 = float_buffer + width * y1 * components + components * x2;
 
-	a = u - floorf(u);
-	b = v - floorf(v);
-	a_b = a * b; ma_b = (1.0f - a) * b; a_mb = a * (1.0f - b); ma_mb = (1.0f - a) * (1.0f - b);
+		if (x2 > width - 1 || y2 > height - 1) row4 = empty;
+		else row4 = float_buffer + width * y2 * components + components * x2;
 
-	if (components == 1) {
-		output[0] = ma_mb * row1[0] + a_mb * row3[0] + ma_b * row2[0] + a_b * row4[0];
-	}
-	else if (components == 2) {
-		output[0] = ma_mb * row1[0] + a_mb * row3[0] + ma_b * row2[0] + a_b * row4[0];
-		output[1] = ma_mb * row1[1] + a_mb * row3[1] + ma_b * row2[1] + a_b * row4[1];
-	}
-	else if (components == 3) {
-		output[0] = ma_mb * row1[0] + a_mb * row3[0] + ma_b * row2[0] + a_b * row4[0];
-		output[1] = ma_mb * row1[1] + a_mb * row3[1] + ma_b * row2[1] + a_b * row4[1];
-		output[2] = ma_mb * row1[2] + a_mb * row3[2] + ma_b * row2[2] + a_b * row4[2];
+		a = u - floorf(u);
+		b = v - floorf(v);
+		a_b = a * b; ma_b = (1.0f - a) * b; a_mb = a * (1.0f - b); ma_mb = (1.0f - a) * (1.0f - b);
+
+		if (components == 1) {
+			float_output[0] = ma_mb * row1[0] + a_mb * row3[0] + ma_b * row2[0] + a_b * row4[0];
+		}
+		else if (components == 3) {
+			float_output[0] = ma_mb * row1[0] + a_mb * row3[0] + ma_b * row2[0] + a_b * row4[0];
+			float_output[1] = ma_mb * row1[1] + a_mb * row3[1] + ma_b * row2[1] + a_b * row4[1];
+			float_output[2] = ma_mb * row1[2] + a_mb * row3[2] + ma_b * row2[2] + a_b * row4[2];
+		}
+		else {
+			float_output[0] = ma_mb * row1[0] + a_mb * row3[0] + ma_b * row2[0] + a_b * row4[0];
+			float_output[1] = ma_mb * row1[1] + a_mb * row3[1] + ma_b * row2[1] + a_b * row4[1];
+			float_output[2] = ma_mb * row1[2] + a_mb * row3[2] + ma_b * row2[2] + a_b * row4[2];
+			float_output[3] = ma_mb * row1[3] + a_mb * row3[3] + ma_b * row2[3] + a_b * row4[3];
+		}
 	}
 	else {
-		output[0] = ma_mb * row1[0] + a_mb * row3[0] + ma_b * row2[0] + a_b * row4[0];
-		output[1] = ma_mb * row1[1] + a_mb * row3[1] + ma_b * row2[1] + a_b * row4[1];
-		output[2] = ma_mb * row1[2] + a_mb * row3[2] + ma_b * row2[2] + a_b * row4[2];
-		output[3] = ma_mb * row1[3] + a_mb * row3[3] + ma_b * row2[3] + a_b * row4[3];
+		const unsigned char *row1, *row2, *row3, *row4;
+		unsigned char empty[4] = {0, 0, 0, 0};
+
+		/* sample including outside of edges of image */
+		if (x1 < 0 || y1 < 0) row1 = empty;
+		else row1 = byte_buffer + width * y1 * components + components * x1;
+
+		if (x1 < 0 || y2 > height - 1) row2 = empty;
+		else row2 = byte_buffer + width * y2 * components + components * x1;
+
+		if (x2 > width - 1 || y1 < 0) row3 = empty;
+		else row3 = byte_buffer + width * y1 * components + components * x2;
+
+		if (x2 > width - 1 || y2 > height - 1) row4 = empty;
+		else row4 = byte_buffer + width * y2 * components + components * x2;
+
+		a = u - floorf(u);
+		b = v - floorf(v);
+		a_b = a * b; ma_b = (1.0f - a) * b; a_mb = a * (1.0f - b); ma_mb = (1.0f - a) * (1.0f - b);
+
+		if (components == 1) {
+			byte_output[0] = ma_mb * row1[0] + a_mb * row3[0] + ma_b * row2[0] + a_b * row4[0];
+		}
+		else if (components == 3) {
+			byte_output[0] = ma_mb * row1[0] + a_mb * row3[0] + ma_b * row2[0] + a_b * row4[0];
+			byte_output[1] = ma_mb * row1[1] + a_mb * row3[1] + ma_b * row2[1] + a_b * row4[1];
+			byte_output[2] = ma_mb * row1[2] + a_mb * row3[2] + ma_b * row2[2] + a_b * row4[2];
+		}
+		else {
+			byte_output[0] = ma_mb * row1[0] + a_mb * row3[0] + ma_b * row2[0] + a_b * row4[0];
+			byte_output[1] = ma_mb * row1[1] + a_mb * row3[1] + ma_b * row2[1] + a_b * row4[1];
+			byte_output[2] = ma_mb * row1[2] + a_mb * row3[2] + ma_b * row2[2] + a_b * row4[2];
+			byte_output[3] = ma_mb * row1[3] + a_mb * row3[3] + ma_b * row2[3] + a_b * row4[3];
+		}
 	}
 }
+
+void BLI_bilinear_interpolation_fl(const float *buffer, float *output, int width, int height,
+                                   int components, float u, float v)
+{
+	bilinear_interpolation(NULL, buffer, NULL, output, width, height, components, u, v);
+}
+
+void BLI_bilinear_interpolation_char(const unsigned char *buffer, unsigned char *output, int width, int height,
+                                     int components, float u, float v)
+{
+	bilinear_interpolation(buffer, NULL, output, NULL, width, height, components, u, v);
+}