Changeset 18061 for trunk/psModules/src/camera

Timestamp:

Jun 10, 2008, 10:28:59 AM (18 years ago)

Author:

jhoblitt

Message:

add truncate parameter to pmConfigConvertFilename()

Location:

trunk/psModules/src/camera

Files:

• pmFPAfileDefine.c (modified) (4 diffs)
• pmFPAfileIO.c (modified) (1 diff)

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -457 +457 @@
 
     // this function is implicitly an INPUT operation: do not create the file
-    psString realName = pmConfigConvertFilename (infiles->data[0], config, false);
+    psString realName = pmConfigConvertFilename (infiles->data[0], config, false, false);
     if (!realName) {
         psError(PS_ERR_IO, false, "Failed to convert file name %s\n", (char *) infiles->data[0]);
@@ -538 +538 @@
         if (i > 0) {
             // this function is implicitly an INPUT operation: do not create the file
-            psString realName = pmConfigConvertFilename (infiles->data[i], config, false);
+            psString realName = pmConfigConvertFilename (infiles->data[i], config, false, false);
             if (!realName) {
                 psError(PS_ERR_IO, false, "Failed to convert file name %s", (char *) infiles->data[i]);
@@ -672 +672 @@
     for (int i = 0; i < infiles->n; i++) {
         // this function is implicitly an INPUT operation: do not create the file
-        psString realName = pmConfigConvertFilename (infiles->data[i], config, false);
+        psString realName = pmConfigConvertFilename (infiles->data[i], config, false, false);
         if (!realName) {
             psError(PS_ERR_IO, false, "Failed to convert file name %s", (char *) infiles->data[i]);
@@ -925 +925 @@
     // Prepend the global path to the file rule
     // this function is implicitly an INPUT operation: do not create the file
-    psString tmpName = pmConfigConvertFilename(file->filerule, config, false);
+    psString tmpName = pmConfigConvertFilename(file->filerule, config, false, false);
     psFree (file->filerule);
     file->filerule = tmpName;

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -752 +752 @@
     // apply filename mangling rules (file://, path://, neb://)
     bool create = file->mode == PM_FPA_MODE_WRITE ? true : false;
-    psString tmpName = pmConfigConvertFilename (file->filename, config, create);
+    psString tmpName = pmConfigConvertFilename (file->filename, config, create, false);
     psFree (file->filename);
     file->filename = tmpName;