Changeset 9570 for trunk/psModules/src/camera

Timestamp:

Oct 13, 2006, 3:02:31 PM (20 years ago)

Author:

Paul Price

Message:

Renaming functions in pmConceptsRead.h and pmConceptsWrite.h to be private ("p_").
Adding const where appropriate, and changing order of parameters to match usual
convention (outputs go first).

Location:

trunk/psModules/src/camera

Files:

• pmFPAConstruct.c (modified) (1 diff)
• pmFPARead.c (modified) (1 diff)
• pmFPAWrite.c (modified) (3 diffs)

trunk/psModules/src/camera/pmFPAConstruct.c

@@ -368 +368 @@
         }
         newCell->config = psMemIncrRefCounter(cellData);
-        if (!pmConceptsReadCell(newCell, PM_CONCEPT_SOURCE_CAMERA | PM_CONCEPT_SOURCE_DEFAULTS,
+        if (!pmConceptsReadCell(newCell, PM_CONCEPT_SOURCE_CELLS | PM_CONCEPT_SOURCE_DEFAULTS,
                                 false, NULL)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to read concepts from camera and defaults for chip %s, "

trunk/psModules/src/camera/pmFPARead.c

@@ -191 +191 @@
 
     // Make sure we have the information we need
-    if (!pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CAMERA |
+    if (!pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CELLS |
                             PM_CONCEPT_SOURCE_DEFAULTS, true, NULL)) {
         psError(PS_ERR_IO, false, "Failed to read concepts for cell.\n");

trunk/psModules/src/camera/pmFPAWrite.c

@@ -116 +116 @@
 
     if (writeBlank || writeImage) {
-        pmConceptSource source = PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CAMERA |
+        pmConceptSource source = PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CELLS |
                                  PM_CONCEPT_SOURCE_DEFAULTS;
         if (!pmConceptsWriteCell(cell, source, false, NULL)) {
@@ -162 +162 @@
 
         if (writeBlank || writeImage) {
-            pmConceptSource source = PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CAMERA |
+            pmConceptSource source = PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CELLS |
                                      PM_CONCEPT_SOURCE_DEFAULTS;
             if (!pmConceptsWriteChip(chip, source, false, true, NULL)) {
@@ -225 +225 @@
 
         if (writeBlank || writeImage) {
-            pmConceptSource source = PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CAMERA |
+            pmConceptSource source = PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CELLS |
                                      PM_CONCEPT_SOURCE_DEFAULTS;
             if (!pmConceptsWriteFPA(fpa, source, true, NULL)) {