Changeset 4589 for trunk/psLib/src/imageops/psImagePixelManip.c

Timestamp:

Jul 20, 2005, 3:40:10 PM (21 years ago)

Author:

drobbin

Message:

made minor changes in accordance with newest api-delta doc

File:

• trunk/psLib/src/imageops/psImagePixelManip.c (modified) (5 diffs)

trunk/psLib/src/imageops/psImagePixelManip.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-12 19:33:49 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-21 01:40:10 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -187 +187 @@
 int psImageOverlaySection(psImage* image,
                           const psImage* overlay,
-                          int col0,
-                          int row0,
+                          int x0,
+                          int y0,
                           const char *op)
 {
@@ -229 +229 @@
     overlayNumRows = overlay->numRows;
     overlayNumCols = overlay->numCols;
-    imageRowLimit = row0 + overlayNumRows;
-    imageColLimit = col0 + overlayNumCols;
+    imageRowLimit = y0 + overlayNumRows;
+    imageColLimit = x0 + overlayNumCols;
 
     /* check to see if overlay is within the input image */
-    if ( row0 < 0 ||
-            col0 < 0 ||
+    if ( y0 < 0 ||
+            x0 < 0 ||
             imageRowLimit > imageNumRows ||
             imageColLimit > imageNumCols) {
@@ -240 +240 @@
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
                 PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID,
-                col0, imageColLimit, row0, imageRowLimit,
+                x0, imageColLimit, y0, imageRowLimit,
                 imageNumCols, imageNumRows);
         return pixelsOverlaid;
@@ -247 +247 @@
 
     #define psImageOverlayLoop(DATATYPE,OP) { \
-        for (int row=row0;row<imageRowLimit;row++) { \
+        for (int row=y0;row<imageRowLimit;row++) { \
             ps##DATATYPE* imageRow = image->data.DATATYPE[row]; \
-            ps##DATATYPE* overlayRow = overlay->data.DATATYPE[row-row0]; \
-            for (int col=col0;col<imageColLimit;col++) { \
-                imageRow[col] OP overlayRow[col-col0]; \
-            } \
-        } \
-        pixelsOverlaid += (imageRowLimit - row0) * (imageColLimit - col0); \
+            ps##DATATYPE* overlayRow = overlay->data.DATATYPE[row-y0]; \
+            for (int col=x0;col<imageColLimit;col++) { \
+                imageRow[col] OP overlayRow[col-x0]; \
+            } \
+        } \
+        pixelsOverlaid += (imageRowLimit - y0) * (imageColLimit - x0); \
     }