Changeset 7621 for trunk/ppImage/src/ppImageMosaic.c

Timestamp:

Jun 21, 2006, 12:51:48 PM (20 years ago)

Author:

eugene

Message:

various fixes

File:

• trunk/ppImage/src/ppImageMosaic.c (modified) (2 diffs)

trunk/ppImage/src/ppImageMosaic.c

@@ -1 +1 @@
 # include "ppImage.h"
 
-bool ppImageMosaicChip (pmChip *chip, pmConfig *config, const pmFPAview *view) {
+bool ppImageMosaicChip (pmConfig *config, const pmFPAview *view, char *outFile, char *inFile) {
 
     bool status;
 
-    pmFPAfile *outByChip = psMetadataLookupPtr (&status, config->files, "PPIMAGE.OUTPUT.CHIP");
+    pmFPAfile *in = psMetadataLookupPtr (&status, config->files, inFile);
     if (!status) {
         psErrorStackPrint(stderr, "Can't find required I/O file!\n");
@@ -11 +11 @@
     }
 
-    pmFPAAddSourceFromView (outByChip->fpa, view, outByChip->format);
-    pmChip *outChip = pmFPAviewThisChip (view, outByChip->fpa);
-    pmChipMosaic (outChip, chip);
+    pmFPAfile *out = psMetadataLookupPtr (&status, config->files, outFile);
+    if (!status) {
+        psErrorStackPrint(stderr, "Can't find required I/O file!\n");
+        exit(EXIT_FAILURE);
+    }
+
+    pmFPAAddSourceFromView (out->fpa, view, out->format);
+    pmChip *outChip = pmFPAviewThisChip (view, out->fpa);
+    pmChip *inChip = pmFPAviewThisChip (view, in->fpa);
+
+    pmChipMosaic (outChip, inChip);
 
     return true;
 }
+
+bool ppImageMosaicFPA (pmConfig *config, char *outFile, char *inFile) {
+
+    bool status;
+
+    pmFPAfile *in = psMetadataLookupPtr (&status, config->files, inFile);
+    if (!status) {
+        psErrorStackPrint(stderr, "Can't find required I/O file!\n");
+        exit(EXIT_FAILURE);
+    }
+
+    pmFPAfile *out = psMetadataLookupPtr (&status, config->files, outFile);
+    if (!status) {
+        psErrorStackPrint(stderr, "Can't find required I/O file!\n");
+        exit(EXIT_FAILURE);
+    }
+
+    pmFPAview *view = pmFPAviewAlloc (0);
+    pmFPAAddSourceFromView (out->fpa, view, out->format);
+    pmFPAMosaic (out->fpa, in->fpa);
+
+    psFree (view);
+    return true;
+}