Changeset 34089 for trunk/magic/remove/src

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/magic/remove/src

Files:

• Makefile.am (modified) (1 diff)
• streakscompare.c (modified) (1 diff)
• streaksio.c (modified) (1 diff)
• streaksrelease.c (modified) (1 diff)

trunk/magic/remove/src/Makefile.am

@@ -24 +24 @@
 STREAKSREMOVE_CFLAGS=-DSTREAKS_COMPRESS_OUTPUT=1
 
-STREAKSCFLAGS = $(STREAKSREMOVE_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
-STREAKSLDFLAGS = $(STREAKSREMOVE_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
+STREAKSCFLAGS = $(STREAKSREMOVE_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) ${NEBCLIENT_CFLAGS}
+STREAKSLDFLAGS = $(STREAKSREMOVE_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS) ${NEBCLIENT_LIBS}
 
 streaksremove_CFLAGS = $(STREAKSCFLAGS)

trunk/magic/remove/src/streakscompare.c

@@ -165 +165 @@
     }
 
+    if (nebulousImage) { /* do something? */ }
+
     if (argc != 1) {
         psString unexpectedArguments = NULL;

trunk/magic/remove/src/streaksio.c

@@ -659 +659 @@
 
         // Ensure input is of the expected type
-        psDataType expected = isMask ? PS_TYPE_IMAGE_MASK : PS_TYPE_F32; // Expected type for image
+        psElemType expected = isMask ? PS_TYPE_IMAGE_MASK : PS_TYPE_F32; // Expected type for image
         for (int i = 0; i < in->imagecube->n; i++) {
             psImage *image = in->imagecube->data[i]; // Image of interest

trunk/magic/remove/src/streaksrelease.c

@@ -288 +288 @@
     } else {
         // we have an image cube
-        double initValue;
+        // double initValue;
         if (exciseImageCube) {
             // copy the entire input image to the recovery image
             writeImageCube(sf->recImage, sf->inImage->imagecube, extname, sf->extnum);
-            initValue = NAN;
+            // initValue = NAN;
         } else {
             // otherwise write it to the output
             writeImageCube(sf->outImage, sf->inImage->imagecube, extname, sf->extnum);
-            initValue = 0;
+            // initValue = 0;
         }