From fc5d59ee6e8d8516c8e7eaa225925beb59b4d7fe Mon Sep 17 00:00:00 2001
From: Aurelien Bricier <aurelien.bricier@c-s.fr>
Date: Tue, 4 Dec 2012 17:54:29 +0100
Subject: [PATCH] ENH: temporarily fixed the reader when using resol and
skipcarto options
---
Code/IO/otbImageFileReader.txx | 9 ++++++++-
Testing/Code/IO/CMakeLists.txt | 10 ++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/Code/IO/otbImageFileReader.txx b/Code/IO/otbImageFileReader.txx
index b4e9e2bf80..459ff75277 100644
--- a/Code/IO/otbImageFileReader.txx
+++ b/Code/IO/otbImageFileReader.txx
@@ -384,7 +384,14 @@ ImageFileReader<TOutputImage>
for (unsigned int i = 0; i < TOutputImage::ImageDimension; ++i)
{
origin[i] = 0.0;
- spacing[i] = 1.0;
+ if ( m_Options.resolutionFactor != 0 )
+ {
+ spacing[i] = 1.0*vcl_pow(2, m_Options.resolutionFactor);
+ }
+ else
+ {
+ spacing[i] = 1.0;
+ }
}
}
diff --git a/Testing/Code/IO/CMakeLists.txt b/Testing/Code/IO/CMakeLists.txt
index c2ade4d46e..7bcb38c687 100644
--- a/Testing/Code/IO/CMakeLists.txt
+++ b/Testing/Code/IO/CMakeLists.txt
@@ -3729,6 +3729,16 @@ ADD_TEST(ioTvImageFileReaderExtendedFileName_SkipPR ${IO_TESTS1}
${TEMP}/ioImageFileReaderExtendedFileName_SkipPR.txt
)
+ADD_TEST(ioTvImageFileReaderExtendedFileName_mix1 ${IO_TESTS1}
+--compare-ascii ${NOTOL}
+ ${BASELINE}/ioImageFileReaderExtendedFileName_mix1pr.txt
+ ${TEMP}/ioImageFileReaderExtendedFileName_mix1pr.txt
+ otbImageFileReaderWithExtendedFilename
+ ${INPUTDATA}/bretagne.j2k?&skipcarto=true&resol=2
+ ${TEMP}/ioImageFileReaderExtendedFileName_mix1kwl.txt
+ ${TEMP}/ioImageFileReaderExtendedFileName_mix1pr.txt
+ )
+
#----------------------------------------------------------------------------------
SET(BasicIO_SRCS1
otbIOTests1.cxx
--
GitLab