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

Timestamp:

Feb 7, 2006, 3:03:35 PM (20 years ago)

Author:

desonia

Message:

fixed a leak in psFits table reading and cleaned up things according to
the API Delta report.

-rdd
`

File:

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

trunk/psLib/src/imageops/psImageGeomManip.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-28 01:12:11 $
+ *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-08 01:03:35 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -689 +689 @@
 
 psImage* psImageTransform(psImage *output,
-                          psArray* blankPixels,
+                          psPixels** blankPixels,
                           const psImage *input,
                           const psImage *inputMask,
@@ -706 +706 @@
     }
     psElemType type = input->type.type;
-    psPixels* tempPixels = NULL;
-
-    if(blankPixels != NULL) {
-        tempPixels = psPixelsAlloc(blankPixels->nalloc);
-        tempPixels->n = blankPixels->n;
-        tempPixels->data = (psPixelCoord*)blankPixels->data;
+
+    if (blankPixels != NULL && *blankPixels == NULL) {
+        *blankPixels = psPixelsAlloc(0);
     }
 
@@ -786 +783 @@
     psPlane outPosition;
     psPlane* inPosition = NULL;
-
-
-
-
 
     #define PSIMAGE_TRANSFORM_DOTRANSFORM(TYPE,MODE) \
@@ -808 +801 @@
     if (isnan(value)) { \
         if (blankPixels != NULL) { \
-            p_psPixelsAppend(tempPixels, tempPixels->nalloc, outPosition.x, outPosition.y); \
+            p_psPixelsAppend(*blankPixels, (*blankPixels)->nalloc, outPosition.x, outPosition.y); \
         } \
         value = exposedValue; \
@@ -873 +866 @@
 
     psFree(inPosition);
-    psFree(tempPixels);
 
     return output;