Changeset 34089 for trunk/psLib/src/imageops

Timestamp:

Jun 26, 2012, 11:47:13 AM (14 years ago)

Author:

eugene

Message:

changes to support pedantic gcc warnings; add configure option for debug-build and no-as-needed

Location:

trunk/psLib/src/imageops

Files:

• psImageGeomManip.c (modified) (2 diffs)
• psImageInterpolate.c (modified) (5 diffs)
• psImageStructManip.c (modified) (1 diff)

trunk/psLib/src/imageops/psImageGeomManip.c

@@ -580 +580 @@
     psS32 outRows;
     psS32 outCols;
-    psS32 elementSize;
     psElemType type;
 
@@ -594 +593 @@
     outCols = input->numCols;
     type = input->type.type;
-    elementSize = PSELEMTYPE_SIZEOF(type);
+    // XXX unused psS32 elementSize = PSELEMTYPE_SIZEOF(type);
     out = psImageRecycle(out, outCols, outRows, type);
 

trunk/psLib/src/imageops/psImageInterpolate.c

@@ -461 +461 @@
     }
 
+#define INTERPOLATE_CHECK() \
+    if (xMin < 0) { /* XXX warn or error? */ } \
+    if (yMin < 0) { /* XXX warn or error? */ } \
+    if (xMax >= image->numCols) { /* XXX warn or error? */ } \
+    if (yMax >= image->numRows) { /* XXX warn or error? */ } \
+
 // Determine the result of the interpolation after all the math has been done
 static psImageInterpolateStatus interpolateResult(const psImageInterpolation *interp,
@@ -523 +529 @@
     }
     INTERPOLATE_RANGE();
+    INTERPOLATE_CHECK();
 
     // Get the appropriate kernels
@@ -779 +786 @@
     }
     INTERPOLATE_RANGE();
+    INTERPOLATE_CHECK();
 
     // Get the appropriate kernels
@@ -989 +997 @@
     INTERPOLATE_SETUP(x, y);
     xExact = yExact = false;
+    if (xExact && yExact) { /* possible alternative */ }
 
     psF32 xKernel[size], yKernel[size]; // Interpolation kernels
@@ -1038 +1047 @@
     INTERPOLATE_SETUP(x, y);
     xExact = yExact = false;
+    if (xExact && yExact) { /* possible alternative */ }
 
     psF32 xKernel[size], yKernel[size]; // Interpolation kernels

trunk/psLib/src/imageops/psImageStructManip.c

@@ -212 +212 @@
     elementSize = PSELEMTYPE_SIZEOF(inDatatype);
 
+    if (0) { fprintf (stderr, "%d elements, %d total memory\n", elements, elements * elementSize); }
+
     output = p_psImageRecycle(file, lineno, func, output, numCols, numRows, type);
     P_PSIMAGE_SET_COL0(output, input->col0);