X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=libctsim%2Fimagefile.cpp;h=b4564322c6f32745c75734a64efd559f04f3332d;hp=df647ce930efad8de0b4a8288f14c99499fc71bb;hb=7f8f356151b0c8db0dbbf1c1896cc22630d6c774;hpb=7ec2cd66921180a624813dff9f8bac76c6b268cc

diff --git a/libctsim/imagefile.cpp b/libctsim/imagefile.cpp
index df647ce..b456432 100644
--- a/libctsim/imagefile.cpp
+++ b/libctsim/imagefile.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: imagefile.cpp,v 1.28 2001/01/01 10:14:34 kevin Exp $
+**  $Id: imagefile.cpp,v 1.36 2001/01/12 16:41:56 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
@@ -27,68 +27,92 @@
 
 #include "ct.h"
 
+const int ImageFile::FORMAT_INVALID = -1;
+const int ImageFile::FORMAT_PGM = 0;
+const int ImageFile::FORMAT_PGMASCII = 1;
+#ifdef HAVE_PNG
+const int ImageFile::FORMAT_PNG = 2;
+const int ImageFile::FORMAT_PNG16 = 3;
+#endif
+
+const char* ImageFile::s_aszFormatName[] = 
+{
+  {"pgm"},
+  {"pgmascii"},
+#ifdef HAVE_PNG
+  {"png"},
+  {"png16"},
+#endif
+};
+
+const char* ImageFile::s_aszFormatTitle[] = 
+{
+  {"PGM"},
+  {"PGM ASCII"},
+  {"PNG"},
+  {"PNG 16-bit"},
+};
 
-F32Image::F32Image (int nx, int ny, int dataType)
-: Array2dFile (nx, ny, sizeof(kfloat32), Array2dFile::PIXEL_FLOAT32, dataType)
-{
-}
-
-F32Image::F32Image (void)
-: Array2dFile()
-{
-  setPixelFormat (Array2dFile::PIXEL_FLOAT32);
-  setPixelSize (sizeof(kfloat32));
-  setDataType (Array2dFile::DATA_TYPE_REAL);
-}
-
-F64Image::F64Image (int nx, int ny, int dataType)
-: Array2dFile (nx, ny, sizeof(kfloat64), Array2dFile::PIXEL_FLOAT64, dataType)
-{
-}
-
-F64Image::F64Image (void)
-: Array2dFile ()
-{
-  setPixelFormat (PIXEL_FLOAT64);
-  setPixelSize (sizeof(kfloat64));
-  setDataType (Array2dFile::DATA_TYPE_REAL);
-}
+const int ImageFile::s_iFormatCount = sizeof(s_aszFormatName) / sizeof(const char*);
+
+
+
+F32Image::F32Image (int nx, int ny, int dataType)
+: Array2dFile (nx, ny, sizeof(kfloat32), Array2dFile::PIXEL_FLOAT32, dataType)
+{
+}
+
+F32Image::F32Image (void)
+: Array2dFile()
+{
+  setPixelFormat (Array2dFile::PIXEL_FLOAT32);
+  setPixelSize (sizeof(kfloat32));
+  setDataType (Array2dFile::DATA_TYPE_REAL);
+}
+
+F64Image::F64Image (int nx, int ny, int dataType)
+: Array2dFile (nx, ny, sizeof(kfloat64), Array2dFile::PIXEL_FLOAT64, dataType)
+{
+}
+
+F64Image::F64Image (void)
+: Array2dFile ()
+{
+  setPixelFormat (PIXEL_FLOAT64);
+  setPixelSize (sizeof(kfloat64));
+  setDataType (Array2dFile::DATA_TYPE_REAL);
+}
 
 void 
-ImageFile::filterResponse (const char* const domainName, double bw, const char* const filterName, double filt_param)
-{
-  ImageFileArray v = getArray();
-  SignalFilter filter (filterName, domainName, bw, filt_param);
-
-#if 1
-  int iXCenter, iYCenter;
-  if (isEven (m_nx))
-    iXCenter = m_nx / 2;
-  else
-    iXCenter = (m_nx - 1) / 2;
-  if (isEven (m_ny))
-    iYCenter = m_ny / 2;
-  else
-    iYCenter = (m_ny - 1) / 2;
-
-  for (int ix = 0; ix < m_nx; ix++)
-    for (int iy = 0; iy < m_ny; iy++) {
-      long lD2 = (ix - iXCenter) * (ix - iXCenter) + (iy - iYCenter) * (iy - iYCenter);
-      double r = ::sqrt (static_cast<double>(lD2));
-      v[ix][iy] = filter.response (r);
-    }
-#else
-  int hx = (m_nx - 1) / 2;
-  int hy = (m_ny - 1) / 2;
+ImageFile::getCenterCoordinates (unsigned int& iXCenter, unsigned int& iYCenter)
+{
+  if (isEven (m_nx))
+    iXCenter = m_nx / 2;
+  else
+    iXCenter = (m_nx - 1) / 2;
+
+  if (isEven (m_ny))
+    iYCenter = m_ny / 2;
+  else
+    iYCenter = (m_ny - 1) / 2;
+}
+
+
+void 
+ImageFile::filterResponse (const char* const domainName, double bw, const char* const filterName, double filt_param, double dInputScale, double dOutputScale)
+{
+  ImageFileArray v = getArray();
+  SignalFilter filter (filterName, domainName, bw, filt_param);
   
-  for (int i = -hx; i <= hx; i++) {
-    for (int j = -hy; j <= hy; j++) {
-      double r = ::sqrt (i * i + j * j);
-      
-      v[i+hx][j+hy] = filter.response (r);
+  unsigned int iXCenter, iYCenter;
+  getCenterCoordinates (iXCenter, iYCenter);
+
+  for (unsigned int ix = 0; ix < m_nx; ix++)
+    for (unsigned int iy = 0; iy < m_ny; iy++) {
+      long lD2 = ((ix - iXCenter) * (ix - iXCenter)) + ((iy - iYCenter) * (iy - iYCenter));
+      double r = ::sqrt (static_cast<double>(lD2)) * dInputScale;
+      v[ix][iy] = filter.response (r) * dOutputScale;
     }
-  }
-#endif
 }
 
 int
@@ -234,58 +258,58 @@ ImageFile::printStatistics (std::ostream& os) const
 {
   double min, max, mean, mode, median, stddev;
   
-  statistics (min, max, mean, mode, median, stddev);
-  if (isComplex())
-    os << "Real Component Statistics" << std::endl;
+  statistics (min, max, mean, mode, median, stddev);
+  if (isComplex())
+    os << "Real Component Statistics" << std::endl;
   
   os << "   min: " << min << std::endl;
   os << "   max: " << max << std::endl;
   os << "  mean: " << mean << std::endl;
   os << "  mode: " << mode << std::endl;
   os << "median: " << median << std::endl;
-  os << "stddev: " << stddev << std::endl;
-  
-  if (isComplex()) {
-    statistics (getImaginaryArray(), min, max, mean, mode, median, stddev);
+  os << "stddev: " << stddev << std::endl;
+  
+  if (isComplex()) {
+    statistics (getImaginaryArray(), min, max, mean, mode, median, stddev);
     os << std::endl << "Imaginary Component Statistics" << std::endl;
-    os << "   min: " << min << std::endl;
-    os << "   max: " << max << std::endl;
-    os << "  mean: " << mean << std::endl;
-    os << "  mode: " << mode << std::endl;
-    os << "median: " << median << std::endl;
-    os << "stddev: " << stddev << std::endl;
-  }
+    os << "   min: " << min << std::endl;
+    os << "   max: " << max << std::endl;
+    os << "  mean: " << mean << std::endl;
+    os << "  mode: " << mode << std::endl;
+    os << "median: " << median << std::endl;
+    os << "stddev: " << stddev << std::endl;
+  }
 }
 
 
 void
 ImageFile::statistics (double& min, double& max, double& mean, double& mode, double& median, double& stddev) const
-{
-  ImageFileArrayConst v = getArray();
-  statistics (v, min, max, mean, mode, median, stddev);
+{
+  ImageFileArrayConst v = getArray();
+  statistics (v, min, max, mean, mode, median, stddev);
 }
 
 
-void
-ImageFile::statistics (ImageFileArrayConst v, double& min, double& max, double& mean, double& mode, double& median, double& stddev) const
-{
-  int nx = m_nx;
-  int ny = m_ny;
-  
-  if (v == NULL || nx == 0 || ny == 0)
-    return;
-  
-  std::vector<double> vecImage;
-  int iVec = 0;
-  vecImage.resize (nx * ny);
-  for (int ix = 0; ix < nx; ix++) {
-    for (int iy = 0; iy < ny; iy++)
-      vecImage[iVec++] = v[ix][iy];
-  }
-  
-  vectorNumericStatistics (vecImage, nx * ny, min, max, mean, mode, median, stddev);
-}
-
+void
+ImageFile::statistics (ImageFileArrayConst v, double& min, double& max, double& mean, double& mode, double& median, double& stddev) const
+{
+  int nx = m_nx;
+  int ny = m_ny;
+  
+  if (v == NULL || nx == 0 || ny == 0)
+    return;
+  
+  std::vector<double> vecImage;
+  int iVec = 0;
+  vecImage.resize (nx * ny);
+  for (int ix = 0; ix < nx; ix++) {
+    for (int iy = 0; iy < ny; iy++)
+      vecImage[iVec++] = v[ix][iy];
+  }
+  
+  vectorNumericStatistics (vecImage, nx * ny, min, max, mean, mode, median, stddev);
+}
+
 void
 ImageFile::getMinMax (double& min, double& max) const
 {
@@ -307,680 +331,917 @@ ImageFile::getMinMax (double& min, double& max) const
     }
   }
 }
-
-bool
-ImageFile::convertRealToComplex ()
-{
-  if (dataType() != Array2dFile::DATA_TYPE_REAL)
-    return false;
-  
-  if (! reallocRealToComplex())
-    return false;
-  
-  ImageFileArray vImag = getImaginaryArray();
-  for (unsigned int ix = 0; ix < m_nx; ix++) {
-    ImageFileColumn vCol = vImag[ix];
-    for (unsigned int iy = 0; iy < m_ny; iy++)
-      *vCol++ = 0;
-  }
-  
-  return true;
-}
-
-bool
-ImageFile::convertComplexToReal ()
-{
-  if (dataType() != Array2dFile::DATA_TYPE_COMPLEX)
-    return false;
-  
-  ImageFileArray vReal = getArray();
-  ImageFileArray vImag = getImaginaryArray();
-  for (unsigned int ix = 0; ix < m_nx; ix++) {
-    ImageFileColumn vRealCol = vReal[ix];
-    ImageFileColumn vImagCol = vImag[ix];
-    for (unsigned int iy = 0; iy < m_ny; iy++) {
-      CTSimComplex c (*vRealCol, *vImagCol);
-      *vRealCol++ = std::abs (c);
-      vImagCol++;
-    }
-  }
-  
-  return reallocComplexToReal();
-}
-
-bool
-ImageFile::subtractImages (const ImageFile& rRHS, ImageFile& result) const
-{
-  if (m_nx != rRHS.nx() || m_ny != rRHS.ny() || m_nx != result.nx() || m_ny != result.ny()) {
-    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::subtractImage]");
-    return false;
-  }
-  
-  ImageFileArrayConst vLHS = getArray();
-  ImageFileArrayConst vRHS = rRHS.getArray();
-  ImageFileArray vResult = result.getArray();
-  
-  for (unsigned int ix = 0; ix < m_nx; ix++) {
-    ImageFileColumnConst in1 = vLHS[ix];
-    ImageFileColumnConst in2 = vRHS[ix];
-    ImageFileColumn out = vResult[ix];
-    for (unsigned int iy = 0; iy < m_ny; iy++)
-      *out++ = *in1++ - *in2++;
-  }
-  
-  return true;
-}
-
-bool
-ImageFile::addImages (const ImageFile& rRHS, ImageFile& result) const
-{
-  if (m_nx != rRHS.nx() || m_ny != rRHS.ny() || m_nx != result.nx() || m_ny != result.ny()) {
-    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::subtractImage]");
-    return false;
-  }
-  
-  ImageFileArrayConst vLHS = getArray();
-  ImageFileArrayConst vRHS = rRHS.getArray();
-  ImageFileArray vResult = result.getArray();
-  
-  for (unsigned int ix = 0; ix < m_nx; ix++) {
-    ImageFileColumnConst in1 = vLHS[ix];
-    ImageFileColumnConst in2 = vRHS[ix];
-    ImageFileColumn out = vResult[ix];
-    for (unsigned int iy = 0; iy < m_ny; iy++)
-      *out++ = *in1++ + *in2++;
-  }
-  
-  return true;
-}
-
-bool
-ImageFile::multiplyImages (const ImageFile& rRHS, ImageFile& result) const
-{
-  if (m_nx != rRHS.nx() || m_ny != rRHS.ny() || m_nx != result.nx() || m_ny != result.ny()) {
-    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::subtractImage]");
-    return false;
-  }
-  
-  ImageFileArrayConst vLHS = getArray();
-  ImageFileArrayConst vRHS = rRHS.getArray();
-  ImageFileArray vResult = result.getArray();
-  
-  for (unsigned int ix = 0; ix < m_nx; ix++) {
-    ImageFileColumnConst in1 = vLHS[ix];
-    ImageFileColumnConst in2 = vRHS[ix];
-    ImageFileColumn out = vResult[ix];
-    for (unsigned int iy = 0; iy < m_ny; iy++)
-      *out++ = *in1++ * *in2++;
-  }
-  
-  return true;
-}
-
-bool
-ImageFile::divideImages (const ImageFile& rRHS, ImageFile& result) const
-{
-  if (m_nx != rRHS.nx() || m_ny != rRHS.ny() || m_nx != result.nx() || m_ny != result.ny()) {
-    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::subtractImage]");
-    return false;
-  }
-  
-  ImageFileArrayConst vLHS = getArray();
-  ImageFileArrayConst vRHS = rRHS.getArray();
-  ImageFileArray vResult = result.getArray();
-  
-  for (unsigned int ix = 0; ix < m_nx; ix++) {
-    ImageFileColumnConst in1 = vLHS[ix];
-    ImageFileColumnConst in2 = vRHS[ix];
-    ImageFileColumn out = vResult[ix];
-    for (unsigned int iy = 0; iy < m_ny; iy++) {
-      if (*in2 != 0.)
-        *out++ = *in1++ / *in2++;
-      else
-        *out++ = 0;
-    }
-  }
-  
-  return true;
-}
-
-
-bool
-ImageFile::invertPixelValues (ImageFile& result) const
-{
-  if (m_nx != result.nx() || m_ny != result.ny()) {
-    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::invertPixelValues]");
-    return false;
-  }
-  
-  ImageFileArrayConst vLHS = getArray();
-  ImageFileArray vResult = result.getArray();
-  
-  for (unsigned int ix = 0; ix < m_nx; ix++) {
-    ImageFileColumnConst in = vLHS[ix];
-    ImageFileColumn out = vResult[ix];
-    for (unsigned int iy = 0; iy < m_ny; iy++)
-      *out++ = - *in++;
-  }
-  
-  return true;
-}
-
-bool
-ImageFile::sqrt (ImageFile& result) const
-{
-  if (m_nx != result.nx() || m_ny != result.ny()) {
-    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::invertPixelValues]");
-    return false;
-  }
-  
-  ImageFileArrayConst vLHS = getArray();
-  ImageFileArray vResult = result.getArray();
-  
-  for (unsigned int ix = 0; ix < m_nx; ix++) {
-    ImageFileColumnConst in = vLHS[ix];
-    ImageFileColumn out = vResult[ix];
-    for (unsigned int iy = 0; iy < m_ny; iy++)
-      if (*in < 0)
-        *out++ = -::sqrt(-*in++);
-      else
-        *out++ = ::sqrt(*in++);
-  }
-  
-  return true;
-}
-
-bool
-ImageFile::log (ImageFile& result) const
-{
-  if (m_nx != result.nx() || m_ny != result.ny()) {
-    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::invertPixelValues]");
-    return false;
-  }
-  
-  ImageFileArrayConst vLHS = getArray();
-  ImageFileArray vResult = result.getArray();
-  
-  for (unsigned int ix = 0; ix < m_nx; ix++) {
-    ImageFileColumnConst in = vLHS[ix];
-    ImageFileColumn out = vResult[ix];
-    for (unsigned int iy = 0; iy < m_ny; iy++)
-      if (*in <= 0)
-        *out++ = 0;
-      else
-        *out++ = ::log(*in++);
-  }
-  
-  return true;
-}
-
-bool
-ImageFile::exp (ImageFile& result) const
-{
-  if (m_nx != result.nx() || m_ny != result.ny()) {
-    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::invertPixelValues]");
-    return false;
-  }
-  
-  ImageFileArrayConst vLHS = getArray();
-  ImageFileArray vResult = result.getArray();
-  
-  for (unsigned int ix = 0; ix < m_nx; ix++) {
-    ImageFileColumnConst in = vLHS[ix];
-    ImageFileColumn out = vResult[ix];
-    for (unsigned int iy = 0; iy < m_ny; iy++)
-      *out++ = ::exp (*in++);
-  }
-  
-  return true;
-}
-
-namespace ProcessImage {
-
-void
-shuffleFourierToNaturalOrder (ImageFile& im)
-{
-  ImageFileArray vReal = im.getArray();
-  ImageFileArray vImag = im.getImaginaryArray();
-  unsigned int ix, iy;
-  unsigned int nx = im.nx();
-  unsigned int ny = im.ny();
-
-  // shuffle each column
-  for (ix = 0; ix < nx; ix++) {
-    ProcessSignal::shuffleFourierToNaturalOrder (vReal[ix], ny);
-    if (im.isComplex())
-      ProcessSignal::shuffleFourierToNaturalOrder (vImag[ix], ny);
-  }
-
-  // shuffle each row
-  float* pRow = new float [nx];
-  for (iy = 0; iy < ny; iy++) {
-    for (ix = 0; ix < nx; ix++)
-      pRow[ix] = vReal[ix][iy];
-    ProcessSignal::shuffleFourierToNaturalOrder (pRow, nx);
-    for (ix = 0; ix < nx; ix++)
-      vReal[ix][iy] = pRow[ix];
-    if (im.isComplex()) {
-      for (ix = 0; ix < nx; ix++)
-        pRow[ix] = vImag[ix][iy];
-      ProcessSignal::shuffleFourierToNaturalOrder (pRow, nx);;
-      for (ix = 0; ix < nx; ix++)
-        vImag[ix][iy] = pRow[ix];
-    }
-  }
-  delete pRow;
-}
- 
-void
-shuffleNaturalToFourierOrder (ImageFile& im)
-{
-  ImageFileArray vReal = im.getArray();
-  ImageFileArray vImag = im.getImaginaryArray();
-  unsigned int ix, iy;
-  unsigned int nx = im.nx();
-  unsigned int ny = im.ny();
-
-  // shuffle each x column
-  for (ix = 0; ix < nx; ix++) {
-    ProcessSignal::shuffleNaturalToFourierOrder (vReal[ix], ny);
-    if (im.isComplex())
-      ProcessSignal::shuffleNaturalToFourierOrder (vImag[ix], ny);
-  }
-
-  // shuffle each y row
-  float* pRow = new float [nx];
-  for (iy = 0; iy < ny; iy++) {
-    for (ix = 0; ix < nx; ix++)
-      pRow[ix] = vReal[ix][iy];
-    ProcessSignal::shuffleNaturalToFourierOrder (pRow, nx);
-    for (ix = 0; ix < nx; ix++)
-      vReal[ix][iy] = pRow[ix];
-    if (im.isComplex()) {
-      for (ix = 0; ix < nx; ix++)
-        pRow[ix] = vImag[ix][iy];
-      ProcessSignal::shuffleNaturalToFourierOrder (pRow, nx);
-      for (ix = 0; ix < nx; ix++)
-        vImag[ix][iy] = pRow[ix];
-    }
-  }
-  delete [] pRow;
-}
-
- 
-}; // namespace ProcessIamge
-
-#ifdef HAVE_FFTW
-bool
-ImageFile::fft (ImageFile& result) const
-{
-  if (m_nx != result.nx() || m_ny != result.ny()) {
-    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::invertPixelValues]");
-    return false;
-  }
-
-  if (result.dataType() == Array2dFile::DATA_TYPE_REAL) {
-    if (! result.reallocRealToComplex ())
-      return false;
-  }
-
-  fftw_complex* in = new fftw_complex [m_nx * m_ny];
-
-  ImageFileArrayConst vReal = getArray();
-  ImageFileArrayConst vImag = getImaginaryArray();
-
-  unsigned int ix, iy;
-  unsigned int iArray = 0;
-  for (ix = 0; ix < m_nx; ix++)
-    for (iy = 0; iy < m_ny; iy++) {
-      in[iArray].re = vReal[ix][iy];
-      if (isComplex())
-        in[iArray].im = vImag[ix][iy];
-      else
-        in[iArray].im = 0;
-      iArray++;
-    }
-
-  fftwnd_plan plan = fftw2d_create_plan (m_nx, m_ny, FFTW_FORWARD, FFTW_IN_PLACE);
-
-  fftwnd_one (plan, in, NULL);
-
-  ImageFileArray vRealResult = result.getArray();
-  ImageFileArray vImagResult = result.getImaginaryArray();
-  iArray = 0;
-  unsigned int iScale = m_nx * m_ny;
-  for (ix = 0; ix < m_nx; ix++)
-    for (iy = 0; iy < m_ny; iy++) {
-      vRealResult[ix][iy] = in[iArray].re / iScale;
-      vImagResult[ix][iy] = in[iArray].im / iScale;
-      iArray++;
-    }
-
-  fftwnd_destroy_plan (plan);
-  delete in;
-
-
-  ProcessImage::shuffleFourierToNaturalOrder (result);
-
-  return true;
-}
-
-
-bool
-ImageFile::ifft (ImageFile& result) const
-{
-  if (m_nx != result.nx() || m_ny != result.ny()) {
-    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::invertPixelValues]");
-    return false;
-  }
-
-  if (result.dataType() == Array2dFile::DATA_TYPE_REAL) {
-    if (! result.reallocRealToComplex ())
-      return false;
-  }
-
-  ImageFileArrayConst vReal = getArray();
-  ImageFileArrayConst vImag = getImaginaryArray();
-  ImageFileArray vRealResult = result.getArray();
-  ImageFileArray vImagResult = result.getImaginaryArray();
-  unsigned int ix, iy;
-  for (ix = 0; ix < m_nx; ix++)
-    for (iy = 0; iy < m_ny; iy++) {
-      vRealResult[ix][iy] = vReal[ix][iy];
-      if (isComplex()) 
-        vImagResult[ix][iy] = vImag[ix][iy];
-      else
-        vImagResult[ix][iy] = 0;
-    }
-
-  ProcessImage::shuffleNaturalToFourierOrder (result);
-
-  fftw_complex* in = new fftw_complex [m_nx * m_ny];
-
-  unsigned int iArray = 0;
-  for (ix = 0; ix < m_nx; ix++)
-    for (iy = 0; iy < m_ny; iy++) {
-      in[iArray].re = vRealResult[ix][iy];
-      in[iArray].im = vImagResult[ix][iy];
-      iArray++;
-    }
-
-  fftwnd_plan plan = fftw2d_create_plan (m_nx, m_ny, FFTW_BACKWARD, FFTW_IN_PLACE);
-
-  fftwnd_one (plan, in, NULL);
-
-  iArray = 0;
-  for (ix = 0; ix < m_nx; ix++)
-    for (iy = 0; iy < m_ny; iy++) {
-      vRealResult[ix][iy] = in[iArray].re;
-      vImagResult[ix][iy] = in[iArray].im;
-      iArray++;
-    }
-
-  fftwnd_destroy_plan (plan);
-
-  delete in;
-
-  return true;
-}
-#endif // HAVE_FFTW
-
-
-  
-bool
-ImageFile::fourier (ImageFile& result) const
-{
-  if (m_nx != result.nx() || m_ny != result.ny()) {
-    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::invertPixelValues]");
-    return false;
-  }
-  
-  if (result.dataType() == Array2dFile::DATA_TYPE_REAL) {
-    if (! result.reallocRealToComplex ())
-      return false;
-  }
-  
-  ImageFileArrayConst vLHS = getArray();
-  ImageFileArrayConst vLHSImag = getImaginaryArray();
-  ImageFileArray vRealResult = result.getArray();
-  ImageFileArray vImagResult = result.getImaginaryArray();
-  
-  unsigned int ix, iy;
-
-  // alloc output matrix
-  CTSimComplex** complexOut = new CTSimComplex* [m_nx];
-  for (ix = 0; ix < m_nx; ix++)
-    complexOut[ix] = new CTSimComplex [m_ny];
-  
-  // fourier each x column
-#if 1
-  CTSimComplex* pY = new CTSimComplex [m_ny];
-  for (ix = 0; ix < m_nx; ix++) {
-    for (iy = 0; iy < m_ny; iy++) {
-      pY[iy].real (vLHS[ix][iy]);
-      if (isComplex())
-        pY[iy].imag (vLHSImag[ix][iy]);
-      else
-        pY[iy].imag (0);
-    } 
-    ProcessSignal::finiteFourierTransform (pY, complexOut[ix], m_ny,  ProcessSignal::FORWARD);
-  }
-#else
-  double* pY = new double [m_ny];
-  for (ix = 0; ix < m_nx; ix++) {
-    for (iy = 0; iy < m_ny; iy++) {
-      pY[iy] = vLHS[ix][iy];
-    } 
-    ProcessSignal::finiteFourierTransform (pY, complexOut[ix], m_ny,  ProcessSignal::FORWARD);
-  }
-#endif
-  delete [] pY;
-  
-  // fourier each y row
-  CTSimComplex* pX = new CTSimComplex [m_nx];
-  CTSimComplex* complexOutRow = new CTSimComplex [m_nx];
-  for (iy = 0; iy < m_ny; iy++) {
-    for (ix = 0; ix < m_nx; ix++)
-      pX[ix] = complexOut[ix][iy];
-    ProcessSignal::finiteFourierTransform (pX, complexOutRow, m_nx, ProcessSignal::FORWARD);
-    for (ix = 0; ix < m_nx; ix++)
-      complexOut[ix][iy] = complexOutRow[ix];
-  }
-  delete [] pX;
-  
-  // shuffle each column
-  for (ix = 0; ix < m_nx; ix++)
-    ProcessSignal::shuffleFourierToNaturalOrder (complexOut[ix], m_ny);
-  
-  // shuffle each row
-  for (iy = 0; iy < m_ny; iy++) {
-    for (ix = 0; ix < m_nx; ix++)
-      complexOutRow[ix] = complexOut[ix][iy];
-    ProcessSignal::shuffleFourierToNaturalOrder (complexOutRow, m_nx);;
-    for (ix = 0; ix < m_nx; ix++)
-      complexOut[ix][iy] = complexOutRow[ix];
-    
-  }
-  delete [] complexOutRow;
-  
-  for (ix = 0; ix < m_nx; ix++)
-    for (iy = 0; iy < m_ny; iy++) {
-      vRealResult[ix][iy] = complexOut[ix][iy].real();
-      vImagResult[ix][iy] = complexOut[ix][iy].imag();
-    }
-    
-    for (ix = 0; ix < m_nx; ix++)
-      delete [] complexOut[ix];
-    delete [] complexOut;
-    
-    return true;
-}
-
-bool
-ImageFile::inverseFourier (ImageFile& result) const
-{
-  if (m_nx != result.nx() || m_ny != result.ny()) {
-    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::invertPixelValues]");
-    return false;
-  }
-  
-  if (result.dataType() == Array2dFile::DATA_TYPE_REAL) {
-    if (! result.reallocRealToComplex ())
-      return false;
-  }
-  
-  ImageFileArrayConst vLHSReal = getArray();
-  ImageFileArrayConst vLHSImag = getImaginaryArray();
-  
-  unsigned int ix, iy;
-
-  // alloc 2d complex output matrix
-  CTSimComplex** complexOut = new CTSimComplex* [m_nx];
-  for (ix = 0; ix < m_nx; ix++)
-    complexOut[ix] = new CTSimComplex [m_ny];
-
-  // put input image into complexOut
-  for (ix = 0; ix < m_nx; ix++)
-    for (iy = 0; iy < m_ny; iy++) {
-      complexOut[ix][iy].real (vLHSReal[ix][iy]);
-      if (isComplex())
-        complexOut[ix][iy].imag (vLHSImag[ix][iy]);
-      else
-        complexOut[ix][iy].imag (0);
-    }
-
-  // shuffle each x column
-  for (ix = 0; ix < m_nx; ix++)
-    ProcessSignal::shuffleNaturalToFourierOrder (complexOut[ix], m_ny);
-
-  // shuffle each y row
-  CTSimComplex* pComplexRow = new CTSimComplex [m_nx];
-  for (iy = 0; iy < m_ny; iy++) {
-    for (ix = 0; ix < m_nx; ix++)
-      pComplexRow[ix] = complexOut[ix][iy];
-    ProcessSignal::shuffleNaturalToFourierOrder (pComplexRow, m_nx);
-    for (ix = 0; ix < m_nx; ix++)
-      complexOut[ix][iy] = pComplexRow[ix];
-  }
-  delete [] pComplexRow;
-
-  // ifourier each x column
-  CTSimComplex* pCol = new CTSimComplex [m_ny];
-  for (ix = 0; ix < m_nx; ix++) {
-    for (iy = 0; iy < m_ny; iy++)
-      pCol[iy] = complexOut[ix][iy];
-    ProcessSignal::finiteFourierTransform (pCol, complexOut[ix], m_ny,  ProcessSignal::BACKWARD);
-  }
-  delete [] pCol;
-
-  // ifourier each y row
-  CTSimComplex* complexInRow = new CTSimComplex [m_nx];
-  CTSimComplex* complexOutRow = new CTSimComplex [m_nx];
-  for (iy = 0; iy < m_ny; iy++) {
-    for (ix = 0; ix < m_nx; ix++)
-      complexInRow[ix] = complexOut[ix][iy];
-    ProcessSignal::finiteFourierTransform (complexInRow, complexOutRow, m_nx, ProcessSignal::BACKWARD);
-    for (ix = 0; ix < m_nx; ix++)
-      complexOut[ix][iy] = complexOutRow[ix];
-  }
-  delete [] complexInRow;
-  delete [] complexOutRow;
-
-  ImageFileArray vRealResult = result.getArray();
-  ImageFileArray vImagResult = result.getImaginaryArray();
-  for (ix = 0; ix < m_nx; ix++)
-    for (iy = 0; iy < m_ny; iy++) {
-      vRealResult[ix][iy] = complexOut[ix][iy].real();
-      vImagResult[ix][iy] = complexOut[ix][iy].imag();
-    }
-    
-  // delete complexOut matrix
-  for (ix = 0; ix < m_nx; ix++)
-    delete [] complexOut[ix];
-  delete [] complexOut;
-    
-  return true;
-}
-
-
-bool
-ImageFile::magnitude (ImageFile& result) const
-{
-  if (m_nx != result.nx() || m_ny != result.ny()) {
-    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::invertPixelValues]");
-    return false;
-  }
-  
-  ImageFileArray vReal = getArray();
-  ImageFileArray vImag = getImaginaryArray();
-  
-  ImageFileArray vRealResult = result.getArray();
-  for (unsigned int ix = 0; ix < m_nx; ix++)
-    for (unsigned int iy = 0; iy < m_ny; iy++) {
-      if (isComplex()) 
-        vRealResult[ix][iy] = ::sqrt (vReal[ix][iy] * vReal[ix][iy] + vImag[ix][iy] * vImag[ix][iy]);
-      else
-        vRealResult[ix][iy] = vReal[ix][iy];
-    }
-
-  if (result.isComplex())
-    result.reallocComplexToReal();
-  
-    return true;
-}
-
-bool
-ImageFile::phase (ImageFile& result) const
-{
-  if (m_nx != result.nx() || m_ny != result.ny()) {
-    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::invertPixelValues]");
-    return false;
-  }
-  
-  ImageFileArray vReal = getArray();
-  ImageFileArray vImag = getImaginaryArray();
-  
-  ImageFileArray vRealResult = result.getArray();
-  for (unsigned int ix = 0; ix < m_nx; ix++)
-    for (unsigned int iy = 0; iy < m_ny; iy++) {
-      if (isComplex())
-        vRealResult[ix][iy] = ::atan2 (vImag[ix][iy], vReal[ix][iy]);
-      else
-        vRealResult[ix][iy] = 0;
-    }
-    
-  if (result.isComplex())
-    result.reallocComplexToReal();
-  
-  return true;
-}
-
-bool
-ImageFile::square (ImageFile& result) const
-{
-  if (m_nx != result.nx() || m_ny != result.ny()) {
-    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::invertPixelValues]");
-    return false;
-  }
-  
-  ImageFileArrayConst vLHS = getArray();
-  ImageFileArray vResult = result.getArray();
-  
-  for (unsigned int ix = 0; ix < m_nx; ix++) {
-    ImageFileColumnConst in = vLHS[ix];
-    ImageFileColumn out = vResult[ix];
-    for (unsigned int iy = 0; iy < m_ny; iy++) {
-      *out++ = *in * *in;
-      in++;
-    }
-  }
-  
-  return true;
-}
-
-
-void 
-ImageFile::writeImagePGM (const char *outfile, int nxcell, int nycell, double densmin, double densmax)
+
+bool
+ImageFile::convertRealToComplex ()
+{
+  if (dataType() != Array2dFile::DATA_TYPE_REAL)
+    return false;
+  
+  if (! reallocRealToComplex())
+    return false;
+  
+  ImageFileArray vImag = getImaginaryArray();
+  for (unsigned int ix = 0; ix < m_nx; ix++) {
+    ImageFileColumn vCol = vImag[ix];
+    for (unsigned int iy = 0; iy < m_ny; iy++)
+      *vCol++ = 0;
+  }
+  
+  return true;
+}
+
+bool
+ImageFile::convertComplexToReal ()
+{
+  if (dataType() != Array2dFile::DATA_TYPE_COMPLEX)
+    return false;
+  
+  ImageFileArray vReal = getArray();
+  ImageFileArray vImag = getImaginaryArray();
+  for (unsigned int ix = 0; ix < m_nx; ix++) {
+    ImageFileColumn vRealCol = vReal[ix];
+    ImageFileColumn vImagCol = vImag[ix];
+    for (unsigned int iy = 0; iy < m_ny; iy++) {
+      CTSimComplex c (*vRealCol, *vImagCol);
+      *vRealCol++ = std::abs (c);
+      vImagCol++;
+    }
+  }
+  
+  return reallocComplexToReal();
+}
+
+bool
+ImageFile::subtractImages (const ImageFile& rRHS, ImageFile& result) const
+{
+  if (m_nx != rRHS.nx() || m_ny != rRHS.ny() || m_nx != result.nx() || m_ny != result.ny()) {
+    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::subtractImage]");
+    return false;
+  }
+  
+  if (isComplex() || rRHS.isComplex() && ! result.isComplex())
+    result.convertRealToComplex();
+  
+  ImageFileArrayConst vLHS = getArray();
+  ImageFileArrayConst vLHSImag = getImaginaryArray();
+  ImageFileArrayConst vRHS = rRHS.getArray();
+  ImageFileArrayConst vRHSImag = rRHS.getImaginaryArray();
+  ImageFileArray vResult = result.getArray();
+  ImageFileArray vResultImag = result.getImaginaryArray();
+  
+  for (unsigned int ix = 0; ix < m_nx; ix++) {
+    for (unsigned int iy = 0; iy < m_ny; iy++) {
+      vResult[ix][iy] = vLHS[ix][iy] - vRHS[ix][iy];
+      if (result.isComplex()) {
+        vResultImag[ix][iy] = 0;
+        if (isComplex())
+          vResultImag[ix][iy] += vLHSImag[ix][iy];
+        if (rRHS.isComplex())
+          vResultImag[ix][iy] -= vRHSImag[ix][iy];
+      }
+    }
+  }
+  
+  return true;
+}
+
+bool
+ImageFile::addImages (const ImageFile& rRHS, ImageFile& result) const
+{
+  if (m_nx != rRHS.nx() || m_ny != rRHS.ny() || m_nx != result.nx() || m_ny != result.ny()) {
+    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::subtractImage]");
+    return false;
+  }
+  
+  if (isComplex() || rRHS.isComplex() && ! result.isComplex())
+    result.convertRealToComplex();
+  
+  ImageFileArrayConst vLHS = getArray();
+  ImageFileArrayConst vLHSImag = getImaginaryArray();
+  ImageFileArrayConst vRHS = rRHS.getArray();
+  ImageFileArrayConst vRHSImag = rRHS.getImaginaryArray();
+  ImageFileArray vResult = result.getArray();
+  ImageFileArray vResultImag = result.getImaginaryArray();
+  
+  for (unsigned int ix = 0; ix < m_nx; ix++) {
+    for (unsigned int iy = 0; iy < m_ny; iy++) {
+      vResult[ix][iy] = vLHS[ix][iy] + vRHS[ix][iy];
+      if (result.isComplex()) {
+        vResultImag[ix][iy] = 0;
+        if (isComplex())
+          vResultImag[ix][iy] += vLHSImag[ix][iy];
+        if (rRHS.isComplex())
+          vResultImag[ix][iy] += vRHSImag[ix][iy];
+      }
+    }
+  }
+  
+  return true;
+}
+
+bool
+ImageFile::multiplyImages (const ImageFile& rRHS, ImageFile& result) const
+{
+  if (m_nx != rRHS.nx() || m_ny != rRHS.ny() || m_nx != result.nx() || m_ny != result.ny()) {
+    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::subtractImage]");
+    return false;
+  }
+  
+  if (isComplex() || rRHS.isComplex() && ! result.isComplex())
+    result.convertRealToComplex();
+  
+  ImageFileArrayConst vLHS = getArray();
+  ImageFileArrayConst vLHSImag = getImaginaryArray();
+  ImageFileArrayConst vRHS = rRHS.getArray();
+  ImageFileArrayConst vRHSImag = rRHS.getImaginaryArray();
+  ImageFileArray vResult = result.getArray();
+  ImageFileArray vResultImag = result.getImaginaryArray();
+  
+  for (unsigned int ix = 0; ix < m_nx; ix++) {
+    for (unsigned int iy = 0; iy < m_ny; iy++) {
+      if (result.isComplex()) {
+        double dImag = 0;
+        if (isComplex())
+          dImag = vLHSImag[ix][iy];
+        std::complex<double> cLHS (vLHS[ix][iy], dImag);
+        dImag = 0;
+        if (rRHS.isComplex())
+          dImag = vRHSImag[ix][iy];
+        std::complex<double> cRHS (vRHS[ix][iy], dImag);
+        std::complex<double> cResult = cLHS * cRHS;
+        vResult[ix][iy] = cResult.real();
+        vResultImag[ix][iy] = cResult.imag();
+      } else
+        vResult[ix][iy] = vLHS[ix][iy] * vRHS[ix][iy];
+    }
+  }
+  
+  
+  return true;
+}
+
+bool
+ImageFile::divideImages (const ImageFile& rRHS, ImageFile& result) const
+{
+  if (m_nx != rRHS.nx() || m_ny != rRHS.ny() || m_nx != result.nx() || m_ny != result.ny()) {
+    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::subtractImage]");
+    return false;
+  }
+  
+  if (isComplex() || rRHS.isComplex() && ! result.isComplex())
+    result.convertRealToComplex();
+  
+  ImageFileArrayConst vLHS = getArray();
+  ImageFileArrayConst vLHSImag = getImaginaryArray();
+  ImageFileArrayConst vRHS = rRHS.getArray();
+  ImageFileArrayConst vRHSImag = rRHS.getImaginaryArray();
+  ImageFileArray vResult = result.getArray();
+  ImageFileArray vResultImag = result.getImaginaryArray();
+  
+  for (unsigned int ix = 0; ix < m_nx; ix++) {
+    for (unsigned int iy = 0; iy < m_ny; iy++) {
+      if (result.isComplex()) {
+        double dImag = 0;
+        if (isComplex())
+          dImag = vLHSImag[ix][iy];
+        std::complex<double> cLHS (vLHS[ix][iy], dImag);
+        dImag = 0;
+        if (rRHS.isComplex())
+          dImag = vRHSImag[ix][iy];
+        std::complex<double> cRHS (vRHS[ix][iy], dImag);
+        std::complex<double> cResult = cLHS / cRHS;
+        vResult[ix][iy] = cResult.real();
+        vResultImag[ix][iy] = cResult.imag();
+      } else {
+        if (vRHS != 0)
+          vResult[ix][iy] = vLHS[ix][iy] / vRHS[ix][iy];
+        else
+          vResult[ix][iy] = 0;
+      }
+    }
+  }
+  
+  return true;
+}
+
+
+bool
+ImageFile::invertPixelValues (ImageFile& result) const
+{
+  if (m_nx != result.nx() || m_ny != result.ny()) {
+    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::invertPixelValues]");
+    return false;
+  }
+  
+  if (isComplex() && ! result.isComplex())
+    result.convertRealToComplex();
+  
+  ImageFileArrayConst vLHS = getArray();
+  ImageFileArray vResult = result.getArray();
+  
+  for (unsigned int ix = 0; ix < m_nx; ix++) {
+    ImageFileColumnConst in = vLHS[ix];
+    ImageFileColumn out = vResult[ix];
+    for (unsigned int iy = 0; iy < m_ny; iy++)
+      *out++ = - *in++;
+  }
+  
+  return true;
+}
+
+bool
+ImageFile::sqrt (ImageFile& result) const
+{
+  if (m_nx != result.nx() || m_ny != result.ny()) {
+    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::invertPixelValues]");
+    return false;
+  }
+  
+  if (isComplex() && ! result.isComplex())
+    result.convertRealToComplex();
+  
+  bool bComplexOutput = result.isComplex();
+  ImageFileArrayConst vLHS = getArray();
+  if (! bComplexOutput)   // check if should convert to complex output
+    for (unsigned int ix = 0; ix < m_nx; ix++)
+      for (unsigned int iy = 0; iy < m_ny; iy++)
+        if (! bComplexOutput && vLHS[ix][iy] < 0) {
+          result.convertRealToComplex();
+          bComplexOutput = true;
+          break;
+        }
+        
+        ImageFileArrayConst vLHSImag = getImaginaryArray();
+        ImageFileArray vResult = result.getArray();
+        ImageFileArray vResultImag = result.getImaginaryArray();
+        
+        for (unsigned int ix = 0; ix < m_nx; ix++) {
+          for (unsigned int iy = 0; iy < m_ny; iy++) {
+            if (result.isComplex()) {
+              double dImag = 0;
+              if (isComplex())
+                dImag = vLHSImag[ix][iy];
+              std::complex<double> cLHS (vLHS[ix][iy], dImag);
+              std::complex<double> cResult = std::sqrt(cLHS);
+              vResult[ix][iy] = cResult.real();
+              vResultImag[ix][iy] = cResult.imag();
+            } else
+              vResult[ix][iy] = ::sqrt (vLHS[ix][iy]);
+          }
+        }
+        
+        
+        return true;
+}
+
+bool
+ImageFile::log (ImageFile& result) const
+{
+  if (m_nx != result.nx() || m_ny != result.ny()) {
+    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::invertPixelValues]");
+    return false;
+  }
+  
+  if (isComplex() && ! result.isComplex())
+    result.convertRealToComplex();
+  
+  ImageFileArrayConst vLHS = getArray();
+  ImageFileArrayConst vLHSImag = getImaginaryArray();
+  ImageFileArray vResult = result.getArray();
+  ImageFileArray vResultImag = result.getImaginaryArray();
+  
+  for (unsigned int ix = 0; ix < m_nx; ix++) {
+    for (unsigned int iy = 0; iy < m_ny; iy++) {
+      if (result.isComplex()) {
+        double dImag = 0;
+        if (isComplex())
+          dImag = vLHSImag[ix][iy];
+        std::complex<double> cLHS (vLHS[ix][iy], dImag);
+        std::complex<double> cResult = std::log (cLHS);
+        vResult[ix][iy] = cResult.real();
+        vResultImag[ix][iy] = cResult.imag();
+      } else
+        vResult[ix][iy] = ::log (vLHS[ix][iy]);
+    }
+  }
+  
+  
+  return true;
+}
+
+bool
+ImageFile::exp (ImageFile& result) const
+{
+  if (m_nx != result.nx() || m_ny != result.ny()) {
+    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::invertPixelValues]");
+    return false;
+  }
+  
+  if (isComplex() && ! result.isComplex())
+    result.convertRealToComplex();
+  
+  ImageFileArrayConst vLHS = getArray();
+  ImageFileArrayConst vLHSImag = getImaginaryArray();
+  ImageFileArray vResult = result.getArray();
+  ImageFileArray vResultImag = result.getImaginaryArray();
+  
+  for (unsigned int ix = 0; ix < m_nx; ix++) {
+    for (unsigned int iy = 0; iy < m_ny; iy++) {
+      if (result.isComplex()) {
+        double dImag = 0;
+        if (isComplex())
+          dImag = vLHSImag[ix][iy];
+        std::complex<double> cLHS (vLHS[ix][iy], dImag);
+        std::complex<double> cResult = std::exp (cLHS);
+        vResult[ix][iy] = cResult.real();
+        vResultImag[ix][iy] = cResult.imag();
+      } else
+        vResult[ix][iy] = ::exp (vLHS[ix][iy]);
+    }
+  }
+  
+  
+  return true;
+}
+
+bool
+ImageFile::scaleImage (ImageFile& result) const
+{
+  unsigned int nx = m_nx;
+  unsigned int ny = m_ny;
+  unsigned int newNX = result.nx();
+  unsigned int newNY = result.ny();
+  
+  double dXScale = static_cast<double>(newNX) / static_cast<double>(nx);
+  double dYScale = static_cast<double>(newNY) / static_cast<double>(ny);
+  
+  if (isComplex() && ! result.isComplex())
+    result.convertRealToComplex();
+  
+  ImageFileArrayConst vReal = getArray();
+  ImageFileArrayConst vImag = getImaginaryArray();
+  ImageFileArray vResult = result.getArray();
+  ImageFileArray vResultImag = result.getImaginaryArray();
+  
+  for (unsigned int ix = 0; ix < newNX; ix++) {
+    for (unsigned int iy = 0; iy < newNY; iy++) {
+      double dXPos = ix / dXScale;
+      double dYPos = iy / dYScale;
+      unsigned int scaleNX = static_cast<unsigned int> (dXPos);
+      unsigned int scaleNY = static_cast<unsigned int> (dYPos);
+      double dXFrac = dXPos - scaleNX;
+      double dYFrac = dYPos - scaleNY;
+      if (scaleNX >= nx - 1 || scaleNY >= ny - 1) {
+        vResult[ix][iy] = vReal[scaleNX][scaleNY];
+        if (result.isComplex()) {
+          if (isComplex())
+            vResultImag[ix][iy] = vImag[scaleNX][scaleNY];
+          else
+            vResultImag[ix][iy] = 0;
+        }
+      } else {
+        vResult[ix][iy] = (1 - dXFrac) * (1 - dYFrac) * vReal[scaleNX][scaleNY] + 
+          dXFrac * (1 - dYFrac) * vReal[scaleNX+1][scaleNY] + 
+          dYFrac * (1 - dXFrac) * vReal[scaleNX][scaleNY+1] +
+          dXFrac * dYFrac * vReal[scaleNX+1][scaleNY+1];
+        if (result.isComplex()) {
+          if (isComplex())
+            vResultImag[ix][iy] = (1 - dXFrac) * (1 - dYFrac) * vImag[scaleNX][scaleNY] + 
+          dXFrac * (1 - dYFrac) * vImag[scaleNX+1][scaleNY] + 
+          dYFrac * (1 - dXFrac) * vImag[scaleNX][scaleNY+1] +
+          dXFrac * dYFrac * vImag[scaleNX+1][scaleNY+1];
+          else
+            vResultImag[ix][iy] = 0;
+        }
+      }
+    }
+  }
+  
+  return true;
+}
+
+#ifdef HAVE_FFTW
+bool
+ImageFile::fft (ImageFile& result) const
+{
+  if (m_nx != result.nx() || m_ny != result.ny()) {
+    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::invertPixelValues]");
+    return false;
+  }
+  
+  if (result.dataType() == Array2dFile::DATA_TYPE_REAL) {
+    if (! result.convertRealToComplex ())
+      return false;
+  }
+  
+  fftw_complex* in = new fftw_complex [m_nx * m_ny];
+  
+  ImageFileArrayConst vReal = getArray();
+  ImageFileArrayConst vImag = getImaginaryArray();
+  
+  unsigned int ix, iy;
+  unsigned int iArray = 0;
+  for (ix = 0; ix < m_nx; ix++)
+    for (iy = 0; iy < m_ny; iy++) {
+      in[iArray].re = vReal[ix][iy];
+      if (isComplex())
+        in[iArray].im = vImag[ix][iy];
+      else
+        in[iArray].im = 0;
+      iArray++;
+    }
+    
+    fftwnd_plan plan = fftw2d_create_plan (m_nx, m_ny, FFTW_FORWARD, FFTW_IN_PLACE);
+    
+    fftwnd_one (plan, in, NULL);
+    
+    ImageFileArray vRealResult = result.getArray();
+    ImageFileArray vImagResult = result.getImaginaryArray();
+    iArray = 0;
+    unsigned int iScale = m_nx * m_ny;
+    for (ix = 0; ix < m_nx; ix++)
+      for (iy = 0; iy < m_ny; iy++) {
+        vRealResult[ix][iy] = in[iArray].re / iScale;
+        vImagResult[ix][iy] = in[iArray].im / iScale;
+        iArray++;
+      }
+      
+      fftwnd_destroy_plan (plan);
+      delete in;
+      
+      
+      Fourier::shuffleFourierToNaturalOrder (result);
+      
+      return true;
+}
+
+
+bool
+ImageFile::ifft (ImageFile& result) const
+{
+  if (m_nx != result.nx() || m_ny != result.ny()) {
+    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::invertPixelValues]");
+    return false;
+  }
+  
+  if (result.dataType() == Array2dFile::DATA_TYPE_REAL) {
+    if (! result.convertRealToComplex ())
+      return false;
+  }
+  
+  ImageFileArrayConst vReal = getArray();
+  ImageFileArrayConst vImag = getImaginaryArray();
+  ImageFileArray vRealResult = result.getArray();
+  ImageFileArray vImagResult = result.getImaginaryArray();
+  unsigned int ix, iy;
+  for (ix = 0; ix < m_nx; ix++)
+    for (iy = 0; iy < m_ny; iy++) {
+      vRealResult[ix][iy] = vReal[ix][iy];
+      if (isComplex()) 
+        vImagResult[ix][iy] = vImag[ix][iy];
+      else
+        vImagResult[ix][iy] = 0;
+    }
+    
+    Fourier::shuffleNaturalToFourierOrder (result);
+    
+    fftw_complex* in = new fftw_complex [m_nx * m_ny];
+    
+    unsigned int iArray = 0;
+    for (ix = 0; ix < m_nx; ix++)
+      for (iy = 0; iy < m_ny; iy++) {
+        in[iArray].re = vRealResult[ix][iy];
+        in[iArray].im = vImagResult[ix][iy];
+        iArray++;
+      }
+      
+      fftwnd_plan plan = fftw2d_create_plan (m_nx, m_ny, FFTW_BACKWARD, FFTW_IN_PLACE);
+      
+      fftwnd_one (plan, in, NULL);
+      
+      iArray = 0;
+      for (ix = 0; ix < m_nx; ix++)
+        for (iy = 0; iy < m_ny; iy++) {
+          vRealResult[ix][iy] = in[iArray].re;
+          vImagResult[ix][iy] = in[iArray].im;
+          iArray++;
+        }
+        
+        fftwnd_destroy_plan (plan);
+        
+        delete in;
+        
+        return true;
+}
+
+bool
+ImageFile::fftRows (ImageFile& result) const
+{
+  if (m_nx != result.nx() || m_ny != result.ny()) {
+    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::fftRows]");
+    return false;
+  }
+  
+  if (result.dataType() == Array2dFile::DATA_TYPE_REAL) {
+    if (! result.convertRealToComplex ())
+      return false;
+  }
+  
+  fftw_complex* in = new fftw_complex [m_nx];
+  
+  ImageFileArrayConst vReal = getArray();
+  ImageFileArrayConst vImag = getImaginaryArray();
+  
+  fftw_plan plan = fftw_create_plan (m_nx, FFTW_FORWARD, FFTW_IN_PLACE);
+  std::complex<double>* pcRow = new std::complex<double> [m_nx];
+
+  unsigned int ix, iy;
+  unsigned int iArray = 0;
+  for (iy = 0; iy < m_ny; iy++) {
+    for (ix = 0; ix < m_nx; ix++) {
+      in[ix].re = vReal[ix][iy];
+      if (isComplex())
+        in[ix].im = vImag[ix][iy];
+      else
+        in[ix].im = 0;
+    }
+
+    fftw_one (plan, in, NULL);
+
+    for (ix = 0; ix < m_nx; ix++)
+      pcRow[ix] = std::complex<double>(in[ix].re, in[ix].im);
+
+    Fourier::shuffleFourierToNaturalOrder (pcRow, m_nx);
+    for (ix = 0; ix < m_nx; ix++) {
+      vReal[ix][iy] = pcRow[ix].real();
+      vImag[ix][iy] = pcRow[ix].imag();
+    }
+  }
+  delete [] pcRow;
+   
+   fftw_destroy_plan (plan);
+   delete in;
+
+   return true;
+}     
+
+bool
+ImageFile::ifftRows (ImageFile& result) const
+{
+  if (m_nx != result.nx() || m_ny != result.ny()) {
+    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::fftRows]");
+    return false;
+  }
+  
+  if (result.dataType() == Array2dFile::DATA_TYPE_REAL) {
+    if (! result.convertRealToComplex ())
+      return false;
+  }
+  
+  fftw_complex* in = new fftw_complex [m_nx];
+  
+  ImageFileArrayConst vReal = getArray();
+  ImageFileArrayConst vImag = getImaginaryArray();
+  
+  fftw_plan plan = fftw_create_plan (m_nx, FFTW_BACKWARD, FFTW_IN_PLACE);
+  std::complex<double>* pcRow = new std::complex<double> [m_nx];
+
+  unsigned int ix, iy;
+  unsigned int iArray = 0;
+  for (iy = 0; iy < m_ny; iy++) {
+    for (ix = 0; ix < m_nx; ix++) {
+      double dImag = 0;
+      if (isComplex())
+        dImag = vImag[ix][iy];
+      pcRow[ix] = std::complex<double> (vReal[ix][iy], dImag);
+    }
+
+    Fourier::shuffleNaturalToFourierOrder (pcRow, m_nx);
+
+    for (ix = 0; ix < m_nx; ix++) {
+      in[ix].re = pcRow[ix].real();
+      in[ix].im = pcRow[ix].imag();
+    }
+
+    fftw_one (plan, in, NULL);
+
+    for (ix = 0; ix < m_nx; ix++) {
+      vReal[ix][iy] = in[ix].re;
+      vImag[ix][iy] = in[ix].im;
+    }
+  }
+  delete [] pcRow;
+  
+   fftw_destroy_plan (plan);
+   delete in;
+
+   return true;
+}
+
+bool
+ImageFile::fftCols (ImageFile& result) const
+{
+  return false;
+}
+
+bool
+ImageFile::ifftCols (ImageFile& result) const
+{
+  return false;
+}
+
+#endif // HAVE_FFTW
+
+
+
+bool
+ImageFile::fourier (ImageFile& result) const
+{
+  if (m_nx != result.nx() || m_ny != result.ny()) {
+    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::invertPixelValues]");
+    return false;
+  }
+  
+  if (! result.isComplex())
+    if (! result.convertRealToComplex ())
+      return false;
+    
+    ImageFileArrayConst vLHS = getArray();
+    ImageFileArrayConst vLHSImag = getImaginaryArray();
+    ImageFileArray vRealResult = result.getArray();
+    ImageFileArray vImagResult = result.getImaginaryArray();
+    
+    unsigned int ix, iy;
+    
+    // alloc output matrix
+    CTSimComplex** complexOut = new CTSimComplex* [m_nx];
+    for (ix = 0; ix < m_nx; ix++)
+      complexOut[ix] = new CTSimComplex [m_ny];
+    
+    // fourier each x column
+    CTSimComplex* pY = new CTSimComplex [m_ny];
+    for (ix = 0; ix < m_nx; ix++) {
+      for (iy = 0; iy < m_ny; iy++) {
+        double dImag = 0;
+        if (isComplex())
+          dImag = vLHSImag[ix][iy];
+        pY[iy] = std::complex<double>(vLHS[ix][iy], dImag);
+      } 
+      ProcessSignal::finiteFourierTransform (pY, complexOut[ix], m_ny,  ProcessSignal::FORWARD);
+    }
+    delete [] pY;
+    
+    // fourier each y row
+    CTSimComplex* pX = new CTSimComplex [m_nx];
+    CTSimComplex* complexOutRow = new CTSimComplex [m_nx];
+    for (iy = 0; iy < m_ny; iy++) {
+      for (ix = 0; ix < m_nx; ix++)
+        pX[ix] = complexOut[ix][iy];
+      ProcessSignal::finiteFourierTransform (pX, complexOutRow, m_nx, ProcessSignal::FORWARD);
+      for (ix = 0; ix < m_nx; ix++)
+        complexOut[ix][iy] = complexOutRow[ix];
+    }
+    delete [] pX;
+    delete [] complexOutRow;
+    
+    for (ix = 0; ix < m_nx; ix++)
+      for (iy = 0; iy < m_ny; iy++) {
+        vRealResult[ix][iy] = complexOut[ix][iy].real();
+        vImagResult[ix][iy] = complexOut[ix][iy].imag();
+      }
+      
+      Fourier::shuffleFourierToNaturalOrder (result);
+      
+      // delete complexOut matrix
+      for (ix = 0; ix < m_nx; ix++)
+        delete [] complexOut[ix];
+      delete [] complexOut;
+      
+      return true;
+}
+
+bool
+ImageFile::inverseFourier (ImageFile& result) const
+{
+  if (m_nx != result.nx() || m_ny != result.ny()) {
+    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::invertPixelValues]");
+    return false;
+  }
+  
+  if (result.dataType() == Array2dFile::DATA_TYPE_REAL) {
+    if (! result.convertRealToComplex ())
+      return false;
+  }
+  
+  ImageFileArrayConst vLHSReal = getArray();
+  ImageFileArrayConst vLHSImag = getImaginaryArray();
+  ImageFileArray vRealResult = result.getArray();
+  ImageFileArray vImagResult = result.getImaginaryArray();
+  
+  unsigned int ix, iy;
+  // alloc 2d complex output matrix
+  CTSimComplex** complexOut = new CTSimComplex* [m_nx];
+  for (ix = 0; ix < m_nx; ix++)
+    complexOut[ix] = new CTSimComplex [m_ny];
+  
+  // put input image into result
+  for (ix = 0; ix < m_nx; ix++)
+    for (iy = 0; iy < m_ny; iy++) {
+      vRealResult[ix][iy] = vLHSReal[ix][iy];
+      if (isComplex())
+        vImagResult[ix][iy] = vLHSImag[ix][iy];
+      else
+        vImagResult[ix][iy] = 0;
+    }
+    
+    Fourier::shuffleNaturalToFourierOrder (result);
+    
+    // ifourier each x column
+    CTSimComplex* pCol = new CTSimComplex [m_ny];
+    for (ix = 0; ix < m_nx; ix++) {
+      for (iy = 0; iy < m_ny; iy++) {
+        pCol[iy] = std::complex<double> (vRealResult[ix][iy], vImagResult[ix][iy]);
+      }
+      ProcessSignal::finiteFourierTransform (pCol, complexOut[ix], m_ny,  ProcessSignal::BACKWARD);
+    }
+    delete [] pCol;
+    
+    // ifourier each y row
+    CTSimComplex* complexInRow = new CTSimComplex [m_nx];
+    CTSimComplex* complexOutRow = new CTSimComplex [m_nx];
+    for (iy = 0; iy < m_ny; iy++) {
+      for (ix = 0; ix < m_nx; ix++)
+        complexInRow[ix] = complexOut[ix][iy];
+      ProcessSignal::finiteFourierTransform (complexInRow, complexOutRow, m_nx, ProcessSignal::BACKWARD);
+      for (ix = 0; ix < m_nx; ix++)
+        complexOut[ix][iy] = complexOutRow[ix];
+    }
+    delete [] complexInRow;
+    delete [] complexOutRow;
+    
+    for (ix = 0; ix < m_nx; ix++)
+      for (iy = 0; iy < m_ny; iy++) {
+        vRealResult[ix][iy] = complexOut[ix][iy].real();
+        vImagResult[ix][iy] = complexOut[ix][iy].imag();
+      }
+      
+      // delete complexOut matrix
+      for (ix = 0; ix < m_nx; ix++)
+        delete [] complexOut[ix];
+      delete [] complexOut;
+      
+      return true;
+}
+
+
+bool
+ImageFile::magnitude (ImageFile& result) const
+{
+  if (m_nx != result.nx() || m_ny != result.ny()) {
+    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::invertPixelValues]");
+    return false;
+  }
+  
+  ImageFileArray vReal = getArray();
+  ImageFileArray vImag = getImaginaryArray();
+  ImageFileArray vRealResult = result.getArray();
+  
+  for (unsigned int ix = 0; ix < m_nx; ix++)
+    for (unsigned int iy = 0; iy < m_ny; iy++) {
+      if (isComplex()) 
+        vRealResult[ix][iy] = ::sqrt (vReal[ix][iy] * vReal[ix][iy] + vImag[ix][iy] * vImag[ix][iy]);
+      else
+        vRealResult[ix][iy] = vReal[ix][iy];
+    }
+    
+    if (result.isComplex())
+      result.convertComplexToReal();
+    
+    return true;
+}
+
+bool
+ImageFile::phase (ImageFile& result) const
+{
+  if (m_nx != result.nx() || m_ny != result.ny()) {
+    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::invertPixelValues]");
+    return false;
+  }
+  
+  ImageFileArray vReal = getArray();
+  ImageFileArray vImag = getImaginaryArray();
+  ImageFileArray vRealResult = result.getArray();
+  
+  for (unsigned int ix = 0; ix < m_nx; ix++)
+    for (unsigned int iy = 0; iy < m_ny; iy++) {
+      if (isComplex())
+        vRealResult[ix][iy] = ::atan2 (vImag[ix][iy], vReal[ix][iy]);
+      else
+        vRealResult[ix][iy] = 0;
+    }
+    
+    if (result.isComplex())
+      result.convertComplexToReal();
+    
+    return true;
+}
+
+bool
+ImageFile::square (ImageFile& result) const
+{
+  if (m_nx != result.nx() || m_ny != result.ny()) {
+    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::invertPixelValues]");
+    return false;
+  }
+  
+  if (isComplex() && ! result.isComplex())
+    result.convertRealToComplex();
+  
+  ImageFileArrayConst vLHS = getArray();
+  ImageFileArrayConst vLHSImag = getImaginaryArray();
+  ImageFileArray vResult = result.getArray();
+  ImageFileArray vResultImag = result.getImaginaryArray();
+  
+  for (unsigned int ix = 0; ix < m_nx; ix++) {
+    for (unsigned int iy = 0; iy < m_ny; iy++) {
+      if (result.isComplex()) {
+        double dImag = 0;
+        if (isComplex())
+          dImag = vLHSImag[ix][iy];
+        std::complex<double> cLHS (vLHS[ix][iy], dImag);
+        std::complex<double> cResult = cLHS * cLHS;
+        vResult[ix][iy] = cResult.real();
+        vResultImag[ix][iy] = cResult.imag();
+      } else
+        vResult[ix][iy] = vLHS[ix][iy] * vLHS[ix][iy];
+    }
+  }
+  
+  
+  return true;
+}
+
+int
+ImageFile::convertFormatNameToID (const char* const formatName)
+{
+  int formatID = FORMAT_INVALID;
+  
+  for (int i = 0; i < s_iFormatCount; i++)
+    if (strcasecmp (formatName, s_aszFormatName[i]) == 0) {
+      formatID = i;
+      break;
+    }
+    
+    return (formatID);
+}
+
+const char*
+ImageFile::convertFormatIDToName (int formatID)
+{
+  static const char *formatName = "";
+  
+  if (formatID >= 0 && formatID < s_iFormatCount)
+    return (s_aszFormatName[formatID]);
+  
+  return (formatName);
+}
+
+const char*
+ImageFile::convertFormatIDToTitle (const int formatID)
+{
+  static const char *formatTitle = "";
+  
+  if (formatID >= 0 && formatID < s_iFormatCount)
+    return (s_aszFormatTitle[formatID]);
+  
+  return (formatTitle);
+}
+
+bool
+ImageFile::exportImage (const char* const pszFormat, const char* const pszFilename, int nxcell, int nycell, double densmin, double densmax)
+{
+  int iFormatID = convertFormatNameToID (pszFormat);
+  if (iFormatID == FORMAT_INVALID) {
+    sys_error (ERR_SEVERE, "Invalid format %s [ImageFile::exportImage]", pszFormat);
+    return false;
+  }
+  
+  if (iFormatID == FORMAT_PGM)
+    return writeImagePGM (pszFilename, nxcell, nycell, densmin, densmax);
+  else if (iFormatID == FORMAT_PGMASCII)
+    return writeImagePGMASCII (pszFilename, nxcell, nycell, densmin, densmax);
+  else if (iFormatID == FORMAT_PNG)
+    return writeImagePNG (pszFilename, 8, nxcell, nycell, densmin, densmax);
+  else if (iFormatID == FORMAT_PNG16)
+    return writeImagePNG (pszFilename, 16, nxcell, nycell, densmin, densmax);
+  
+  sys_error (ERR_SEVERE, "Invalid format %s [ImageFile::exportImage]", pszFormat);
+  return false;
+}
+
+bool
+ImageFile::writeImagePGM (const char* const outfile, int nxcell, int nycell, double densmin, double densmax)
 {
   FILE *fp;
   int nx = m_nx;
@@ -990,7 +1251,7 @@ ImageFile::writeImagePGM (const char *outfile, int nxcell, int nycell, double de
   unsigned char* rowp = new unsigned char [nx * nxcell];
   
   if ((fp = fopen (outfile, "wb")) == NULL)
-    return;
+    return false;
   
   fprintf(fp, "P5\n");
   fprintf(fp, "%d %d\n", nx, ny);
@@ -1010,13 +1271,15 @@ ImageFile::writeImagePGM (const char *outfile, int nxcell, int nycell, double de
         fputc( rowp[ic], fp );
     }
   }
-  
+  
   delete rowp;
   fclose(fp);
+  
+  return true;
 }
 
-void 
-ImageFile::writeImagePGMASCII (const char *outfile, int nxcell, int nycell, double densmin, double densmax)
+bool
+ImageFile::writeImagePGMASCII (const char* const outfile, int nxcell, int nycell, double densmin, double densmax)
 {
   FILE *fp;
   int nx = m_nx;
@@ -1026,7 +1289,7 @@ ImageFile::writeImagePGMASCII (const char *outfile, int nxcell, int nycell, doub
   unsigned char* rowp = new unsigned char [nx * nxcell];
   
   if ((fp = fopen (outfile, "wb")) == NULL)
-    return;
+    return false;
   
   fprintf(fp, "P2\n");
   fprintf(fp, "%d %d\n", nx, ny);
@@ -1047,19 +1310,18 @@ ImageFile::writeImagePGMASCII (const char *outfile, int nxcell, int nycell, doub
       fprintf(fp, "\n");
     }
   }
-  
+  
   delete rowp;
   fclose(fp);
+  
+  return true;
 }
 
 
 #ifdef HAVE_PNG
-void 
-ImageFile::writeImagePNG (const char *outfile, int bitdepth, int nxcell, int nycell, double densmin, double densmax)
+bool
+ImageFile::writeImagePNG (const char* const outfile, int bitdepth, int nxcell, int nycell, double densmin, double densmax)
 {
-  FILE *fp;
-  png_structp png_ptr;
-  png_infop info_ptr;
   double max_out_level = (1 << bitdepth) - 1;
   int nx = m_nx;
   int ny = m_ny;
@@ -1067,29 +1329,30 @@ ImageFile::writeImagePNG (const char *outfile, int bitdepth, int nxcell, int nyc
   
   unsigned char* rowp = new unsigned char [nx * nxcell * (bitdepth / 8)];
   
-  if ((fp = fopen (outfile, "wb")) == NULL)
-    return;
+  FILE *fp = fopen (outfile, "wb");
+  if (! fp)
+    return false;
   
-  png_ptr = png_create_write_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+  png_structp png_ptr = png_create_write_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
   if (! png_ptr)
-    return;
+    return false;
   
-  info_ptr = png_create_info_struct(png_ptr);
+  png_infop info_ptr = png_create_info_struct (png_ptr);
   if (! info_ptr) {
-    png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
-    fclose(fp);
-    return;
+    png_destroy_write_struct (&png_ptr, (png_infopp) NULL);
+    fclose (fp);
+    return false;
   }
   
-  if (setjmp(png_ptr->jmpbuf)) {
-    png_destroy_write_struct(&png_ptr, &info_ptr);
-    fclose(fp);
-    return;
+  if (setjmp (png_ptr->jmpbuf)) {
+    png_destroy_write_struct (&png_ptr, &info_ptr);
+    fclose (fp);
+    return false;
   }
   
   png_init_io(png_ptr, fp);
   
-  png_set_IHDR(png_ptr, info_ptr, nx * nxcell, ny * nycell, bitdepth, PNG_COLOR_TYPE_GRAY, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_DEFAULT);
+  png_set_IHDR (png_ptr, info_ptr, nx * nxcell, ny * nycell, bitdepth, PNG_COLOR_TYPE_GRAY, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_DEFAULT);
   
   png_write_info(png_ptr, info_ptr);
   for (int irow = ny - 1; irow >= 0; irow--) {
@@ -1106,8 +1369,8 @@ ImageFile::writeImagePNG (const char *outfile, int bitdepth, int nxcell, int nyc
           rowp[p] = outval;
         else {
           int rowpos = p * 2;
-          rowp[rowpos] = (outval >> 8) & 0xFF;
-          rowp[rowpos+1] = (outval & 0xFF);
+          rowp[rowpos+1] = (outval >> 8) & 0xFF;
+          rowp[rowpos] = (outval & 0xFF);
         }
       }
     }
@@ -1115,11 +1378,13 @@ ImageFile::writeImagePNG (const char *outfile, int bitdepth, int nxcell, int nyc
       png_write_rows (png_ptr, &row_pointer, 1);
   }
   
-  png_write_end(png_ptr, info_ptr);
-  png_destroy_write_struct(&png_ptr, &info_ptr);
-  delete rowp;
+  png_write_end (png_ptr, info_ptr);
+  png_destroy_write_struct (&png_ptr, &info_ptr);
+  delete rowp;
   
   fclose(fp);
+  
+  return true;
 }
 #endif
 
@@ -1127,21 +1392,17 @@ ImageFile::writeImagePNG (const char *outfile, int bitdepth, int nxcell, int nyc
 #include "gd.h"
 static const int N_GRAYSCALE=256;
 
-void
-ImageFile::writeImageGIF (const char *outfile, int nxcell, int nycell, double densmin, double densmax)
+bool
+ImageFile::writeImageGIF (const char* const outfile, int nxcell, int nycell, double densmin, double densmax)
 {
-  gdImagePtr gif;
-  FILE *out;
   int gs_indices[N_GRAYSCALE];
   int nx = m_nx;
   int ny = m_ny;
   ImageFileArray v = getArray();
   
-  unsigned char rowp [nx * nxcell];
-  if (rowp == NULL)
-    return;
+  unsigned char* rowp = new unsigned char [nx * nxcell];
   
-  gif = gdImageCreate(nx * nxcell, ny * nycell);
+  gdImagePtr gif = gdImageCreate(nx * nxcell, ny * nycell);
   for (int i = 0; i < N_GRAYSCALE; i++)
     gs_indices[i] = gdImageColorAllocate(gif, i, i, i);
   
@@ -1161,13 +1422,18 @@ ImageFile::writeImageGIF (const char *outfile, int nxcell, int nycell, double de
     }
   }
   
-  if ((out = fopen(outfile,"w")) == NULL) {
-    sys_error(ERR_FATAL, "Error opening output file %s for writing", outfile);
-    return (1);
+  FILE *out;
+  if ((out = fopen (outfile,"w")) == NULL) {
+    sys_error(ERR_SEVERE, "Error opening output file %s for writing", outfile);
+    return false;
   }
   gdImageGif(gif,out);
   fclose(out);
   gdImageDestroy(gif);
+  
+  delete rowp;
+  
+  return true;
 }
 #endif