Changeset 14647 for trunk/psModules/src/camera/pmFPAfileDefine.c

Timestamp:

Aug 23, 2007, 1:42:41 PM (19 years ago)

Author:

magnier

Message:

added formatName to pmFPAfile (needed in some cases)
dropped const from pmConfig argument to pmFPAfileBindFromArgs
changed instances of psErrorStackPrint to psError (should only be used if we abort)
changed API names for pmPSFmodel I/O functions to put pmPSFmodel at front

File:

• trunk/psModules/src/camera/pmFPAfileDefine.c (modified) (11 diffs)

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -203 +203 @@
     }
     file->format = psMemIncrRefCounter(format);
+    file->formatName = psStringCopy(formatName);
 
     if (fpa) {
@@ -351 +352 @@
     psFree (format);
     file->format = psMemIncrRefCounter(format);
+    file->formatName = psStringCopy(config->formatName);
 
     // adjust the rules to identify these files in the file->names data
@@ -440 +442 @@
 // save the pmFPAfile on config->files
 // return the pmFPAfile (a view to the one saved on config->files)
-pmFPAfile *pmFPAfileBindFromArgs (bool *success, pmFPAfile *input, const pmConfig *config, const char *filename, const char *argname)
+pmFPAfile *pmFPAfileBindFromArgs (bool *success, pmFPAfile *input, pmConfig *config, const char *filename, const char *argname)
 {
     PS_ASSERT_PTR_NON_NULL(input, NULL);
@@ -511 +513 @@
 
         if (!format) {
-            format = pmConfigCameraFormatFromHeader((pmConfig*)config, phu, true);
+            format = pmConfigCameraFormatFromHeader(config, phu, true);
             if (!format) {
                 psError(PS_ERR_IO, false, "Failed to read CCD format from %s\n", realName);
@@ -562 +564 @@
     psFree(file->format);
     file->format = format;
+    file->formatName = psStringCopy(config->formatName);
 
     if (success) *success = true;
@@ -639 +642 @@
     psFree (file->format);
     file->format = format;
+    file->formatName = psStringCopy(config->formatName);
 
     // adjust the rules to identify these files in the file->names data
@@ -925 +929 @@
     pmFPAfile *file = pmFPAfileDefineOutput (config, fpa, filename);
     if (!file) {
-        psErrorStackPrint(stderr, "file %s not defined\n", filename);
+        psError(PS_ERR_UNEXPECTED_NULL, false, "file %s not defined\n", filename);
         return NULL;
     }
@@ -944 +948 @@
     pmFPAfile *file = pmFPAfileDefineOutput (config, NULL, filename);
     if (!file) {
-        psErrorStackPrint(stderr, "file %s not defined\n", filename);
+        psError(PS_ERR_UNEXPECTED_NULL, false, "file %s not defined\n", filename);
         return NULL;
     }
     if (!file->camera) {
-        psErrorStackPrint(stderr, "file %s does not define a new camera\n", filename);
+        psError(PS_ERR_UNEXPECTED_NULL, false, "file %s does not define a new camera\n", filename);
         return NULL;
     }
@@ -987 +991 @@
     }
     if (!file) {
-        psErrorStackPrint(stderr, "file %s not defined\n", filename);
+        psError(PS_ERR_UNEXPECTED_NULL, false, "file %s not defined\n", filename);
         return NULL;
     }
@@ -1030 +1034 @@
     }
     if (!file) {
-        psErrorStackPrint(stderr, "file %s not defined\n", filename);
+        psError(PS_ERR_UNEXPECTED_NULL, false, "file %s not defined\n", filename);
         return NULL;
     }
@@ -1075 +1079 @@
     }
     if (!file) {
-        psErrorStackPrint(stderr, "file %s not defined\n", filename);
+        psError(PS_ERR_UNEXPECTED_NULL, false, "file %s not defined\n", filename);
         return NULL;
     }