Cleanup: moved IMB_transform to transform.cc.

Part of a refactoring to make IMB_transform more generic to reduce
unneeded branching.

1 files changed, 4 insertions, 232 deletions

diff --git a/source/blender/imbuf/intern/imageprocess.c b/source/blender/imbuf/intern/imageprocess.c
index 1a59ec75ed0..75d36e10498 100644
--- a/source/blender/imbuf/intern/imageprocess.c
+++ b/source/blender/imbuf/intern/imageprocess.c
@@ -127,7 +127,7 @@ void bicubic_interpolation(const ImBuf *in, ImBuf *out, float u, float v, int xo
 /** \name Bi-Linear Interpolation
  * \{ */
 
-BLI_INLINE void bilinear_interpolation_color_fl(
+void bilinear_interpolation_color_fl(
     const struct ImBuf *in, unsigned char UNUSED(outI[4]), float outF[4], float u, float v)
 {
   BLI_assert(outF);
@@ -135,7 +135,7 @@ BLI_INLINE void bilinear_interpolation_color_fl(
   BLI_bilinear_interpolation_fl(in->rect_float, outF, in->x, in->y, 4, u, v);
 }
 
-BLI_INLINE void bilinear_interpolation_color_char(
+void bilinear_interpolation_color_char(
     const struct ImBuf *in, unsigned char outI[4], float UNUSED(outF[4]), float u, float v)
 {
   BLI_assert(outI);
@@ -255,7 +255,7 @@ void bilinear_interpolation(const ImBuf *in, ImBuf *out, float u, float v, int x
  * \{ */
 
 /* functions assumes out to be zero'ed, only does RGBA */
-BLI_INLINE void nearest_interpolation_color_char(
+void nearest_interpolation_color_char(
     const struct ImBuf *in, unsigned char outI[4], float UNUSED(outF[4]), float u, float v)
 {
   BLI_assert(outI);
@@ -278,7 +278,7 @@ BLI_INLINE void nearest_interpolation_color_char(
   outI[3] = dataI[3];
 }
 
-BLI_INLINE void nearest_interpolation_color_fl(
+void nearest_interpolation_color_fl(
     const struct ImBuf *in, unsigned char UNUSED(outI[4]), float outF[4], float u, float v)
 {
   BLI_assert(outF);
@@ -364,234 +364,6 @@ void nearest_interpolation(const ImBuf *in, ImBuf *out, float u, float v, int xo
 }
 
 /* -------------------------------------------------------------------- */
-/** \name Image transform
- * \{ */
-typedef struct TransformUserData {
-  const ImBuf *src;
-  ImBuf *dst;
-  float start_uv[2];
-  float add_x[2];
-  float add_y[2];
-  rctf src_crop;
-} TransformUserData;
-
-static void imb_transform_calc_start_uv(const float transform_matrix[4][4], float r_start_uv[2])
-{
-  float r_start_uv_temp[3];
-  float orig[3];
-  zero_v3(orig);
-  mul_v3_m4v3(r_start_uv_temp, transform_matrix, orig);
-  copy_v2_v2(r_start_uv, r_start_uv_temp);
-}
-
-static void imb_transform_calc_add_x(const float transform_matrix[4][4],
-                                     const float start_uv[2],
-                                     const int width,
-                                     float r_add_x[2])
-{
-  float r_add_x_temp[3];
-  float uv_max_x[3];
-  zero_v3(uv_max_x);
-  uv_max_x[0] = width;
-  uv_max_x[1] = 0.0f;
-  mul_v3_m4v3(r_add_x_temp, transform_matrix, uv_max_x);
-  sub_v2_v2(r_add_x_temp, start_uv);
-  mul_v2_fl(r_add_x_temp, 1.0f / width);
-  copy_v2_v2(r_add_x, r_add_x_temp);
-}
-
-static void imb_transform_calc_add_y(const float transform_matrix[4][4],
-                                     const float start_uv[2],
-                                     const int height,
-                                     float r_add_y[2])
-{
-  float r_add_y_temp[3];
-  float uv_max_y[3];
-  zero_v3(uv_max_y);
-  uv_max_y[0] = 0.0f;
-  uv_max_y[1] = height;
-  mul_v3_m4v3(r_add_y_temp, transform_matrix, uv_max_y);
-  sub_v2_v2(r_add_y_temp, start_uv);
-  mul_v2_fl(r_add_y_temp, 1.0f / height);
-  copy_v2_v2(r_add_y, r_add_y_temp);
-}
-
-typedef void (*InterpolationColorFunction)(
-    const struct ImBuf *in, unsigned char outI[4], float outF[4], float u, float v);
-BLI_INLINE void imb_transform_scanlines(const TransformUserData *user_data,
-                                        int scanline,
-                                        InterpolationColorFunction interpolation)
-{
-  const int width = user_data->dst->x;
-
-  float uv[2];
-  madd_v2_v2v2fl(uv, user_data->start_uv, user_data->add_y, scanline);
-
-  unsigned char *outI = NULL;
-  float *outF = NULL;
-  pixel_from_buffer(user_data->dst, &outI, &outF, 0, scanline);
-
-  for (int xi = 0; xi < width; xi++) {
-    interpolation(user_data->src, outI, outF, uv[0], uv[1]);
-    add_v2_v2(uv, user_data->add_x);
-    if (outI) {
-      outI += 4;
-    }
-    if (outF) {
-      outF += 4;
-    }
-  }
-}
-
-static void imb_transform_nearest_scanlines(void *custom_data, int scanline)
-{
-  const TransformUserData *user_data = custom_data;
-  InterpolationColorFunction interpolation = NULL;
-  if (user_data->dst->rect_float) {
-    interpolation = nearest_interpolation_color_fl;
-  }
-  else {
-    interpolation = nearest_interpolation_color_char;
-  }
-  imb_transform_scanlines(user_data, scanline, interpolation);
-}
-
-static void imb_transform_bilinear_scanlines(void *custom_data, int scanline)
-{
-  const TransformUserData *user_data = custom_data;
-  InterpolationColorFunction interpolation = NULL;
-  if (user_data->dst->rect_float) {
-    interpolation = bilinear_interpolation_color_fl;
-  }
-  else if (user_data->dst->rect) {
-    interpolation = bilinear_interpolation_color_char;
-  }
-  imb_transform_scanlines(user_data, scanline, interpolation);
-}
-
-BLI_INLINE void imb_transform_scanlines_with_crop(const TransformUserData *user_data,
-                                                  int scanline,
-                                                  InterpolationColorFunction interpolation)
-{
-  const int width = user_data->dst->x;
-
-  float uv[2];
-  madd_v2_v2v2fl(uv, user_data->start_uv, user_data->add_y, scanline);
-
-  unsigned char *outI = NULL;
-  float *outF = NULL;
-  pixel_from_buffer(user_data->dst, &outI, &outF, 0, scanline);
-
-  for (int xi = 0; xi < width; xi++) {
-    if (uv[0] >= user_data->src_crop.xmin && uv[0] < user_data->src_crop.xmax &&
-        uv[1] >= user_data->src_crop.ymin && uv[1] < user_data->src_crop.ymax) {
-      interpolation(user_data->src, outI, outF, uv[0], uv[1]);
-    }
-    add_v2_v2(uv, user_data->add_x);
-    if (outI) {
-      outI += 4;
-    }
-    if (outF) {
-      outF += 4;
-    }
-  }
-}
-
-static void imb_transform_nearest_scanlines_with_crop(void *custom_data, int scanline)
-{
-  const TransformUserData *user_data = custom_data;
-  InterpolationColorFunction interpolation = NULL;
-  if (user_data->dst->rect_float) {
-    interpolation = nearest_interpolation_color_fl;
-  }
-  else {
-    interpolation = nearest_interpolation_color_char;
-  }
-  imb_transform_scanlines_with_crop(user_data, scanline, interpolation);
-}
-
-static void imb_transform_bilinear_scanlines_with_crop(void *custom_data, int scanline)
-{
-  const TransformUserData *user_data = custom_data;
-  InterpolationColorFunction interpolation = NULL;
-  if (user_data->dst->rect_float) {
-    interpolation = bilinear_interpolation_color_fl;
-  }
-  else if (user_data->dst->rect) {
-    interpolation = bilinear_interpolation_color_char;
-  }
-  imb_transform_scanlines_with_crop(user_data, scanline, interpolation);
-}
-
-static void imb_transform_nearest_scanlines_with_repeat(void *custom_data, int scanline)
-{
-  const TransformUserData *user_data = custom_data;
-  InterpolationColorFunction interpolation = nearest_interpolation_color_wrap;
-  imb_transform_scanlines(user_data, scanline, interpolation);
-}
-
-static ScanlineThreadFunc imb_transform_scanline_func(const eIMBInterpolationFilterMode filter,
-                                                      const eIMBTransformMode mode)
-{
-  ScanlineThreadFunc scanline_func = NULL;
-  switch (mode) {
-    case IMB_TRANSFORM_MODE_REGULAR:
-      switch (filter) {
-        case IMB_FILTER_NEAREST:
-          scanline_func = imb_transform_nearest_scanlines;
-          break;
-        case IMB_FILTER_BILINEAR:
-          scanline_func = imb_transform_bilinear_scanlines;
-          break;
-      }
-      break;
-
-    case IMB_TRANSFORM_MODE_CROP_SRC:
-      switch (filter) {
-        case IMB_FILTER_NEAREST:
-          scanline_func = imb_transform_nearest_scanlines_with_crop;
-          break;
-        case IMB_FILTER_BILINEAR:
-          scanline_func = imb_transform_bilinear_scanlines_with_crop;
-          break;
-      }
-      break;
-
-    case IMB_TRANSFORM_MODE_WRAP_REPEAT:
-      BLI_assert_msg(filter == IMB_FILTER_NEAREST,
-                     "Repeat mode is only supported with nearest interpolation.");
-      scanline_func = imb_transform_nearest_scanlines_with_repeat;
-      break;
-  }
-  return scanline_func;
-}
-
-void IMB_transform(const struct ImBuf *src,
-                   struct ImBuf *dst,
-                   const eIMBTransformMode mode,
-                   const eIMBInterpolationFilterMode filter,
-                   const float transform_matrix[4][4],
-                   const struct rctf *src_crop)
-{
-  BLI_assert_msg(mode != IMB_TRANSFORM_MODE_CROP_SRC || src_crop != NULL,
-                 "No source crop rect given, but crop source is requested. Or source crop rect "
-                 "was given, but crop source was not requested.");
-  TransformUserData user_data;
-  user_data.src = src;
-  user_data.dst = dst;
-  if (mode == IMB_TRANSFORM_MODE_CROP_SRC) {
-    user_data.src_crop = *src_crop;
-  }
-  imb_transform_calc_start_uv(transform_matrix, user_data.start_uv);
-  imb_transform_calc_add_x(transform_matrix, user_data.start_uv, src->x, user_data.add_x);
-  imb_transform_calc_add_y(transform_matrix, user_data.start_uv, src->y, user_data.add_y);
-  ScanlineThreadFunc scanline_func = imb_transform_scanline_func(filter, mode);
-  IMB_processor_apply_threaded_scanlines(dst->y, scanline_func, &user_data);
-}
-
-/** \} */
-
-/* -------------------------------------------------------------------- */
 /** \name Threaded Image Processing
  * \{ */