diff --git a/Code/IO/otbGDALImageIO.cxx b/Code/IO/otbGDALImageIO.cxx
index 0903f0b574bf5c2149854d168a371949fb466c24..61fdb3a48ce518b8ad0713f218ae64242c9bf4d7 100644
--- a/Code/IO/otbGDALImageIO.cxx
+++ b/Code/IO/otbGDALImageIO.cxx
@@ -210,6 +210,8 @@ void GDALImageIO::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
os << indent << "Compression Level : " << m_CompressionLevel << "\n";
+ os << indent << "IsComplex (otb side) : " << m_IsComplex << "\n";
+ os << indent << "Byte per pixel : " << m_NbOctetPixel << "\n";
}
// Read a 3D image (or event more bands)... not implemented yet
@@ -233,16 +235,20 @@ void GDALImageIO::Read(void* buffer)
int lFirstLine = this->GetIORegion().GetIndex()[1]; // [1... ]
int lFirstColumn = this->GetIORegion().GetIndex()[0]; // [1... ]
- std::streamoff lNbPixels = (static_cast<std::streamoff>(lNbColumns)) * (static_cast<std::streamoff>(lNbLines));
+ std::streamoff lNbPixels = (static_cast<std::streamoff>(lNbColumns))
+ * (static_cast<std::streamoff>(lNbLines));
std::streamoff lBufferSize = static_cast<std::streamoff>(m_NbOctetPixel) * lNbPixels;
-
+ if (GDALDataTypeIsComplex(m_PxType) && !m_IsComplex)
+ {
+ lBufferSize *= 2;
+ }
itk::VariableLengthVector<unsigned char> value(lBufferSize);
CPLErr lCrGdal;
std::streamoff cpt(0);
GDALDataset* dataset = m_Dataset->GetDataSet();
- if (GDALDataTypeIsComplex(m_PxType)
+ if (GDALDataTypeIsComplex(m_PxType) //TODO should disappear
&& (m_PxType != GDT_CFloat32)
&& (m_PxType != GDT_CFloat64))
{
@@ -269,6 +275,39 @@ void GDALImageIO::Read(void* buffer)
cpt += static_cast<std::streamoff>(m_NbOctetPixel);
}
}
+ else if (GDALDataTypeIsComplex(m_PxType) && !m_IsComplex)
+ {
+ // Mise a jour du step
+ step = step * static_cast<std::streamoff>(m_NbOctetPixel);
+
+ for (unsigned int nbComponents = 0; nbComponents < dataset->GetRasterCount(); ++nbComponents)
+ {
+ lCrGdal = dataset->GetRasterBand(nbComponents+1)->RasterIO(GF_Read,
+ lFirstColumn,
+ lFirstLine,
+ lNbColumns,
+ lNbLines,
+ const_cast<unsigned char*>(value.GetDataPointer()),
+ lNbColumns,
+ lNbLines,
+ m_PxType,
+ 0,
+ 0);
+ if (lCrGdal == CE_Failure)
+ {
+ itkExceptionMacro(<< "Error while reading image (GDAL format) " << m_FileName.c_str() << ".");
+ }
+ // Recopie dans le buffer
+ cpt = static_cast<std::streamoff>(nbComponents) * static_cast<std::streamoff>(m_NbOctetPixel);
+ for (std::streamoff i = 0; i < lBufferSize; i = i + static_cast<std::streamoff>(m_NbOctetPixel))
+ {
+ memcpy((void*) (&(p[cpt])), (const void*) (&(value[i])), (size_t) (m_NbOctetPixel)); //Real part
+ memcpy((void*) (&(p[cpt+m_NbOctetPixel])), (const void*) (&(value[i+m_NbOctetPixel])), (size_t) (m_NbOctetPixel)); //Imaginary part
+ cpt += step;
+ }
+ }
+
+ }
else if (m_IsIndexed)
{
step = step * static_cast<std::streamoff>(m_NbOctetPixel);
@@ -307,7 +346,7 @@ void GDALImageIO::Read(void* buffer)
// Mise a jour du step
step = step * static_cast<std::streamoff>(m_NbOctetPixel);
- for (unsigned int nbComponents = 0; nbComponents < this->GetNumberOfComponents(); ++nbComponents)
+ for (unsigned int nbComponents = 0; nbComponents < dataset->GetRasterCount(); ++nbComponents)
{
lCrGdal = dataset->GetRasterBand(nbComponents+1)->RasterIO(GF_Read,
lFirstColumn,
@@ -401,10 +440,6 @@ void GDALImageIO::InternalReadImageInformation()
// Maybe be could changed (to check)
m_PxType = dataset->GetRasterBand(1)->GetRasterDataType();
- // Following the data type given by GDAL we set it for ImageIO
- // BE CAREFUL !!!! At this time the complex data type are regarded
- // as integer data type in hope that ITK uses that kind of system
- // (take time to check !!)
if (m_PxType == GDT_Byte)
{
SetComponentType(UCHAR);
@@ -496,7 +531,7 @@ void GDALImageIO::InternalReadImageInformation()
//Once all sorts of gdal complex image are handle, this won't be
//necessary any more
- if (GDALDataTypeIsComplex(m_PxType)
+ if (GDALDataTypeIsComplex(m_PxType) //TODO should disappear
&& (m_PxType != GDT_CFloat32)
&& (m_PxType != GDT_CFloat64))
{
@@ -519,6 +554,17 @@ void GDALImageIO::InternalReadImageInformation()
}
}
+ if(GDALDataTypeIsComplex(m_PxType) && !m_IsComplex)
+ {
+ // we are reading a complex data set into an image where the pixel
+ // type is not complex: we have to double the number of component
+ // for that to work
+ m_NbOctetPixel = m_NbOctetPixel / 2;
+ this->SetNumberOfComponents(m_NbBands*2);
+ this->SetPixelType(VECTOR);
+ }
+
+
/*----------------------------------------------------------------------*/
/*-------------------------- METADATA ----------------------------------*/
/*----------------------------------------------------------------------*/
diff --git a/Code/IO/otbGDALImageIO.h b/Code/IO/otbGDALImageIO.h
index 8b90c414343dd48714c4b94a37eb8adfca577458..123a1f7d8ee95c8d77cbb5c7d104cbfa5f751900 100644
--- a/Code/IO/otbGDALImageIO.h
+++ b/Code/IO/otbGDALImageIO.h
@@ -72,6 +72,11 @@ public:
itkSetMacro(CompressionLevel, int);
itkGetMacro(CompressionLevel, int);
+ /** Set/Get whether the pixel type (otb side) is complex */
+ itkSetMacro(IsComplex, bool);
+ itkGetMacro(IsComplex, bool);
+
+
/*-------- This part of the interface deals with reading data. ------ */
/** Determine the file type. Returns true if this ImageIO can read the
@@ -156,6 +161,8 @@ private:
bool m_FlagWriteImageInformation;
bool m_CanStreamWrite;
+ /** Whether the pixel type (otb side, not gdal side) is complex
+ * this information has to be provided by the reader */
bool m_IsComplex;
};
diff --git a/Code/IO/otbImageFileReader.txx b/Code/IO/otbImageFileReader.txx
index 7cbb14d5bc467b2e7b39aae9a14a7bd6a4dbaf21..3dbdc9cf7ba719f16456e2621bc7c491a2775453 100644
--- a/Code/IO/otbImageFileReader.txx
+++ b/Code/IO/otbImageFileReader.txx
@@ -36,6 +36,7 @@
#include "ossim/ossimPluginProjectionFactory.h"
#include "otbTileMapImageIO.h" //FIXME find a better way
+#include "otbGDALImageIO.h" //FIXME find a better way
#include "projection/ossimTileMapModel.h"
#include <itksys/SystemTools.hxx>
@@ -277,6 +278,16 @@ ImageFileReader<TOutputImage>
return;
}
+ // Hint the IO whether the OTB image type takes complex pixels
+ // this will determine the strategy to fill up a vector image
+ if (strcmp(this->m_ImageIO->GetNameOfClass(), "GDALImageIO") == 0)
+ {
+ typename GDALImageIO::Pointer imageIO = dynamic_cast<GDALImageIO*>(this->GetImageIO());
+ OutputImagePixelType dummy;
+ imageIO->SetIsComplex(PixelIsComplex(dummy));
+ }
+
+
// Got to allocate space for the image. Determine the characteristics of
// the image.
//
@@ -575,6 +586,18 @@ ImageFileReader<TOutputImage>
return (fic_trouve);
}
+template<class T>
+bool PixelIsComplex(const std::complex<T>& dummy)
+{
+ return true;
+}
+template<class T>
+bool PixelIsComplex(const T& dummy)
+{
+ return false;
+}
+
+
} //namespace otb
#endif