Changeset 12431 for trunk/psLib/src/imageops/psImageGeomManip.c

Timestamp:

Mar 13, 2007, 2:39:51 PM (19 years ago)

Author:

Paul Price

Message:

Removing complex number support. No-one was using it, and it prevents compilation on Solaris.

File:

• trunk/psLib/src/imageops/psImageGeomManip.c (modified) (15 diffs)

trunk/psLib/src/imageops/psImageGeomManip.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-03-08 22:12:56 $
+ *  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-14 00:39:50 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -20 +20 @@
 #endif
 
-#include <complex.h>
 #include <math.h>                          // for isfinite(), etc.
 #include <stdlib.h>
@@ -158 +157 @@
         PS_IMAGE_REBIN_CASE(F32);
         PS_IMAGE_REBIN_CASE(F64);
-        //        PS_IMAGE_REBIN_CASE(C32);      Not valid since psVectorStats doesn't allow
-        //        PS_IMAGE_REBIN_CASE(C64);      Not valid since psVectorStats doesn't allow
 
     default: {
@@ -241 +238 @@
         PSIMAGE_RESAMPLE_CASE(F32)
         PSIMAGE_RESAMPLE_CASE(F64)
-        PSIMAGE_RESAMPLE_CASE(C32)
-        PSIMAGE_RESAMPLE_CASE(C64)
     default: {
             char* typeStr;
@@ -312 +307 @@
                        const psImage* input,
                        float angle,
-                       double complex exposed,
+                       double exposed,
                        psImageInterpolateMode mode)
 {
@@ -356 +351 @@
             PSIMAGE_ROTATE_LEFT_90(F32);
             PSIMAGE_ROTATE_LEFT_90(F64);
-            PSIMAGE_ROTATE_LEFT_90(C32);
-            PSIMAGE_ROTATE_LEFT_90(C64);
 
         default: {
@@ -402 +395 @@
             PSIMAGE_ROTATE_180_CASE(F32);
             PSIMAGE_ROTATE_180_CASE(F64);
-            PSIMAGE_ROTATE_180_CASE(C32);
-            PSIMAGE_ROTATE_180_CASE(C64);
 
         default: {
@@ -447 +438 @@
             PSIMAGE_ROTATE_RIGHT_90(F32);
             PSIMAGE_ROTATE_RIGHT_90(F64);
-            PSIMAGE_ROTATE_RIGHT_90(C32);
-            PSIMAGE_ROTATE_RIGHT_90(C64);
 
         default: {
@@ -504 +493 @@
 
         #define PSIMAGE_ROTATE_ARBITRARY_LOOP(TYPE,MODE) { \
-            if (creal(exposed) < PS_MIN_##TYPE || \
-                    creal(exposed) > PS_MAX_##TYPE || \
-                    cimag(exposed) < PS_MIN_##TYPE || \
-                    cimag(exposed) > PS_MAX_##TYPE) { \
+            if (exposed < PS_MIN_##TYPE || \
+                    exposed > PS_MAX_##TYPE || \
+                    exposed < PS_MIN_##TYPE || \
+                    exposed > PS_MAX_##TYPE) { \
                 psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
                         _("Specified %s value, %g%+gi, is not the the range of input psImage's valid pixel values (%s), i.e. [%g:%g]."), \
                         "exposed", \
-                        creal(exposed),cimag(exposed), \
+                        exposed, exposed, \
                         PS_TYPE_##TYPE##_NAME,  \
                         (double)PS_MIN_##TYPE,(double)PS_MAX_##TYPE); \
@@ -566 +555 @@
             PSIMAGE_ROTATE_ARBITRARY_LOOP(F64,MODE); \
             break; \
-        case PS_TYPE_C32: \
-            PSIMAGE_ROTATE_ARBITRARY_LOOP(C32,MODE); \
-            break; \
-        case PS_TYPE_C64: \
-            PSIMAGE_ROTATE_ARBITRARY_LOOP(C64,MODE); \
-            break; \
         default: { \
                 char* typeStr; \
@@ -690 +673 @@
                       float dx,
                       float dy,
-                      double complex exposed,
+                      double exposed,
                       psImageInterpolateMode mode)
 {
@@ -714 +697 @@
     #define PSIMAGE_SHIFT_CASE(MODE,TYPE) \
 case PS_TYPE_##TYPE: \
-    if (creal(exposed) < PS_MIN_##TYPE || \
-            creal(exposed) > PS_MAX_##TYPE || \
-            cimag(exposed) < PS_MIN_##TYPE || \
-            cimag(exposed) > PS_MAX_##TYPE) { \
+    if (exposed < PS_MIN_##TYPE || \
+            exposed > PS_MAX_##TYPE || \
+            exposed < PS_MIN_##TYPE || \
+            exposed > PS_MAX_##TYPE) { \
         psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
                 _("Specified %s value, %g%+gi, is not the the range of input psImage's valid pixel values (%s), i.e. [%g:%g]."), \
                 "exposed", \
-                creal(exposed),cimag(exposed), \
+                exposed,exposed, \
                 PS_TYPE_##TYPE##_NAME,  \
                 (double)PS_MIN_##TYPE,(double)PS_MAX_##TYPE); \
@@ -755 +738 @@
         PSIMAGE_SHIFT_CASE(MODE,F32); \
         PSIMAGE_SHIFT_CASE(MODE,F64); \
-        PSIMAGE_SHIFT_CASE(MODE,C32); \
-        PSIMAGE_SHIFT_CASE(MODE,C64); \
-        \
+       \
     default: { \
             char* typeStr; \
@@ -1029 +1010 @@
             FLIP_X_CASE(PS_TYPE_F32, F32);
             FLIP_X_CASE(PS_TYPE_F64, F64);
-            FLIP_X_CASE(PS_TYPE_C32, C32);
-            FLIP_X_CASE(PS_TYPE_C64, C64);
         default:
             psFree(output);
@@ -1050 +1029 @@
             FLIP_Y_CASE(PS_TYPE_F32, F32);
             FLIP_Y_CASE(PS_TYPE_F64, F64);
-            FLIP_Y_CASE(PS_TYPE_C32, C32);
-            FLIP_Y_CASE(PS_TYPE_C64, C64);
         default:
             psFree(output);