Index: trunk/ppMerge/src/ppMergeCheckInputs.c
===================================================================
--- trunk/ppMerge/src/ppMergeCheckInputs.c	(revision 11249)
+++ trunk/ppMerge/src/ppMergeCheckInputs.c	(revision 11441)
@@ -83,16 +83,16 @@
             }
         } else {
-	  bool valid = false;
-	  if (!pmConfigValidateCameraFormat(&valid, options->format, header)) {
-	    psError (PS_ERR_UNKNOWN, false, "Error in config scripts\n");
-	    exit (PS_EXIT_CONFIG_ERROR);
-	  }
-	  if (!valid) {
-	    psLogMsg(__func__, PS_LOG_WARN, "Input file %s doesn't match camera format --- ignored.\n", name);
-	    // Kick it out
-	    psFree(header);
-	    data->in->data[i] = NULL;
-	    continue;
-	  }
+          bool valid = false;
+          if (!pmConfigValidateCameraFormat(&valid, options->format, header)) {
+            psError (PS_ERR_UNKNOWN, false, "Error in config scripts\n");
+            exit (PS_EXIT_CONFIG_ERROR);
+          }
+          if (!valid) {
+            psLogMsg(__func__, PS_LOG_WARN, "Input file %s doesn't match camera format --- ignored.\n", name);
+            // Kick it out
+            psFree(header);
+            data->in->data[i] = NULL;
+            continue;
+          }
         }
 
@@ -107,7 +107,4 @@
             pmFPAview *view = pmFPAAddSourceFromHeader(data->out, header, options->format);
             psFree(view);
-#if 1
-            pmFPACopyStructure(data->out, data->in->data[i], 1, 1);
-#endif
         }
         psFree(header);