Changeset 5717 for trunk/pois/src/poisReadStamps.c

Timestamp:

Dec 6, 2005, 6:43:52 PM (21 years ago)

Author:

Paul Price

Message:

Importing current working PAP version (many bug fixes since this branch) straight on top of this version, and tidying up a bit

File:

• trunk/pois/src/poisReadStamps.c (modified) (1 diff)

trunk/pois/src/poisReadStamps.c

@@ -3 +3 @@
 #include "pois.h"
 
-#define MAXLINE 128                     // Maximum length of a line in the stamps file
+#define MAXLINE 128                     // Maximum length of a line in the stamps file
 
 
 psArray *poisReadStamps(psArray *stamps,// Stamps
-                        FILE **stampFP, // File pointer for stamps file
-                        const psImage *image, // Image for which to find stamps
-                        const psImage *mask, // Mask image
-                        const poisConfig *config // Configuration
+                        FILE **stampFP, // File pointer for stamps file
+                        const psImage *image, // Image for which to find stamps
+                        const psImage *mask, // Mask image
+                        const poisConfig *config // Configuration
     )
 {
-    FILE *fp = *stampFP;                // File pointer
-
-    int num = 0;                        // Number of stamps
+    FILE *fp = *stampFP;                // File pointer
 
     if (stamps == NULL) {
-        stamps = psArrayAlloc(config->nsx);
-        // Initialise
-        for (int i = 0; i < config->nsx; i++) {
-            stamps->data[i] = poisStampAlloc();
-        }
+        stamps = psArrayAlloc(config->nsx);
+        // Initialise
+        for (int i = 0; i < config->nsx; i++) {
+            stamps->data[i] = poisStampAlloc();
+        }
     }
 
     for (int i = 0; i < stamps->n; i++) {
-        poisStamp *stamp = stamps->data[i];
+        poisStamp *stamp = stamps->data[i];
 
-        if (stamp->status == POIS_STAMP_RESET) {
-            if (fp) {
-                float x, y;             // Position of stamp
-                int xPixel, yPixel;     // Integer position
-                int result = 0;         // Result of fscanf
-                bool badPixels = false; // Result of check on stamp footprint
-                char line[MAXLINE];     // The line from the stamps file
-                char *lineBack;         // The line back from fgets
-                do {
-                    lineBack = fgets(line, MAXLINE, fp);
-                    result = sscanf(line, "%f %f", &x, &y);
+        if (stamp->status == POIS_STAMP_RESET) {
+            if (fp) {
+                float x, y;             // Position of stamp
+                int xPixel, yPixel;     // Integer position
+                int result = 0;         // Result of fscanf
+                char line[MAXLINE];     // The line from the stamps file
+                char *lineBack;         // The line back from fgets
+                do {
+                    lineBack = fgets(line, MAXLINE, fp);
+                    result = sscanf(line, "%f %f", &x, &y);
 
-                    // Add 0.5 for rounding, and subtract 1.0 for unit-offset to zero-offset
-                    xPixel = (int)(x - 0.5);
-                    yPixel = (int)(y - 0.5);
-                } while (result == 2 && lineBack && ! poisCheckStamp(image, mask, xPixel, yPixel, config));
-                if (result == 2 && lineBack) {
-                    stamp->x = xPixel;
-                    stamp->y = yPixel;
-                    stamp->status = POIS_STAMP_RECALC;
-                    psTrace("pois.readStamps", 7, "Stamp %d: %d,%d\n", i, stamp->x, stamp->y);
-                } else {
-                    // We've run out of stamps in the file --- probably got EOF
-                    stamp->status = POIS_STAMP_BAD;
-                }
-            } else {
-                // Stamp file isn't open!
-                stamp->status = POIS_STAMP_BAD;
-            }
-        }
+                    // Add 0.5 for rounding, and subtract 1.0 for unit-offset to zero-offset
+                    xPixel = (int)(x - 0.5);
+                    yPixel = (int)(y - 0.5);
+                } while (result == 2 && lineBack && ! poisCheckStamp(image, mask, xPixel, yPixel, config));
+                if (result == 2 && lineBack) {
+                    stamp->x = xPixel;
+                    stamp->y = yPixel;
+                    stamp->status = POIS_STAMP_RECALC;
+                    psTrace("pois.readStamps", 7, "Stamp %d: %d,%d\n", i, stamp->x, stamp->y);
+                } else {
+                    // We've run out of stamps in the file --- probably got EOF
+                    stamp->status = POIS_STAMP_BAD;
+                }
+            } else {
+                // Stamp file isn't open!
+                stamp->status = POIS_STAMP_BAD;
+            }
+        }
     }