Changeset 4286 for trunk/psLib/src/image/psImageGeomManip.c

Timestamp:

Jun 16, 2005, 12:00:04 PM (21 years ago)

Author:

gusciora

Message:

CHeck in, check in often. -- RDD

File:

• trunk/psLib/src/image/psImageGeomManip.c (modified) (13 diffs)

trunk/psLib/src/image/psImageGeomManip.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-11 02:19:05 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-16 22:00:04 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -697 +697 @@
                           const psPixels* pixels,
                           psImageInterpolateMode mode,
-                          int exposedValue)
+                          int exposedValue,
+                          psPlaneTransform *junk)
 {
+    printf("junk(A): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
+
+
     if (input == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
@@ -707 +711 @@
     psElemType type = input->type.type;
 
+    printf("junk(B): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
     if (inputMask != NULL) {
         if (input->numRows != inputMask->numRows || input->numCols != inputMask->numCols) {
@@ -733 +738 @@
     }
 
+    printf("junk(C): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
     int row0;
     int row1;
@@ -774 +780 @@
     }
 
+    printf("junk(D): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
     // loop through the output image using the domain above and transform
     // each output pixel to input coordinates and use psImagePixelInterpolate
@@ -780 +787 @@
     psPlane* inPosition = NULL;
 
+
+
+
+
     #define PSIMAGE_TRANSFORM_DOTRANSFORM(TYPE,MODE) \
     /* apply the transform to get the position in the input image */ \
+    printf("junk(Ea): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);\
     inPosition = psPlaneTransformApply(inPosition, outToIn, &outPosition); \
     \
+    printf("junk(Eaa): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);\
     if (inPosition == NULL) { \
         psError(PS_ERR_UNKNOWN, false, \
@@ -791 +804 @@
     } \
     /* interpolate the cooresponding input pixel to get the output pixel value. */ \
+    printf("junk(Eaaa): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);\
     ps##TYPE value = p_psImagePixelInterpolate##MODE##_##TYPE(input, \
                      inPosition->x, inPosition->y, \
                      inputMask, inputMaskVal, NAN); \
+    /*    psFree(inPosition); */\
+    printf("junk(Eaaaa): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);\
     if (isnan(value)) { \
         if (blankPixels != NULL) { \
@@ -800 +816 @@
         value = exposedValue; \
     } \
+    printf("junk(Eb): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
+
+
 
     #define PSIMAGE_TRANSFORM_LOOP(TYPE, MODE) { \
@@ -806 +825 @@
             ps##TYPE* outputData=output->data.TYPE[row]; \
             for (int col = 0; col < numCols; col++) { \
+                printf("junk(Eb): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY); \
                 outPosition.x = col+col0; \
+                printf("junk(Ebb): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY); \
                 PSIMAGE_TRANSFORM_DOTRANSFORM(TYPE,MODE) \
+                printf("junk(Ebbb): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY); \
                 outputData[col] = value; \
-            } \
-        } \
-    }
+                printf("junk(Ebbbb): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY); \
+                printf("HERE B: Writing (%d, %d) Image size is (%d, %d)\n", \
+                       row, col, output->numRows, output->numCols); \
+                printf("junk(Ebbbbb): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY); \
+            } \
+        } \
+    }
+
+    printf("junk(F): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
 
     #define PSIMAGE_TRANSFORM_FROMLIST(TYPE, MODE) { \
@@ -823 +851 @@
                 PSIMAGE_TRANSFORM_DOTRANSFORM(TYPE,MODE) \
                 output->data.TYPE[y][x] = value; \
-            } \
-        } \
-    }
+                printf("HERE C: Writing (%d, %d) Image size is (%d, %d)\n", y, x, output->numRows, output->numCols); \
+            } \
+        } \
+    }
+
+    printf("junk(G): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
 
     #define PSIMAGE_TRANSFORM_CASE(MODE) \
@@ -843 +874 @@
                     typeStr); \
             psFree(output); \
+            printf("junk(H): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY); \
             return NULL; \
         } \
@@ -848 +880 @@
     break;
 
+    printf("junk(J): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
     switch (mode) {
         PSIMAGE_TRANSFORM_CASE(FLAT);
@@ -857 +890 @@
                 mode);
         psFree(output);
-        return NULL;
-    }
+        printf("junk(K): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
+        return NULL;
+    }
+    printf("junk(L): (%d, %d) (%d %d)\n", junk->x->nX, junk->x->nY, junk->y->nX, junk->y->nY);
 
     return output;