Changeset 19544 for trunk/psModules/src/config/pmConfigCamera.c

Timestamp:

Sep 12, 2008, 4:19:34 PM (18 years ago)

Author:

Paul Price

Message:

Don't generate a mosaicked version of something that is itself generated.

File:

• trunk/psModules/src/config/pmConfigCamera.c (modified) (2 diffs)

trunk/psModules/src/config/pmConfigCamera.c

@@ -416 +416 @@
         assert(camerasItem->type == PS_DATA_METADATA); // Only metadata are allowed here!
         if (!pmConfigGenerateMosaickedVersion(cameras, new, camerasItem->name, PM_FPA_LEVEL_CHIP)) {
-            psError(PS_ERR_UNKNOWN, true, "Failed to build Chip mosaic camera description for %s\n", camerasItem->name);
+            psError(PS_ERR_UNKNOWN, true, "Failed to build Chip mosaic camera description for %s\n",
+                    camerasItem->name);
             return false;
         }
         if (!pmConfigGenerateMosaickedVersion(cameras, new, camerasItem->name, PM_FPA_LEVEL_FPA)) {
-            psError(PS_ERR_UNKNOWN, true, "Failed to build FPA mosaic camera description for %s\n", camerasItem->name);
+            psError(PS_ERR_UNKNOWN, true, "Failed to build FPA mosaic camera description for %s\n",
+                    camerasItem->name);
             return false;
         }
@@ -452 +454 @@
     assert(mosaicLevel == PM_FPA_LEVEL_CHIP || mosaicLevel == PM_FPA_LEVEL_FPA);
 
-    // Don't generate a mosaicked version of a skycell
-    if (name[0] == '_' && strlen(name) > 9 && strcmp(name + strlen(name) - 8, "-SKYCELL") == 0) {
+    if (name[0] == '_') {
+        // It's already a mosaicked version of some sort
         return true;
     }