Changeset 28933

Timestamp:

Aug 17, 2010, 10:37:00 AM (16 years ago)

Author:

bills

Message:

from trunk r28882 delay check that astrometry is compatible with input image until after Mosaic image has been made

File:

• tags/ipp-20100701/pstamp/src/ppstampMakeStamp.c (modified) (4 diffs, 1 prop)

tags/ipp-20100701/pstamp/src/ppstampMakeStamp.c

@@ -229 +229 @@
 
 static int makeStamp(pmConfig *config, ppstampOptions *options, pmFPAfile *input,
-                pmChip *inChip, pmFPAview *view, pmAstromObj *center)
+                pmChip *inChip, pmFPAview *view, pmAstromObj *center, pmFPAfile *astrom)
 {
     int status = false;
@@ -266 +266 @@
         srcFile = input;
         *srcView = *view;
+    }
+
+    if (astrom->camera != srcFile->camera) {
+        psError(PS_ERR_UNKNOWN, true, "Input camera and astrometry camera do not match");
+        return PS_EXIT_CONFIG_ERROR;
     }
 
@@ -583 +588 @@
     if (!astrom) {
         astrom = input;
-    } else if (astrom->camera != input->camera) {
-        psError(PS_ERR_UNKNOWN, true, "Input camera and astrometry camera do not match");
-        return PS_EXIT_CONFIG_ERROR;
     }
 
@@ -636 +638 @@
         case PPSTAMP_ON:
         case PPSTAMP_PARTIALLY_ON:
-            returnval = makeStamp(config, options, input, chip, view, center);
+            returnval = makeStamp(config, options, input, chip, view, center, astrom);
             allDone = true;
             foundOverlap = true;