Changeset 21363 for trunk/psModules/src/camera/pmFPAConstruct.c

Timestamp:

Feb 5, 2009, 4:31:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging pap_branch_20090128. Resolved a small number of conflicts. Compiles, but not tested in detail.

File:

• trunk/psModules/src/camera/pmFPAConstruct.c (modified) (3 diffs)

trunk/psModules/src/camera/pmFPAConstruct.c

@@ -1499 +1499 @@
                 psImage *image = readout->image; // The image
                 psImage *mask = readout->mask; // The mask
-                psImage *weight = readout->weight; // The weight
+                psImage *variance = readout->variance; // The variance
                 psList *bias = readout->bias; // The list of bias images
                 if (image) {
                     INDENT(fd, 7);
-                    fprintf(fd, "Image: [%d:%d,%d:%d] (%dx%d)\n", image->col0, image->col0 +
-                            image->numCols, image->row0, image->row0 + image->numRows, image->numCols,
-                            image->numRows);
+                    fprintf(fd, "Image: [%d:%d,%d:%d] (%dx%d)\n",
+                            image->col0, image->col0 + image->numCols,
+                            image->row0, image->row0 + image->numRows,
+                            image->numCols, image->numRows);
                 }
                 if (bias) {
@@ -1512 +1513 @@
                     while ((biasImage = psListGetAndIncrement(biasIter))) {
                         INDENT(fd, 7);
-                        fprintf(fd, "Bias:  [%d:%d,%d:%d] (%dx%d)\n", biasImage->col0,
-                                biasImage->col0 + biasImage->numCols, biasImage->row0,
-                                biasImage->row0 + biasImage->numRows, biasImage->numCols, biasImage->numRows);
+                        fprintf(fd, "Bias:  [%d:%d,%d:%d] (%dx%d)\n",
+                                biasImage->col0, biasImage->col0 + biasImage->numCols,
+                                biasImage->row0, biasImage->row0 + biasImage->numRows,
+                                biasImage->numCols, biasImage->numRows);
                     }
                     psFree(biasIter);
@@ -1520 +1522 @@
                 if (mask) {
                     INDENT(fd, 7);
-                    fprintf(fd, "Mask: [%d:%d,%d:%d] (%dx%d)\n", mask->col0, mask->col0 +
-                            mask->numCols, mask->row0, mask->row0 + mask->numRows, mask->numCols,
-                            mask->numRows);
+                    fprintf(fd, "Mask: [%d:%d,%d:%d] (%dx%d)\n",
+                            mask->col0, mask->col0 + mask->numCols,
+                            mask->row0, mask->row0 + mask->numRows,
+                            mask->numCols, mask->numRows);
                 }
-                if (weight) {
+                if (variance) {
                     INDENT(fd, 7);
-                    fprintf(fd, "Weight: [%d:%d,%d:%d] (%dx%d)\n", weight->col0, weight->col0 +
-                            weight->numCols, weight->row0, weight->row0 + weight->numRows, weight->numCols,
-                            weight->numRows);
+                    fprintf(fd, "Variance: [%d:%d,%d:%d] (%dx%d)\n",
+                            variance->col0, variance->col0 + variance->numCols,
+                            variance->row0, variance->row0 + variance->numRows,
+                            variance->numCols, variance->numRows);
                 }
             } // Iterating over cell