Changeset 7766 for trunk/psLib/src/imageops

Timestamp:

Jun 29, 2006, 4:20:43 PM (20 years ago)

Author:

Paul Price

Message:

Moved PS_ASSERT functions into appropriate places. Created psAssert.h for general PS_ASSERT functions. Vector-specific assertions went to psVector.h; image-specific assertions went to psImage.h, etc. psConstants.h remains, but only contains specific math constants and functions, as the name implies.

Location:

trunk/psLib/src/imageops

Files:

• psImageBackground.c (modified) (1 diff)
• psImageGeomManip.c (modified) (2 diffs)
• psImageMaskOps.c (modified) (2 diffs)
• psImagePixelManip.c (modified) (2 diffs)
• psImageStats.c (modified) (3 diffs)
• psImageUnbin.c (modified) (1 diff)

trunk/psLib/src/imageops/psImageBackground.c

@@ -7 +7 @@
 #include "psStats.h"
 #include "psType.h"
-#include "psConstants.h"
+#include "psAssert.h"
 #include "psRandom.h"
 #include "psError.h"

trunk/psLib/src/imageops/psImageGeomManip.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-12 20:44:04 $
+ *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-30 02:20:06 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -29 +29 @@
 #include "psStats.h"
 #include "psMemory.h"
-#include "psConstants.h"
+#include "psAssert.h"
 #include "psErrorText.h"
 #include "psCoord.h"

trunk/psLib/src/imageops/psImageMaskOps.c

@@ -8 +8 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-10-10 20:12:13 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-30 02:20:06 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -25 +25 @@
 #include "psStats.h"
 #include "psMemory.h"
-#include "psConstants.h"
+#include "psAssert.h"
 #include "psErrorText.h"
 #include "psCoord.h"

trunk/psLib/src/imageops/psImagePixelManip.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-07 03:22:06 $
+ *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-30 02:20:06 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -27 +27 @@
 #include "psStats.h"
 #include "psMemory.h"
-#include "psConstants.h"
+#include "psAssert.h"
 #include "psErrorText.h"
 #include "psCoord.h"

trunk/psLib/src/imageops/psImageStats.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.97 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-21 21:03:49 $
+ *  @version $Revision: 1.98 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-30 02:20:06 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -29 +29 @@
 #include "psPolynomial.h"
 #include "psImageStats.h"
-#include "psConstants.h"
+#include "psAssert.h"
 #include "psErrorText.h"
 #include "psRegion.h"
@@ -592 +592 @@
         return -1;
     }/* else if (col0 == col1 && row0 == row1) {
-                                    psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                                            "Invalid psRegion specified.  Region contains only 1 pixel.\n");
-                                    return -1;
-                                }
-                            */
+                                        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                                                "Invalid psRegion specified.  Region contains only 1 pixel.\n");
+                                        return -1;
+                                    }
+                                */
     x0 = col0;
     x1 = col1;

trunk/psLib/src/imageops/psImageUnbin.c

@@ -3 +3 @@
 #include "psError.h"
 #include "psImage.h"
-#include "psConstants.h"
+#include "psAssert.h"
 #include "psImageUnbin.h"