Changeset 6874 for trunk/psLib/src/mathtypes

Timestamp:

Apr 17, 2006, 12:00:35 PM (20 years ago)

Author:

magnier

Message:

variety of small changes related to inconsistencies between psModules and psLib

Location:

trunk/psLib/src/mathtypes

Files:

• psImage.c (modified) (4 diffs)
• psImage.h (modified) (5 diffs)

trunk/psLib/src/mathtypes/psImage.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.101 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-05 01:49:41 $
+ *  @version $Revision: 1.102 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-04-17 22:00:03 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -104 +104 @@
 
 
+// XXX these have been moved to psRegion* in src/math/
+# if 0
 psRegion psRegionSet(float x0,
                      float x1,
@@ -160 +162 @@
     return psStringCopy(tmpText);
 }
-
 
 // set actual region based on image parameters:
@@ -227 +228 @@
     return (region);
 }
+# endif /* commented-out psRegion functions */
 
 bool psImageInit (psImage *image,...)

trunk/psLib/src/mathtypes/psImage.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.74 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-28 01:12:14 $
+ *  @version $Revision: 1.75 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-04-17 22:00:03 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -84 +84 @@
                 #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.
                          *
@@ -97 +99 @@
                         }
                         psRegion;
+# endif
 
 /** Create an image of the specified size and type.
@@ -124 +127 @@
 
 
+// XXX these have been moved to psRegion* in src/math
+# if 0
 /** Create a psRegion with the specified attributes.
  *
@@ -184 +189 @@
     double radius                       ///< radius of square
 );
+# endif /* commented-out psRegions */
 
 /** Initializes the image with the given value.