Changeset 34045

Timestamp:

Jun 20, 2012, 7:07:44 AM (14 years ago)

Author:

eugene

Message:

mods to address pedantic gcc warnings

Location:

branches/eam_branches/ipp-20120601/psLib/src

Files:

• astro/psTime.c (modified) (2 diffs)
• fits/psFitsTable.c (modified) (2 diffs)
• imageops/psImageGeomManip.c (modified) (2 diffs)
• imageops/psImageInterpolate.c (modified) (3 diffs)
• mathtypes/psVector.c (modified) (1 diff)
• types/psLookupTable.c (modified) (2 diffs)

branches/eam_branches/ipp-20120601/psLib/src/astro/psTime.c

@@ -223 +223 @@
 static bool timeInit(const char *fileName)
 {
-    psS32 numLines = 0;
     bool foundTable = false;
     char *tableDir = NULL;
@@ -390 +389 @@
         if (i < numTables) {
             table = psLookupTableAlloc(fullTableName, (const char*)tableFormat, tablesIndex->data.S32[i]);
-            numLines = psLookupTableRead(table);
+            // XXX unused numLines = psLookupTableRead(table);
         } else {
             psError(PS_ERR_BAD_PARAMETER_VALUE, no_problem,

branches/eam_branches/ipp-20120601/psLib/src/fits/psFitsTable.c

@@ -511 +511 @@
                 colSpec *spec = psAlloc(sizeof(colSpec)); // Specification for this column
                 // BOOL type is not a valid vector type, so we translate it to U8
-                spec->type = colItem->type == PS_TYPE_BOOL ? PS_TYPE_U8 : colItem->type;
+                spec->type = colItem->type == PS_DATA_BOOL ? PS_DATA_U8 : colItem->type;
                 spec->size = size;
                 if (colItem->type == PS_DATA_VECTOR) {
@@ -526 +526 @@
                 }
                 if (colItem->type != spec->type &&
-                    colItem->type != PS_TYPE_BOOL && spec->type != PS_TYPE_U8) {
+                    colItem->type != PS_DATA_BOOL && spec->type != PS_DATA_U8) {
                     psWarning("Differing type found for column %s: %x vs %x --- using the first found.\n",
                               colSpecItem->name, colItem->type, spec->type);

branches/eam_branches/ipp-20120601/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);
 

branches/eam_branches/ipp-20120601/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

branches/eam_branches/ipp-20120601/psLib/src/mathtypes/psVector.c

@@ -322 +322 @@
             PSVECTOR_COPY_SAME_CASE(F32);
             PSVECTOR_COPY_SAME_CASE(F64);
-        default: {
-                char* typeStr;
-                PS_TYPE_NAME(typeStr,type);
-                psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                        //                        _("Input psVector is an unsupported type (0x%x)."), typeStr);
-                        "Input psVector is an unsupported type.\n");
-                psFree(output);
-                return NULL;
-            }
+          default: {
+              psError(PS_ERR_BAD_PARAMETER_TYPE, true, "Input psVector is an unsupported type.\n");
+              psFree(output);
+              return NULL;
+          }
         }
         return output;

branches/eam_branches/ipp-20120601/psLib/src/types/psLookupTable.c

@@ -607 +607 @@
     psU64 loIdx = 0;
     long  numRows = 0;
-    long numCols = 0;
     psF64 out = 0.0;
     psF64 denom = 0.0;
@@ -619 +618 @@
     values = table->values;
     numRows = table->index->n;
-    numCols = table->values->n;
     valuesVec = (psVector*)values->data[column];