diff --git a/Code/IO/otbGDALImageIO.cxx b/Code/IO/otbGDALImageIO.cxx
index 254d92b56135e92d6d6865ae5e29df3adcbb27ea..58a1e1547db90994c3101911b112a51ac912da40 100644
--- a/Code/IO/otbGDALImageIO.cxx
+++ b/Code/IO/otbGDALImageIO.cxx
@@ -108,32 +108,7 @@ bool GDALImageIO::CanReadFile(const char* file)
itkDebugMacro(<<"No filename specified.");
return false;
}
- bool lCanRead(false);
- //Traitement particulier sur certain format o� l'on pr�f�re utiliser
- // Format PNG -> lecture avec ITK (pas GDAL car certains tests sortent en erreurs)
- itk::PNGImageIO::Pointer lPNGImageIO = itk::PNGImageIO::New();
- lCanRead = lPNGImageIO->CanReadFile(file);
- if ( lCanRead == true)
- {
- return false;
- }
- itk::JPEGImageIO::Pointer lJPEGImageIO = itk::JPEGImageIO::New();
- lCanRead = lJPEGImageIO->CanReadFile(file);
- if ( lCanRead == true)
- {
- return false;
- }
-
- // Regarde si c'est un r�pertoire
- /* std::string lFileNameGdal;
- otbMsgDevMacro(<<"GDALImageIO::CanReadFile()");
- bool found = GetGdalReadImageFileName(file,lFileNameGdal);
- if( found == false )
- {
- return false;
- }
- */
std::string lFileNameGdal;
lFileNameGdal = std::string(file);
@@ -353,6 +328,7 @@ void GDALImageIO::InternalReadImageInformation()
itkExceptionMacro(<<"Zero band found in the dataset");
return;
}
+
this->SetNumberOfComponents(m_NbBands);
otbMsgDevMacro(<<"NbBands : "<<m_NbBands);
@@ -453,7 +429,7 @@ void GDALImageIO::InternalReadImageInformation()
}
else
{
- m_NbOctetPixel = 1;
+ itkExceptionMacro(<<"Component type unknown");
}
diff --git a/Testing/Code/BasicFilters/CMakeLists.txt b/Testing/Code/BasicFilters/CMakeLists.txt
index cbb5b9a68c1251d81a2df8fd12dad9fe8f58a4e6..98db24947bdbdc35cc1d5940631c1768fc5cc7e3 100644
--- a/Testing/Code/BasicFilters/CMakeLists.txt
+++ b/Testing/Code/BasicFilters/CMakeLists.txt
@@ -450,7 +450,7 @@ ADD_TEST(bfTvStreamingStatisticsVectorImageFilter ${BASICFILTERS_TESTS5}
${TEMP}/bfTvStreamingStatisticsVectorImageFilterResults.txt
otbStreamingStatisticsVectorImageFilter
#${IMAGEDATA}/SPOT5_SCENE01/IMAGERY.TIF
- ${INPUTDATA}/sbuv.png
+ ${INPUTDATA}/couleurs_extrait.png
${TEMP}/bfTvStreamingStatisticsVectorImageFilterResults.txt
)
diff --git a/Testing/Code/Common/CMakeLists.txt b/Testing/Code/Common/CMakeLists.txt
index 5ba7d3fd9ded9d551235b5d1d1f3d4745d638fc4..d05765ccf878fa63e03587d094fe682a2a57ca86 100644
--- a/Testing/Code/Common/CMakeLists.txt
+++ b/Testing/Code/Common/CMakeLists.txt
@@ -113,12 +113,12 @@ ADD_TEST(coTvExtractROI2 ${COMMON_TESTS2}
26 97 209 100 )
ADD_TEST(coTvExtractROI_RGB ${COMMON_TESTS2}
- --compare-image ${TOL} ${BASELINE}/coExtractROI_RGB_sbuv_700_60_77_489.png
- ${TEMP}/coExtractROI_RGB_sbuv_700_60_77_489.png
+ --compare-image ${TOL} ${BASELINE}/coExtractROI_RGB_300_10_200_50.png
+ ${TEMP}/coExtractROI_RGB_300_10_200_50.png
otbExtractROI_RGB
- ${INPUTDATA}/sbuv.png
- ${TEMP}/coExtractROI_RGB_sbuv_700_60_77_489.png
- 700 60 77 489 )
+ ${INPUTDATA}/couleurs_extrait.png
+ ${TEMP}/coExtractROI_RGB_300_10_200_50.png
+ 300 10 200 50 )
ADD_TEST(coTvExtractROI_RGB2 ${COMMON_TESTS2}
--compare-image ${TOL} ${BASELINE}/coExtractROI_RGB_poupees_302_1_134_330.jpg
${TEMP}/coExtractROI_RGB_poupees_302_1_134_330.jpg
@@ -153,52 +153,52 @@ ADD_TEST(coTuMultiChannelROINew ${COMMON_TESTS2}
otbMultiChannelExtractROINew)
ADD_TEST(coTvMultiChannelROI_RGB2RGB_PNG ${COMMON_TESTS2}
- --compare-image ${TOL} ${INPUTDATA}/sbuv.png
- ${TEMP}/coMultiChannelExtractROI_RGB2RGB_PNG_sbuv.png
+ --compare-image ${TOL} ${INPUTDATA}/couleurs_extrait.png
+ ${TEMP}/coMultiChannelExtractROI_RGB2RGB_PNG.png
otbMultiChannelExtractROI
- ${INPUTDATA}/sbuv.png
- ${TEMP}/coMultiChannelExtractROI_RGB2RGB_PNG_sbuv.png
+ ${INPUTDATA}/couleurs_extrait.png
+ ${TEMP}/coMultiChannelExtractROI_RGB2RGB_PNG.png
-channels 1 2 3 )
# -sizeX 800 -sizeY 600 )
ADD_TEST(coTvMultiChannelROI_RGB2RGB_PNG2 ${COMMON_TESTS2}
- --compare-image ${TOL} ${BASELINE}/coMultiChannelExtractROI_RGB2RGB_PNG_sbuv_700_60_77_489_channels_123.png
- ${TEMP}/coMultiChannelExtractROI_RGB2RGB_PNG_sbuv_700_60_77_489_channels_123.png
+ --compare-image ${TOL} ${BASELINE}/coMultiChannelExtractROI_RGB2RGB_PNG_300_10_250_50_channels_123.png
+ ${TEMP}/coMultiChannelExtractROI_RGB2RGB_PNG_300_10_250_50_channels_123.png
otbMultiChannelExtractROI
- -uchar ${INPUTDATA}/sbuv.png
- -uchar ${TEMP}/coMultiChannelExtractROI_RGB2RGB_PNG_sbuv_700_60_77_489_channels_123.png
- -startX 700 -startY 60 -sizeX 77 -sizeY 489 -channels 1 2 3 )
+ -uchar ${INPUTDATA}/couleurs_extrait.png
+ -uchar ${TEMP}/coMultiChannelExtractROI_RGB2RGB_PNG_300_10_250_50_channels_123.png
+ -startX 300 -startY 10 -sizeX 250 -sizeY 50 -channels 1 2 3 )
ADD_TEST(coTvMultiChannelROI_RGB2RGB_PNG3 ${COMMON_TESTS2}
- --compare-image ${TOL} ${BASELINE}/coMultiChannelExtractROI_RGB2RGB_PNG_sbuv_700_60_77_489_channels_321.png
- ${TEMP}/coMultiChannelExtractROI_RGB2RGB_PNG_sbuv_700_60_77_489_channels_321.png
+ --compare-image ${TOL} ${BASELINE}/coMultiChannelExtractROI_RGB2RGB_PNG_300_10_250_50_channels_321.png
+ ${TEMP}/coMultiChannelExtractROI_RGB2RGB_PNG_300_10_250_50_channels_321.png
otbMultiChannelExtractROI
- ${INPUTDATA}/sbuv.png
- ${TEMP}/coMultiChannelExtractROI_RGB2RGB_PNG_sbuv_700_60_77_489_channels_321.png
- -startX 700 -startY 60 -sizeX 77 -sizeY 489 -channels 3 2 1 )
+ ${INPUTDATA}/couleurs_extrait.png
+ ${TEMP}/coMultiChannelExtractROI_RGB2RGB_PNG_300_10_250_50_channels_321.png
+ -startX 300 -startY 10 -sizeX 250 -sizeY 50 -channels 3 2 1 )
ADD_TEST(coTvMultiChannelROI_RGB2NG_PNG1 ${COMMON_TESTS2}
- --compare-image ${TOL} ${BASELINE}/coMultiChannelExtractROI_RGB2NG_PNG_sbuv_700_60_77_489_channel_1.png
- ${TEMP}/coMultiChannelExtractROI_RGB2NG_PNG_sbuv_700_60_77_489_channel_1.png
+ --compare-image ${TOL} ${BASELINE}/coMultiChannelExtractROI_RGB2NG_PNG_300_10_250_50_channel_1.png
+ ${TEMP}/coMultiChannelExtractROI_RGB2NG_PNG_300_10_250_50_channel_1.png
otbMultiChannelExtractROI
- ${INPUTDATA}/sbuv.png
- ${TEMP}/coMultiChannelExtractROI_RGB2NG_PNG_sbuv_700_60_77_489_channel_1.png
- -startX 700 -startY 60 -sizeX 77 -sizeY 489 -channels 1 )
+ ${INPUTDATA}/couleurs_extrait.png
+ ${TEMP}/coMultiChannelExtractROI_RGB2NG_PNG_300_10_250_50_channel_1.png
+ -startX 300 -startY 10 -sizeX 250 -sizeY 50 -channels 1 )
ADD_TEST(coTvMultiChannelROI_RGB2NG_PNG2 ${COMMON_TESTS2}
- --compare-image ${TOL} ${BASELINE}/coMultiChannelExtractROI_RGB2NG_PNG_sbuv_700_60_77_489_channel_2.png
- ${TEMP}/coMultiChannelExtractROI_RGB2NG_PNG_sbuv_700_60_77_489_channel_2.png
+ --compare-image ${TOL} ${BASELINE}/coMultiChannelExtractROI_RGB2NG_PNG_300_10_250_50_channel_2.png
+ ${TEMP}/coMultiChannelExtractROI_RGB2NG_PNG_300_10_250_50_channel_2.png
otbMultiChannelExtractROI
- ${INPUTDATA}/sbuv.png
- ${TEMP}/coMultiChannelExtractROI_RGB2NG_PNG_sbuv_700_60_77_489_channel_2.png
- -startX 700 -startY 60 -sizeX 77 -sizeY 489 -channels 2 )
+ ${INPUTDATA}/couleurs_extrait.png
+ ${TEMP}/coMultiChannelExtractROI_RGB2NG_PNG_300_10_250_50_channel_2.png
+ -startX 300 -startY 10 -sizeX 250 -sizeY 50 -channels 2 )
ADD_TEST(coTvMultiChannelROI_RGB2NG_PNG3 ${COMMON_TESTS2}
- --compare-image ${TOL} ${BASELINE}/coMultiChannelExtractROI_RGB2NG_PNG_sbuv_700_60_77_489_channel_3.png
- ${TEMP}/coMultiChannelExtractROI_RGB2NG_PNG_sbuv_700_60_77_489_channel_3.png
+ --compare-image ${TOL} ${BASELINE}/coMultiChannelExtractROI_RGB2NG_PNG_300_10_250_50_channel_3.png
+ ${TEMP}/coMultiChannelExtractROI_RGB2NG_PNG_300_10_250_50_channel_3.png
otbMultiChannelExtractROI
- ${INPUTDATA}/sbuv.png
- ${TEMP}/coMultiChannelExtractROI_RGB2NG_PNG_sbuv_700_60_77_489_channel_3.png
- -startX 700 -startY 60 -sizeX 77 -sizeY 489 -channels 3 )
+ ${INPUTDATA}/couleurs_extrait.png
+ ${TEMP}/coMultiChannelExtractROI_RGB2NG_PNG_300_10_250_50_channel_3.png
+ -startX 300 -startY 10 -sizeX 250 -sizeY 50 -channels 3 )
ADD_TEST(coTvMultiChannelROI_5c_BSQ ${COMMON_TESTS2}
# --compare-binary ${BASELINE}/coMultiChannelExtractROI_RGB2NG_PNG_poupees_303_2_134_330_channels_12321.c1
@@ -246,12 +246,12 @@ ADD_TEST(coTuMultiToMonoROINew ${COMMON_TESTS3}
otbMultiToMonoChannelExtractROINew)
ADD_TEST(coTvMultiToMonoROI_RGB2NG_PNG ${COMMON_TESTS3}
- --compare-image ${TOL} ${BASELINE}/coMultiToMonoChannelExtractROI_RGB2NG_PNG_sbuv_700_60_77_489_channel_1.png
- ${TEMP}/coMultiToMonoChannelExtractROI_RGB2NG_PNG_sbuv_700_60_77_489_channel_1.png
+ --compare-image ${TOL} ${BASELINE}/coMultiToMonoChannelExtractROI_RGB2NG_PNG_300_10_250_50_channel_1.png
+ ${TEMP}/coMultiToMonoChannelExtractROI_RGB2NG_PNG_300_10_250_50_channel_1.png
otbMultiToMonoChannelExtractROI
- ${INPUTDATA}/sbuv.png
- ${TEMP}/coMultiToMonoChannelExtractROI_RGB2NG_PNG_sbuv_700_60_77_489_channel_1.png
- -startX 700 -startY 60 -sizeX 77 -sizeY 489 -channel 1 )
+ ${INPUTDATA}/couleurs_extrait.png
+ ${TEMP}/coMultiToMonoChannelExtractROI_RGB2NG_PNG_300_10_250_50_channel_1.png
+ -startX 300 -startY 10 -sizeX 250 -sizeY 50 -channel 1 )
# ------- otb::PointSetSource ------------------------------
@@ -316,7 +316,7 @@ ADD_TEST(coTvObjectList ${COMMON_TESTS4}
otbObjectList
${INPUTDATA}/couleurs.jpg
${INPUTDATA}/poupees.png
- ${INPUTDATA}/sbuv.png
+ ${INPUTDATA}/couleurs_extrait.png
)
ADD_TEST(coTvObjectListTestNotValid ${COMMON_TESTS4}
diff --git a/Testing/Code/IO/CMakeLists.txt b/Testing/Code/IO/CMakeLists.txt
index e0d601ec6f804cf056fc731fe05a0df29cb50a05..1e62537ed857f5f2d2edaf2ca1d72b7ad8eeb2ed 100755
--- a/Testing/Code/IO/CMakeLists.txt
+++ b/Testing/Code/IO/CMakeLists.txt
@@ -332,19 +332,27 @@ ADD_TEST(ioTvImageFileReaderBSQ2PNG ${IO_TESTS3}
${TEMP}/ioImageFileReaderBSQ2PNG.png )
ADD_TEST(ioTvImageFileReaderRGB_PNG2BSQ ${IO_TESTS3}
- --compare-image ${TOL} ${INPUTDATA}/sbuv.png
+ --compare-image ${TOL} ${INPUTDATA}/couleurs_extrait.png
${TEMP}/ioImageFileReaderRGB_PNG2BSQ.hd
otbImageFileReaderRGBTest
- ${INPUTDATA}/sbuv.png
+ ${INPUTDATA}/couleurs_extrait.png
${TEMP}/ioImageFileReaderRGB_PNG2BSQ.hd )
ADD_TEST(ioTvImageFileReaderRGB_PNG2ENVI ${IO_TESTS3}
- --compare-image ${TOL} ${INPUTDATA}/sbuv.png
+ --compare-image ${TOL} ${INPUTDATA}/couleurs_extrait.png
${TEMP}/ioImageFileReaderRGB_PNG2ENVI.hdr
otbImageFileReaderRGBTest
- ${INPUTDATA}/sbuv.png
+ ${INPUTDATA}/couleurs_extrait.png
${TEMP}/ioImageFileReaderRGB_PNG2ENVI.hdr )
+ADD_TEST(ioTvCheckReadPNGIndexee ${IO_TESTS3}
+ --compare-image ${TOL} ${INPUTDATA}/sbuv_indexee.png
+ ${TEMP}/ioImageFileReaderRGB_PNGIndexee2TIF.tif
+ otbImageFileReaderRGBTest
+ ${INPUTDATA}/sbuv_indexee.png
+ ${TEMP}/ioImageFileReaderRGB_PNGIndexee2TIF.tif )
+
+
# --- Image I2
ADD_TEST(ioTvImageFileReaderShortRGB_BSQ2HDR ${IO_TESTS3}
--compare-image ${TOL} ${INPUTDATA}/poupees_I2.hd
@@ -586,17 +594,17 @@ ADD_TEST(ioTvImageFileReaderPNG2PNG ${IO_TESTS7}
${TEMP}/ioImageFileReaderPNG2PNG_cthead1.png )
# RGB
ADD_TEST(ioTvImageFileReaderRGB_PNG2PNG ${IO_TESTS7}
- --compare-image ${TOL} ${BASELINE}/ioImageFileReaderRGB_PNG2PNG_sbuv.png
- ${TEMP}/ioImageFileReaderRGB_PNG2PNG_sbuv.png
+ --compare-image ${TOL} ${INPUTDATA}/couleurs_extrait.png
+ ${TEMP}/ioImageFileReaderRGB_PNG2PNG.png
otbImageFileReaderRGBTest
- ${INPUTDATA}/sbuv.png
- ${TEMP}/ioImageFileReaderRGB_PNG2PNG_sbuv.png )
+ ${INPUTDATA}/couleurs_extrait.png
+ ${TEMP}/ioImageFileReaderRGB_PNG2PNG.png )
ADD_TEST(ioTvImageFileReaderRGB_PNG2TIFF ${IO_TESTS7}
- --compare-image ${TOL} ${BASELINE}/ioImageFileReaderRGB_PNG2TIFF_sbuv.tiff
- ${TEMP}/ioImageFileReaderRGB_PNG2TIFF_sbuv.tiff
+ --compare-image ${TOL} ${BASELINE}/ioImageFileReaderRGB_PNG2TIFF.tiff
+ ${TEMP}/ioImageFileReaderRGB_PNG2TIFF.tiff
otbImageFileReaderRGBTest
- ${INPUTDATA}/sbuv.png
- ${TEMP}/ioImageFileReaderRGB_PNG2TIFF_sbuv.tiff )
+ ${INPUTDATA}/couleurs_extrait.png
+ ${TEMP}/ioImageFileReaderRGB_PNG2TIFF.tiff )
ADD_TEST(ioTvImageFileReaderRGB_BSQ2PNG ${IO_TESTS7}
--compare-image ${TOL} ${INPUTDATA}/poupees.hdr
${TEMP}/ioImageFileReaderRGB_BSQ2PNG_poupees.png
@@ -668,23 +676,23 @@ ADD_TEST(ioTvImageFileReaderPDS2TIFF ${IO_TESTS8}
# RGB
ADD_TEST(ioTvImageFileWriterRGB_PNG2PNG ${IO_TESTS8}
- --compare-image ${TOL} ${BASELINE}/ioImageFileWriterRGB_PNG2PNG_sbuv.png
- ${TEMP}/ioImageFileWriterRGB_PNG2PNG_sbuv.png
+ --compare-image ${TOL} ${BASELINE}/ioImageFileWriterRGB_PNG2PNG.png
+ ${TEMP}/ioImageFileWriterRGB_PNG2PNG.png
otbImageFileWriterRGBTest
- ${INPUTDATA}/sbuv.png
- ${TEMP}/ioImageFileWriterRGB_PNG2PNG_sbuv.png )
+ ${INPUTDATA}/couleurs_extrait.png
+ ${TEMP}/ioImageFileWriterRGB_PNG2PNG.png )
ADD_TEST(ioTvImageFileWriterRGB_PNG2BSQ ${IO_TESTS8}
otbImageFileWriterRGBTest
- ${INPUTDATA}/sbuv.png
- ${TEMP}/ioImageFileWriterRGB_PNG2BSQ_sbuv.hdr )
+ ${INPUTDATA}/couleurs_extrait.png
+ ${TEMP}/ioImageFileWriterRGB_PNG2BSQ.hdr )
ADD_TEST(ioTvImageFileReaderRGB_BSQ2PNG_2 ${IO_TESTS8}
- --compare-image ${TOL} ${INPUTDATA}/sbuv.png
- ${TEMP}/ioImageFileWriterRGB_PNG2BSQ_sbuv_2.png
+ --compare-image ${TOL} ${INPUTDATA}/couleurs_extrait.png
+ ${TEMP}/ioImageFileReaderRGB_PNG2BSQ_2.png
otbImageFileReaderRGBTest
- ${TEMP}/ioImageFileWriterRGB_PNG2BSQ_sbuv.hdr
- ${TEMP}/ioImageFileWriterRGB_PNG2BSQ_sbuv_2.png )
+ ${TEMP}/ioImageFileWriterRGB_PNG2BSQ.hdr
+ ${TEMP}/ioImageFileReaderRGB_PNG2BSQ_2.png )
# WRITER GDAL
ADD_TEST(ioTvGDALImageFileWriterTIF2TIF ${IO_TESTS8}