Changeset 8627 for trunk/psLib/src/imageops

Timestamp:

Aug 25, 2006, 6:34:28 PM (20 years ago)

Author:

jhoblitt

Message:

add gcc format attributes to:

psAbort()
psErrorStackPrint()
p_psError()
p_psWarning()
psLogMsg()
p_psTrace()

add PS_ASSERT_LONG_LARGER_THAN_OR_EQUAL
add PS_ASSERT_S64_WITHIN_RANGE
fix PS_ASSERT_LONG_WITHIN_RANGE
fix a wide range of format related issues:

• missing format field specifiers
• missing format args
• incorrect format field specifiers
• constants declared with the wrong type (float vs. int)
• PS_ASSERT* for the wrong type
• attemps to print structs with *printf()
• unportable format specifiers, eg. long vs. long long

Location:

trunk/psLib/src/imageops

Files:

• psImagePixelExtract.c (modified) (2 diffs)
• psImageStats.c (modified) (3 diffs)

trunk/psLib/src/imageops/psImagePixelExtract.c

@@ -8 +8 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-08 23:32:23 $
+ *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -790 +790 @@
     if (radii->n < 2) {
         psError(PS_ERR_BAD_PARAMETER_SIZE, true,
-                _("Input radii vector size, %d, can not be less than 2."),
+                _("Input radii vector size, %ld, can not be less than 2."),
                 radii->n);
         psFree(out);

trunk/psLib/src/imageops/psImageStats.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.99 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-08 23:32:23 $
+ *  @version $Revision: 1.100 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -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;
@@ -631 +631 @@
     case PS_TYPE_C64:
     default:
+        // XXX this should include the mask type (as a string)
         psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                _("Input psImage mask type, %s, is not the supported mask datatype of %s."), type, PS_TYPE_U8);
+                _("Input psImage mask type is not a supported mask datatype"));
+
         return -1;
     }