Changeset 13274 for trunk/psModules/src/camera/pmFPA_JPEG.c

Timestamp:

May 4, 2007, 4:37:02 PM (19 years ago)

Author:

Paul Price

Message:

Don't use pmConfigConvertFilename here --- it's done by pmFPAfileOpen, and only there.

File:

• trunk/psModules/src/camera/pmFPA_JPEG.c (modified) (5 diffs)

trunk/psModules/src/camera/pmFPA_JPEG.c

@@ -5 +5 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-04-18 19:42:37 $
+ *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-05-05 02:37:02 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -22 +22 @@
 #include <stdio.h>
 #include <string.h>
-#include <strings.h>            /* for strn?casecmp */
+#include <strings.h>            /* for strn?casecmp */
 #include <pslib.h>
 
@@ -206 +206 @@
     }
 
-
     if (!isfinite(min) || !isfinite(max)) {
         psLogMsg("jpeg", PS_LOG_WARN, "The stretch parameters are not both finite, writing blank jpeg\n");
@@ -213 +212 @@
     }
 
-    psString name = pmFPAfileNameFromRule (file->filerule, file, view);
-    bool create = file->mode == PM_FPA_MODE_WRITE ? true : false;
-    psString newName = pmConfigConvertFilename(name, config, create);
-
     psImageJpegColormap *map = psImageJpegColormapSet (NULL, colormapName);
     if (!map) {
@@ -222 +217 @@
     }
 
-    psImageJpeg (map, readout->image, newName, min, max);
-
-    psFree(name);
-    psFree(newName);
+    psImageJpeg (map, readout->image, file->filename, min, max);
 
     psFree(map);