Changeset 6086 for trunk/ippTools/src/p2rawToPending.c

Timestamp:

Jan 20, 2006, 11:47:20 AM (21 years ago)

Author:

jhoblitt

Message:

table field updates
more cleanups

File:

• trunk/ippTools/src/p2rawToPending.c (modified) (2 diffs)

trunk/ippTools/src/p2rawToPending.c

@@ -2 +2 @@
 
 // select pending frames (exposure+images) which are done/not done
-psArray *p2rawToPending (p2Config *config, psArray *rawFrames) {
+psArray *p2rawToPending(p2Config *config, psArray *rawFrames) {
 
     psArray *pendingFrames = psArrayAlloc(rawFrames->n);
@@ -8 +8 @@
 
     for (int i = 0; i < rawFrames->n; i++) {
-        ppRawFrame *rawFrame = rawFrames->data[i];
+        ppRawFrame *rawFrame = rawFrames->data[i];
 
-        p2PendingExpRow *pendingExposure = p2PendingExpRowAlloc(
-            rawFrame->exposure->exp_id,
-            rawFrame->exposure->class,
-            rawFrame->exposure->nclass,
-            0xff,   // p1
-            0xff    // p2
-    );
-
-        psArray *pendingImages = psArrayAlloc (rawFrame->images->n);
-        pendingImages->n = 0;
-        for (int j = 0; j < rawFrame->images->n; j++) {
-            rawImfileRow *rawImage = rawFrame->images->data[j];
-            p2PendingImfileRow *pendingImage = p2PendingImfileRowAlloc(
-                rawImage->exp_id,
-                rawImage->class,
-                rawImage->class_id,
-                0xff,   // p1
-                0xff,   // p2
-            "",     // recipe
-            "",     // stats
-                rawImage->url
+        p2PendingExpRow *pendingExposure = p2PendingExpRowAlloc(
+            rawFrame->exposure->exp_id,
+            rawFrame->exposure->camera,
+            rawFrame->exposure->filter,
+            rawFrame->exposure->class,
+            rawFrame->exposure->nclass,
+            0xff,   // p1
+            0xff    // p2
         );
 
-            psArrayAdd (pendingImages, 100, pendingImage);
-        }
-        
-        p2PendingFrame *pendingFrame = p2PendingFrameAlloc (pendingExposure, pendingImages);
-        psArrayAdd (pendingFrames, 100, pendingFrame);
+        psArray *pendingImages = psArrayAlloc(rawFrame->images->n);
+        pendingImages->n = 0;
+        for (int j = 0; j < rawFrame->images->n; j++) {
+            rawImfileRow *rawImage = rawFrame->images->data[j];
+            p2PendingImfileRow *pendingImage = p2PendingImfileRowAlloc(
+                rawImage->exp_id,
+                rawImage->exptype,
+                rawImage->class,
+                rawImage->class_id,
+                0xff,   // p1
+                0xff,   // p2
+                "",     // recipe
+                "",     // stats
+                rawImage->url
+            );
+
+            psArrayAdd(pendingImages, 100, pendingImage);
+        }
+
+        p2PendingFrame *pendingFrame = p2PendingFrameAlloc(pendingExposure,
+            pendingImages);
+        psArrayAdd(pendingFrames, 100, pendingFrame);
     }
+
     return pendingFrames;
-} 
+}
 
 // XXX the filename layout is defined by this code