Changeset 28003 for branches/pap/ppMerge/src/ppMergeCamera.c

Timestamp:

May 18, 2010, 12:49:05 PM (16 years ago)

Author:

eugene

Message:

merging changes from trunk into branches/pap

Location:

branches/pap

Files:

• . (modified) (1 prop)
• ppMerge/src/ppMergeCamera.c (modified) (4 diffs)

branches/pap/ppMerge/src/ppMergeCamera.c

@@ -19 +19 @@
                 const char *name,       ///< Name of output file
                 pmFPAfileType type,     ///< Type of file
-                const char *description, ///< Description of file
                 psMetadata *format,     ///< Camera format
                 pmFPAview *view         ///< View for PHU
@@ -84 +83 @@
     output->save = true;
 
-    if (!pmFPAAddSourceFromView(fpa, description, view, format)) {
+    if (!pmFPAAddSourceFromView(fpa, view, format)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to generate output FPA.");
         return false;
@@ -337 +336 @@
       case PPMERGE_TYPE_FRINGE:
         fileType = PM_FPA_FILE_FRINGE;
-        break;
+        break;
       default:
         psAbort("Unknown frame type: %x", type);
     }
 
-    if (!outputFile(config, outName, fileType, "Merged detrend", format, phuView)) {
+    if (!outputFile(config, outName, fileType, format, phuView)) {
         psFree(outName);
         psFree(phuView);
@@ -349 +348 @@
     psFree(outName);
 
-    if (!outputFile(config, "PPMERGE.OUTPUT.SIGMA", PM_FPA_FILE_IMAGE, "Merge sigma", format, phuView)) {
+    if (!outputFile(config, "PPMERGE.OUTPUT.SIGMA", PM_FPA_FILE_IMAGE, format, phuView)) {
         psFree(phuView);
         return false;
     }
 
-    if (!outputFile(config, "PPMERGE.OUTPUT.COUNT", PM_FPA_FILE_IMAGE, "Merged count", format, phuView)) {
+    if (!outputFile(config, "PPMERGE.OUTPUT.COUNT", PM_FPA_FILE_IMAGE, format, phuView)) {
         psFree(phuView);
         return false;