Changeset 7524

Timestamp:

Jun 12, 2006, 10:44:04 AM (20 years ago)

Author:

magnier

Message:

replaced dangerous code with P_PSIMAGE_SET_NUMCOLS, etc

Location:

trunk/psLib/src

Files:

• imageops/psImageGeomManip.c (modified) (2 diffs)
• imageops/psImageStructManip.c (modified) (3 diffs)
• mathtypes/psImage.c (modified) (2 diffs)

trunk/psLib/src/imageops/psImageGeomManip.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-07 03:22:06 $
+ *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-12 20:44:04 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -776 +776 @@
         // create the output image.
         output = psImageRecycle(output, numCols, numRows, input->type.type);
-        *(psS32*)&output->col0 = region.x0;
-        *(psS32*)&output->row0 = region.y0;
+        output->col0 = region.x0;
+        output->row0 = region.y0;
     } else { // size of output is determined by output parameter
         numRows = output->numRows;

trunk/psLib/src/imageops/psImageStructManip.c

@@ -8 +8 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-05-04 00:37:44 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-12 20:44:04 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -109 +109 @@
 
     out->data.V = psRealloc(out->data.V,sizeof(psPtr)*numRows); // resize row pointer array
-    *(psMathType*)&out->type = image->type;
-    //    *(psU32*)&out->numCols = numCols;
-    //    *(psU32*)&out->numRows = numRows;
-    *(psS32*)&out->numCols = numCols;
-    *(psS32*)&out->numRows = numRows;
-    *(psS32*)&out->row0 = row0;
-    *(psS32*)&out->col0 = col0;
+    P_PSIMAGE_SET_TYPE(out, image->type);
+    P_PSIMAGE_SET_NUMCOLS(out, numCols);
+    P_PSIMAGE_SET_NUMROWS(out, numRows);
+
+    out->row0 = row0;
+    out->col0 = col0;
     out->parent = image;
     out->children = NULL;
@@ -356 +355 @@
     }
 
-    *(psU32*)&image->numRows = numRows;
-    *(psU32*)&image->numCols = numCols;
+    P_PSIMAGE_SET_NUMCOLS(image, numCols);
+    P_PSIMAGE_SET_NUMROWS(image, numRows);
 
     // XXX: should I really resize the buffers?

trunk/psLib/src/mathtypes/psImage.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.104 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-05-05 02:48:34 $
+ *  @version $Revision: 1.105 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-12 20:43:16 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -85 +85 @@
     }
 
-    *(psS32 *)&image->col0 = 0;
-    *(psS32 *)&image->row0 = 0;
-    *(psU32 *)&image->numCols = numCols;
-    *(psU32 *)&image->numRows = numRows;
-    *(psDimen* ) & image->type.dimen = PS_DIMEN_IMAGE;
-    *(psElemType* ) & image->type.type = type;
+    image->col0 = 0;
+    image->row0 = 0;
+    P_PSIMAGE_SET_NUMCOLS (image, numCols);
+    P_PSIMAGE_SET_NUMROWS (image, numRows);
+
+    psMathType imageType;
+    imageType.dimen = PS_DIMEN_IMAGE;
+    imageType.type = type;
+    P_PSIMAGE_SET_TYPE (image, imageType);
+
     image->parent = NULL;
     image->children = NULL;