Changeset 4608

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

Files:

• pslib.kdevelop.pcs (modified) ( previous)
• pslib.kdevses (modified) (1 diff)
• src/imageops/psImageGeomManip.c (modified) (5 diffs)
• src/imageops/psImageGeomManip.h (modified) (3 diffs)
• src/types/psPixels.h (modified) (2 diffs)

trunk/psLib/pslib.kdevses

@@ -2 +2 @@
 <!DOCTYPE KDevPrjSession>
 <KDevPrjSession>
- <DocsAndViews NumberOfDocuments="2" >
-  <Doc0 NumberOfViews="1" URL="file:/home/drobbin/panstarrs/new/psLib/src/types/psArray.c" >
-   <View0 Type="Source" />
+ <DocsAndViews NumberOfDocuments="4" >
+  <Doc0 NumberOfViews="1" URL="file:/home/drobbin/panstarrs/new/psLib/src/math/psMinimize.h" >
+   <View0 line="74" Type="Source" />
   </Doc0>
-  <Doc1 NumberOfViews="1" URL="file:/home/drobbin/panstarrs/new/psLib/src/types/psArray.h" >
-   <View0 line="58" Type="Source" />
+  <Doc1 NumberOfViews="1" URL="file:/home/drobbin/panstarrs/new/psLib/src/math/psMinimize.c" >
+   <View0 line="1568" Type="Source" />
   </Doc1>
+  <Doc2 NumberOfViews="1" URL="file:/home/drobbin/panstarrs/new/psLib/src/imageops/psImageGeomManip.h" >
+   <View0 line="145" Type="Source" />
+  </Doc2>
+  <Doc3 NumberOfViews="1" URL="file:/home/drobbin/panstarrs/new/psLib/src/imageops/psImageGeomManip.c" >
+   <View0 line="690" Type="Source" />
+  </Doc3>
  </DocsAndViews>
  <pluginList>

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

trunk/psLib/src/types/psPixels.h

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-22 22:19:31 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-25 20:49:04 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -73 +73 @@
 psPixels* p_psPixelsAppend(
     psPixels* pixels,                  ///< psPixels to append new coordinate to.  NULL creates a new one.
-    long growth,                        ///< number of elements to grow the psPixels list, if necessary.  if growth < 1, 10 is used.
+    long growth,
+    ///< number of elements to grow the psPixels list, if necessary.  if growth < 1, 10 is used.
     int x,                             ///< x coordinate to append
     int y                              ///< y coordinate to append