r5231: Auto commit for Debian build

[ctsim.git] / libctsim / imagefile.cpp

diff --git a/libctsim/imagefile.cpp b/libctsim/imagefile.cpp
index 4a49465065257ba2f02dd5c4df6c20e2b1cd4ebc..57d5b65cb1dac1dfae11abccb40364bbf98af7df 100644 (file)
--- a/libctsim/imagefile.cpp
+++ b/libctsim/imagefile.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: imagefile.cpp,v 1.46 2002/06/27 03:19:23 kevin Exp $
+**  $Id: imagefile.cpp,v 1.48 2003/07/04 21:39:40 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -29,6 +29,7 @@
 #ifdef HAVE_CTN_DICOM
 #include "ctndicom.h"
 #endif
+#include "interpolator.h"
 
 const double ImageFile::s_dRedGrayscaleFactor = 0.299;
 const double ImageFile::s_dGreenGrayscaleFactor = 0.587;
@@ -50,27 +51,29 @@ const int ImageFile::EXPORT_FORMAT_RAW = 6;
 
 const char* ImageFile::s_aszExportFormatName[] = 
 {
-  {"text"},
-  {"pgm"},
-  {"pgmascii"},
+  "text",
+  "pgm",
+  "pgmascii",
 #ifdef HAVE_PNG
-  {"png"},
-  {"png16"},
+  "png",
+  "png16",
 #endif
 #ifdef HAVE_CTN_DICOM
-  {"dicom"},
+  "dicom",
 #endif
 };
 
 const char* ImageFile::s_aszExportFormatTitle[] = 
 {
-  {"Text"},
-  {"PGM"},
-  {"PGM ASCII"},
-  {"PNG"},
-  {"PNG 16-bit"},
+  "Text",
+  "PGM",
+  "PGM ASCII",
+#ifdef HAVE_PNG
+  "PNG",
+  "PNG 16-bit",
+#endif
 #ifdef HAVE_CTN_DICOM
-  {"Dicom"},
+  "Dicom",
 #endif
 };
 const int ImageFile::s_iExportFormatCount = sizeof(s_aszExportFormatName) / sizeof(const char*);
@@ -88,21 +91,23 @@ const int ImageFile::IMPORT_FORMAT_DICOM = 2;
 
 const char* ImageFile::s_aszImportFormatName[] = 
 {
-  {"ppm"},
+  "ppm",
 #ifdef HAVE_PNG
-  {"png"},
+  "png",
 #endif
 #ifdef HAVE_CTN_DICOM
-  {"dicom"},
+  "dicom",
 #endif
 };
 
 const char* ImageFile::s_aszImportFormatTitle[] = 
 {
-  {"PPM"},
-  {"PNG"},
+  "PPM",
+#ifdef HAVE_PNG
+  "PNG",
+#endif
 #ifdef HAVE_CTN_DICOM
-  {"Dicom"},
+  "Dicom",
 #endif
 };
 const int ImageFile::s_iImportFormatCount = sizeof(s_aszImportFormatName) / sizeof(const char*);