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

Timestamp:

Sep 16, 2005, 1:56:51 PM (21 years ago)

Author:

drobbin

Message:

Relatively minor changes from new SDRS rev16

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.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-01 01:05:41 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-16 23:56:48 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -399 +399 @@
 // the region is defined wrt the parent image
 void psImageMaskRegion(psImage *image,
-                       psRegion *region,
+                       psRegion region,
                        const char *op,
                        psMaskType maskValue)
@@ -406 +406 @@
     for (int iy = 0; iy < image->numRows; iy++) {
         for (int ix = 0; ix < image->numCols; ix++) {
-            if (ix + image->col0 <  region->x0)
+            if (ix + image->col0 <  region.x0)
                 continue;
-            if (ix + image->col0 >= region->x1)
+            if (ix + image->col0 >= region.x1)
                 continue;
-            if (iy + image->row0 <  region->y0)
+            if (iy + image->row0 <  region.y0)
                 continue;
-            if (iy + image->row0 >= region->y1)
+            if (iy + image->row0 >= region.y1)
                 continue;
             if ( !strncmp(op, "&", 2) || !strncmp(op, "AND", 5) ) {
@@ -430 +430 @@
 // the region is defined wrt the parent image
 void psImageKeepRegion(psImage *image,
-                       psRegion *region,
+                       psRegion region,
                        const char *op,
                        psMaskType maskValue)
@@ -437 +437 @@
     for (int iy = 0; iy < image->numRows; iy++) {
         for (int ix = 0; ix < image->numCols; ix++) {
-            if (ix + image->col0 <  region->x0)
+            if (ix + image->col0 <  region.x0)
                 goto maskit;
-            if (ix + image->col0 >= region->x1)
+            if (ix + image->col0 >= region.x1)
                 goto maskit;
-            if (iy + image->row0 <  region->y0)
+            if (iy + image->row0 <  region.y0)
                 goto maskit;
-            if (iy + image->row0 >= region->y1)
+            if (iy + image->row0 >= region.y1)
                 goto maskit;
             continue;