Changeset 4608 for trunk/psLib/src/imageops

Timestamp:

Jul 25, 2005, 10:49:04 AM (21 years ago)

Author:

drobbin

Message:

updated psImageTransform to use psArray instead of psPixels as requested in SDRS rev. 15

Location:

trunk/psLib/src/imageops

Files:

• psImageGeomManip.c (modified) (5 diffs)
• psImageGeomManip.h (modified) (3 diffs)

trunk/psLib/src/imageops/psImageGeomManip.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-12 19:33:49 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-25 20:49:04 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -689 +689 @@
 
 psImage* psImageTransform(psImage *output,
-                          psPixels* blankPixels,
+                          psArray* 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 (inputMask != NULL) {
@@ -801 +808 @@
     if (isnan(value)) { \
         if (blankPixels != NULL) { \
-            p_psPixelsAppend(blankPixels, blankPixels->nalloc, outPosition.x, outPosition.y); \
+            p_psPixelsAppend(tempPixels, tempPixels->nalloc, outPosition.x, outPosition.y); \
         } \
         value = exposedValue; \
@@ -866 +873 @@
 
     psFree(inPosition);
+    psFree(tempPixels);
 
     return output;

trunk/psLib/src/imageops/psImageGeomManip.h

@@ -8 +8 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-25 00:51:28 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-25 20:49:04 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -144 +144 @@
 psImage* psImageTransform(
     psImage *output,                   ///< psImage to recycle, or NULL
-    psPixels* blankPixels,             ///< list of pixels in output image not set, or NULL if no list is desired.
+    psArray* 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