Changeset 1635

Timestamp:

Aug 27, 2004, 9:49:54 AM (22 years ago)

Author:

desonia

Message:

Changed the unexposedValue for psImageRotate and psImageShift (bug #150). Also optimized psImageShift by using the inline private interpolation functions.

Location:

trunk/psLib/src/image

Files:

• psImageManip.c (modified) (7 diffs)
• psImageManip.h (modified) (3 diffs)

trunk/psLib/src/image/psImageManip.c

@@ -1 @@
-
 /** @file  psImageManip.c
  *
@@ -11 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-20 02:55:58 $
+ *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-27 19:49:54 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
  */
-#include <math.h>                          // for
-// isfinite(),
-// etc.
+
+#include <math.h>                          // for isfinite(), etc.
 #include <stdlib.h>
 #include <stdbool.h>
-#include <string.h>                        // for
-// memcpy,
-// etc.
+#include <string.h>                        // for memcpy, etc.
 
 #include "psError.h"
@@ -594 +590 @@
                        const psImage* in,
                        float angle,
-                       float unexposedValue,
+                       psC64 unexposedValue,
                        psImageInterpolateMode mode)
 {
@@ -764 +760 @@
 
         #define PSIMAGE_ROTATE_ARBITRARY_LOOP(TYPE,MODE) { \
-            if (unexposedValue < PS_MIN_##TYPE || unexposedValue > PS_MAX_##TYPE) { \
-                psError(__func__,"The given unexposedValue (%g) is outside of the " \
+            if (creal(unexposedValue) < PS_MIN_##TYPE || creal(unexposedValue) > PS_MAX_##TYPE || \
+                    cimag(unexposedValue) < PS_MIN_##TYPE || cimag(unexposedValue) > PS_MAX_##TYPE) { \
+                psError(__func__,"The given unexposedValue (%g%+g) is outside of the " \
                         "image type's range (%g->%g).", \
-                        unexposedValue, (double)PS_MIN_##TYPE,(double)PS_MAX_##TYPE); \
+                        creal(unexposedValue),cimag(unexposedValue), \
+                        (double)PS_MIN_##TYPE,(double)PS_MAX_##TYPE); \
                 psFree(out); \
                 out = NULL; \
@@ -850 +848 @@
                       float dx,
                       float dy,
-                      psF64 unexposedValue,
+                      psC64 unexposedValue,
                       psImageInterpolateMode mode)
 {
@@ -870 +868 @@
     out = psImageRecycle(out, outCols, outRows, type);
 
-    #define PSIMAGE_SHIFT_CASE(TYPE) \
+    #define PSIMAGE_SHIFT_CASE(MODE,TYPE) \
 case PS_TYPE_##TYPE: \
-    if (unexposedValue < PS_MIN_##TYPE || unexposedValue > PS_MAX_##TYPE) { \
-        psError(__func__,"The given unexposedValue (%g) is outside of the " \
+    if (creal(unexposedValue) < PS_MIN_##TYPE || creal(unexposedValue) > PS_MAX_##TYPE || \
+            cimag(unexposedValue) < PS_MIN_##TYPE || cimag(unexposedValue) > PS_MAX_##TYPE) { \
+        psError(__func__,"The given unexposedValue (%g%+g) is outside of the " \
                 "image type's range (%g->%g).", \
-                unexposedValue, (double)PS_MIN_##TYPE,(double)PS_MAX_##TYPE); \
+                creal(unexposedValue), cimag(unexposedValue), \
+                (double)PS_MIN_##TYPE,(double)PS_MAX_##TYPE); \
         psFree(out); \
         out = NULL; \
@@ -884 +884 @@
         float y = dy+(float)row; \
         for (int col=0;col<outCols;col++) { \
-            outRow[col] = psImagePixelInterpolate(in,dx+(float)col,y,unexposedValue,mode); \
+            outRow[col] = p_psImagePixelInterpolate##MODE##_##TYPE(in,dx+(float)col,y,unexposedValue); \
         } \
     } \
     break;
 
-    switch (in->type.type) {
-        PSIMAGE_SHIFT_CASE(U8);
-        PSIMAGE_SHIFT_CASE(U16);
-        PSIMAGE_SHIFT_CASE(U32);
-        PSIMAGE_SHIFT_CASE(U64);
-        PSIMAGE_SHIFT_CASE(S8);
-        PSIMAGE_SHIFT_CASE(S16);
-        PSIMAGE_SHIFT_CASE(S32);
-        PSIMAGE_SHIFT_CASE(S64);
-        PSIMAGE_SHIFT_CASE(F32);
-        PSIMAGE_SHIFT_CASE(F64);
-        PSIMAGE_SHIFT_CASE(C32);
-        PSIMAGE_SHIFT_CASE(C64);
+    #define PSIMAGE_SHIFT_ARBITRARY_CASE(MODE) \
+case PS_INTERPOLATE_##MODE: \
+    switch (in->type.type) { \
+        PSIMAGE_SHIFT_CASE(MODE,U8); \
+        PSIMAGE_SHIFT_CASE(MODE,U16); \
+        PSIMAGE_SHIFT_CASE(MODE,U32); \
+        PSIMAGE_SHIFT_CASE(MODE,U64); \
+        PSIMAGE_SHIFT_CASE(MODE,S8); \
+        PSIMAGE_SHIFT_CASE(MODE,S16); \
+        PSIMAGE_SHIFT_CASE(MODE,S32); \
+        PSIMAGE_SHIFT_CASE(MODE,S64); \
+        PSIMAGE_SHIFT_CASE(MODE,F32); \
+        PSIMAGE_SHIFT_CASE(MODE,F64); \
+        PSIMAGE_SHIFT_CASE(MODE,C32); \
+        PSIMAGE_SHIFT_CASE(MODE,C64); \
+    default: \
+        psError(__func__, "Image type (%d) not supported.", type); \
+        psFree(out); \
+        out = NULL; \
+    }
+
+    switch (mode) {
+        PSIMAGE_SHIFT_ARBITRARY_CASE(FLAT);
+        PSIMAGE_SHIFT_ARBITRARY_CASE(BILINEAR);
     default:
-        psError(__func__, "Image type (%d) not supported.", type);
+        psError(__func__, "Unsupported interpolation mode (%d)", mode);
         psFree(out);
         out = NULL;
     }
+
     return out;
 }

trunk/psLib/src/image/psImageManip.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-20 02:55:58 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-27 19:49:54 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -141 +141 @@
     const psImage* in,                 ///< input image
     float angle,                       ///< the rotation angle in degrees.
-    float unexposedValue,              ///< the output image pixel values for non-imagery areas
+    psC64 unexposedValue,              ///< the output image pixel values for non-imagery areas
     psImageInterpolateMode mode        ///< the interpolation mode used
 );
@@ -161 +161 @@
     float dx,                          ///< the shift in x direction.
     float dy,                          ///< the shift in y direction.
-    float unexposedValue,              ///< the output image pixel values for non-imagery areas
+    psC64 unexposedValue,              ///< the output image pixel values for non-imagery areas
     psImageInterpolateMode mode        ///< the interpolation mode to use
 );