Changeset 7523

Timestamp:

Jun 12, 2006, 10:42:38 AM (20 years ago)

Author:

magnier

Message:

removed psRegion definition (was ifdef-ed out and moved to psRegion.h long ago)
added {} around definition of P_PSIMAGE_SET_NUMCOLS, etc
fixed error in P_PSIMAGE_SET_NUMROWS (was setting numCols instead)

File:

• trunk/psLib/src/mathtypes/psImage.h (modified) (2 diffs)

trunk/psLib/src/mathtypes/psImage.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.75 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-17 22:00:03 $
+ *  @version $Revision: 1.76 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-12 20:42:38 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -80 +80 @@
 psImage;
 
-#define P_PSIMAGE_SET_NUMCOLS(img,nc) *(int*)&img->numCols = nc
-        #define P_PSIMAGE_SET_NUMROWS(img,nr) *(int*)&img->numCols = nr
-                #define P_PSIMAGE_SET_TYPE(img,t) *(psMathType*)&img->type = t
-
-                        // XXX moved to psRegion.h in src/math
-                        # if 0
-                        /** Basic image region structure.
-                         *
-                         * Struct for specifying a rectangular area in an image.
-                         *
-                         */
-                        typedef struct
-                        {
-                            float x0;                         ///< the first column of the region.
-                            float x1;                         ///< the last column of the region.
-                            float y0;                         ///< the first row of the region.
-                            float y1;                         ///< the last row of the region.
-                        }
-                        psRegion;
-# endif
+#define P_PSIMAGE_SET_NUMCOLS(img,nc) {*(int*)&img->numCols = nc;}
+#define P_PSIMAGE_SET_NUMROWS(img,nr) {*(int*)&img->numRows = nr;}
+#define P_PSIMAGE_SET_TYPE(img,t) {*(psMathType*)&img->type = t;}
 
 /** Create an image of the specified size and type.