Commit 16f68f0b authored by fogal1's avatar fogal1

Fixed a bug with `DumpImage', where `TIFF' wasn't qualified with the

`SaveWindowAttributes' namespace, the symbol existed in another namespace, and
the compiler picked up the one we didn't want.  This went unnoticed for a long
while because it (happened) to choose PPM for an image format, so the user
still got an image which would display.
The recent addition of the POVRAY format brought the bug to light however, as
we can't dump an image to a POVRAY file (only a dataset).

This also sets `useLZW' to 0; there were patent issues with the LZW
compression, and the writer was bailing out because it could not (legally)
compress the image.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@1633 18c085ea-50e0-402c-830e-de6fd14e8384
parent 2d79bfd4
......@@ -115,6 +115,7 @@
#endif
#include <visit-config.h>
#include <TimingsManager.h>
#include <SaveWindowAttributes.h>
#include <set>
#include <map>
......@@ -4165,6 +4166,11 @@ NetworkManager::CallProgressCallback(const char *module, const char *msg,
// Mark C. Miller, Thu Dec 16 10:25:09 PST 2004
// Added numDumpsAll to correct numbering in output images in parallel
//
// Tom Fogal / Hank Childs, Wed Jul 25 17:13:18 PDT 2007
// Fully qualified the `TIFF' format type, as it was being pulled from an
// improper enum. Changed `useLZW' from 6 to 0 so the writer wouldn't
// complain about patent issues and bail out.
//
// ****************************************************************************
static void
DumpImage(avtDataObject_p img, const char *fmt, bool allprocs)
......@@ -4186,8 +4192,8 @@ DumpImage(avtDataObject_p img, const char *fmt, bool allprocs)
sprintf(tmpName, "%s_%03d.tif", fmt, numDumps);
#endif
fileWriter->SetFormat(TIFF);
int useLZW = 6;
fileWriter->SetFormat(SaveWindowAttributes::TIFF);
int useLZW = 0;
fileWriter->Write(tmpName, img, 100, false, useLZW, false);
if (allprocs)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment