Changeset 6354 for trunk/psLib/src/imageops

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
`

Location:

trunk/psLib/src/imageops

Files:

• psImageGeomManip.c (modified) (6 diffs)
• psImageGeomManip.h (modified) (3 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;

trunk/psLib/src/imageops/psImageGeomManip.h

@@ -8 +8 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-28 01:12:11 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-08 01:03:35 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -144 +144 @@
 psImage* psImageTransform(
     psImage *output,                   ///< psImage to recycle, or NULL
-    psArray* blankPixels,              ///< list of pixels in output image not set, or NULL if no list is desired.
+    psPixels** blankPixels,            ///< list of pixels in output image not set, or NULL if no list is desired.
     const psImage *input,              ///< psImage to apply transform to
     const psImage *inputMask,          ///< if not NULL, mask of input psImage
@@ -151 +151 @@
     psRegion region,                   ///< the size of the transformed image
     const psPixels* pixels,            /**< if not NULL, consists of psPixelCoords and specifies which pixels in
-                                                                             *  output image shall be transformed; otherwise, entire image generated*/
+                                                                                 *  output image shall be transformed; otherwise, entire image generated*/
     psImageInterpolateMode mode,       ///< the interpolation scheme to be used
     double exposedValue                   ///< Exposed value to which non-corresponding pixels are set