Changeset 2088

Timestamp:

Oct 13, 2004, 12:05:03 PM (22 years ago)

Author:

desonia

Message:

misc fixes.

Location:

trunk/psLib/src/image

Files:

• psImageExtraction.c (modified) (8 diffs)
• psImageExtraction.h (modified) (2 diffs)

trunk/psLib/src/image/psImageExtraction.c

@@ -9 +9 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-13 02:40:13 $
+ *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-13 22:05:03 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -508 +508 @@
                      float endCol,
                      float endRow,
-                     float nSamples,
+                     unsigned int nSamples,
                      psImageInterpolateMode mode)
 {
@@ -538 +538 @@
                    PS_ERRORTEXT_psImage_LINE_NOT_IN_IMAGE,
                    startCol,startRow,endCol,endRow,
-                   numCols,numRows);
-        psFree(out);
+                   numCols-1,numRows-1);
+        psFree(out);
+        return NULL;
     }
 
@@ -548 +549 @@
                        PS_ERRORTEXT_psImage_IMAGE_MASK_SIZE,
                        mask->numCols,mask->numRows,
-                       numCols, numRows);
+                       numCols-1, numRows);
             psFree(out);
+            return NULL;
         }
         if (mask->type.type != PS_TYPE_MASK) {
@@ -559 +561 @@
                        typeStr, PS_TYPE_MASK_NAME);
             psFree(out);
+            return NULL;
         }
     }
@@ -574 +577 @@
     }
 
-    out = psVectorRecycle(out,nSamples,in->type.type);
-
-    float dX = (endCol - startCol) / (nSamples-1);
-    float dY = (endRow - startRow) / (nSamples-1);
-
-    float x = startCol;
-    float y = startRow;
+    out = psVectorRecycle(out, nSamples, in->type.type);
+
+    float dX = (endCol - startCol) / (float)(nSamples-1);
+    float dY = (endRow - startRow) / (float)(nSamples-1);
 
     #define LINEAR_CUT_CASE(TYPE) \
@@ -586 +586 @@
         ps##TYPE* outData = out->data.TYPE; \
         for (int i = 0; i < nSamples; i++) { \
+            float x = startCol + (float)i*dX; \
+            float y = startRow + (float)i*dY; \
             /* store off the location of the sample. */ \
             if (cutColsData != NULL) { \
@@ -594 +596 @@
             } \
             outData[i] = psImagePixelInterpolate(in,x,y,mask,maskVal,0,mode); \
-            x += dX; \
-            y += dY; \
         } \
     } \

trunk/psLib/src/image/psImageExtraction.h

@@ -10 +10 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-10-13 00:10:50 $
+*  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-10-13 22:05:03 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -166 +166 @@
     float endCol,                      ///< the column of the end of the cut line
     float endRow,                      ///< the row of the end of the cut line
-    float nSamples,                    ///< the number of samples along the cut
+    unsigned int nSamples,             ///< the number of samples along the cut
     psImageInterpolateMode mode        ///< the interpolation method to use
 );