diff --git a/Modules/IO/ImageIO/include/otbStreamingImageFileWriter.h b/Modules/IO/ImageIO/include/otbStreamingImageFileWriter.h
deleted file mode 100644
index b4845fbcc8312a62e082776927f4f018fb041877..0000000000000000000000000000000000000000
--- a/Modules/IO/ImageIO/include/otbStreamingImageFileWriter.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*=========================================================================
-
- Program: ORFEO Toolbox
- Language: C++
- Date: $Date$
- Version: $Revision$
-
-
- Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
- See OTBCopyright.txt for details.
-
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#ifndef __otbStreamingImageFileWriter_h
-#define __otbStreamingImageFileWriter_h
-
-#include "vcl_deprecated_header.h"
-
-#include "otbImageFileWriter.h"
-
-namespace otb
-{
-/** \class StreamingImageFileWriter
- * \brief Deprecated streaming-enabled image writing class
- *
- * StreamingImageFileWriter is deprecated and provided for backward
- * compatibility only. Full support of streaming is now provided by
- * otb::ImageFileWriter, and StreamingImageFileWriter is a simple
- * alias of this class.
- *
- * \sa ImageFileWriter
- *
- * \ingroup OTBImageIO
- */
-template <class TInputImage> class ITK_EXPORT StreamingImageFileWriter : public ImageFileWriter<TInputImage>
-{
-public:
- /** Standard class typedefs. */
- typedef StreamingImageFileWriter Self;
- typedef ImageFileWriter<TInputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
- /** Method for creation through the object factory. */
- itkNewMacro(Self);
-
- /** Run-time type information (and related methods). */
- itkTypeMacro(ImageFileWriter, itk::ImageFileWriter);
-
- /** Dimension of input image. */
- itkStaticConstMacro(InputImageDimension, unsigned int,
- Superclass::InputImageDimension);
-
-protected:
- /** Constructor */
- StreamingImageFileWriter(){}
-
- /** Destructor */
- virtual ~StreamingImageFileWriter(){}
-
-private:
- StreamingImageFileWriter(const StreamingImageFileWriter &); //purposely not implemented
- void operator =(const StreamingImageFileWriter&); //purposely not implemented
-};
-
-} // end namespace otb
-
-#endif
diff --git a/Modules/IO/ImageIO/test/CMakeLists.txt b/Modules/IO/ImageIO/test/CMakeLists.txt
index 8472de5c16849f155afc8a91f040c0eae386490d..ecd67c8605231fdf79bf3c944e1b990f812afb4f 100644
--- a/Modules/IO/ImageIO/test/CMakeLists.txt
+++ b/Modules/IO/ImageIO/test/CMakeLists.txt
@@ -255,7 +255,6 @@ otb_add_test(NAME ioTvStreamingIFWriterLUMWithoutStreaming COMMAND otbImageIOTes
otbStreamingImageFileWriterTest
${TEMP}/ioImageFileReaderPNG2LUM.lum
${TEMP}/ioStreamingImageFileWriterLUM2LUMWithoutStreaming.lum
- 0 # StreamingImageFileWriter
0 # NumberOfStreamDivisions
)
set_property(TEST ioTvStreamingIFWriterLUMWithoutStreaming PROPERTY DEPENDS ioTvImageFileReaderPNG2LUM)
@@ -266,7 +265,6 @@ otb_add_test(NAME ioTvStreamingIFWriterBSQWithoutStreaming COMMAND otbImageIOTes
otbStreamingImageFileWriterTest
${INPUTDATA}/poupees_1canal.c1.hdr
${TEMP}/ioStreamingImageFileWriterBSQWithoutStreaming.hdr
- 0 # Streaming
0
)
set_property(TEST ioTvStreamingIFWriterBSQWithoutStreaming PROPERTY DEPENDS ioTvImageFileReaderPNG2BSQ)
@@ -277,7 +275,6 @@ otb_add_test(NAME ioTvStreamingWithIFWriterLUMWithStreaming COMMAND otbImageIOTe
otbStreamingImageFileWriterTest
${TEMP}/ioImageFileReaderPNG2LUM.lum
${TEMP}/ioStreamingWithImageFileWriterLUM2LUMWithStreaming_10.lum
- 0 # StreamingImageFileWriter
10 # NumberOfStreamDivisions
)
set_property(TEST ioTvStreamingWithIFWriterLUMWithStreaming PROPERTY DEPENDS ioTvImageFileReaderPNG2LUM)
@@ -288,7 +285,6 @@ otb_add_test(NAME ioTvStreamingWithIFWriterBSQWithStreaming COMMAND otbImageIOTe
otbStreamingImageFileWriterTest
${TEMP}/ioImageFileReaderPNG2BSQ.hd
${TEMP}/ioStreamingWithImageFileWriterBSQ2BSQWithStreaming_10.hd
- 0 # StreamingImageFileWriter
10 # NumberOfStreamDivisions
)
set_property(TEST ioTvStreamingWithIFWriterBSQWithStreaming PROPERTY DEPENDS ioTvImageFileReaderPNG2BSQ)
@@ -299,7 +295,6 @@ otb_add_test(NAME ioTvStreamingIFWriterBSQWithStreaming COMMAND otbImageIOTestDr
otbStreamingImageFileWriterTest
${INPUTDATA}/poupees_1canal.c1.hdr
${TEMP}/ioStreamingImageFileWriterBSQWithStreaming_100.hdr
- 1 # Streaming
100
)
set_property(TEST ioTvStreamingIFWriterBSQWithStreaming PROPERTY DEPENDS ioTvImageFileReaderPNG2BSQ)
@@ -310,7 +305,6 @@ otb_add_test(NAME ioTvStreamingIFWriterLUMWithStreaming COMMAND otbImageIOTestDr
otbStreamingImageFileWriterTest
${TEMP}/ioImageFileReaderPNG2LUM.lum
${TEMP}/ioStreamingImageFileWriterLUM2LUMWithStreaming_10.lum
- 1 # StreamingImageFileWriter
10 # NumberOfStreamDivisions
)
set_property(TEST ioTvStreamingIFWriterLUMWithStreaming PROPERTY DEPENDS ioTvImageFileReaderPNG2LUM)
@@ -322,7 +316,7 @@ otb_add_test(NAME ioTvReadingComplexDataIntoComplexImage COMMAND otbImageIOTestD
)
otb_add_test(NAME ioTvStreamingImageFilterBSQ2PNG COMMAND otbImageIOTestDriver
- --compare-image ${EPSILON_9}
+ --compare-image ${EPSILON_9}
${TEMP}/ioImageFileReaderPNG2BSQ.hd
${TEMP}/ioStreamingImageFilterTestBSQ.png
otbStreamingImageFilterTest
@@ -1308,4 +1302,3 @@ otb_add_test(NAME ioTvImageFileReaderPNG2ENVI COMMAND otbImageIOTestDriver
${INPUTDATA}/cthead1.png
${TEMP}/ioImageFileReaderPNG2ENVI.hdr )
set_tests_properties(ioTvImageFileReaderPNG2ENVI PROPERTIES DEPENDS ioTvImageFileReaderPNG2BSQ)
-
diff --git a/Modules/IO/ImageIO/test/otbImageIOTestDriver.cxx b/Modules/IO/ImageIO/test/otbImageIOTestDriver.cxx
index bc95c3855cf41b27f0cb3dffdec9ddb29f9fc720..648a86161d37779f8b4cfbd15021c5a594050bc8 100644
--- a/Modules/IO/ImageIO/test/otbImageIOTestDriver.cxx
+++ b/Modules/IO/ImageIO/test/otbImageIOTestDriver.cxx
@@ -24,7 +24,6 @@ void RegisterTests()
REGISTER_TEST(otbVectorImageStreamingFileWriterComplexTestWithoutInputFloat);
REGISTER_TEST(otbVectorImageStreamingFileWriterComplexTestWithoutInputDouble);
REGISTER_TEST(otbReadingComplexDataIntoComplexImageTest);
- REGISTER_TEST(otbStreamingImageFileWriterTest);
REGISTER_TEST(otbImageFileReaderRADInt);
REGISTER_TEST(otbImageFileReaderRGBTest);
REGISTER_TEST(otbImageMetadataStreamingFileWriterTest);
diff --git a/Modules/IO/ImageIO/test/otbStreamingImageFileWriterTest.cxx b/Modules/IO/ImageIO/test/otbStreamingImageFileWriterTest.cxx
index 6679dc218b3fcbf67d01fac4aab9ff6b748fcac6..60a76cab364dcfa5cba24f796f89a42f616103a8 100644
--- a/Modules/IO/ImageIO/test/otbStreamingImageFileWriterTest.cxx
+++ b/Modules/IO/ImageIO/test/otbStreamingImageFileWriterTest.cxx
@@ -24,16 +24,14 @@
#include "otbImage.h"
#include "otbImageFileReader.h"
-#include "otbStreamingImageFileWriter.h"
+#include "otbImageFileWriter.h"
int otbStreamingImageFileWriterTest(int itkNotUsed(argc), char* argv[])
{
// Verify the number of parameters in the command line
const char * inputFilename = argv[1];
const char * outputFilename = argv[2];
- int iStreaming(::atoi(argv[3]));
- bool streaming = (bool) (iStreaming);
- int NumberOfStreamDivisions(::atoi(argv[4]));
+ int NumberOfStreamDivisions(::atoi(argv[3]));
typedef unsigned char InputPixelType;
typedef unsigned char OutputPixelType;
@@ -43,23 +41,10 @@ int otbStreamingImageFileWriterTest(int itkNotUsed(argc), char* argv[])
typedef otb::Image<OutputPixelType, Dimension> OutputImageType;
typedef otb::ImageFileReader<InputImageType> ReaderType;
- typedef otb::StreamingImageFileWriter<OutputImageType> StreamingWriterType;
typedef otb::ImageFileWriter<OutputImageType> WriterType;
ReaderType::Pointer reader = ReaderType::New();
reader->SetFileName(inputFilename);
-
- if (streaming == true)
- {
- std::cout << "Streaming writing test" << std::endl;
- StreamingWriterType::Pointer writer = StreamingWriterType::New();
- writer->SetFileName(outputFilename);
- writer->SetNumberOfDivisionsStrippedStreaming(NumberOfStreamDivisions);
- writer->SetInput(reader->GetOutput());
- writer->Update();
- }
- else
- {
std::cout << "Writing test" << std::endl;
WriterType::Pointer writer = WriterType::New();
if (NumberOfStreamDivisions > 1)
@@ -72,7 +57,6 @@ int otbStreamingImageFileWriterTest(int itkNotUsed(argc), char* argv[])
writer->SetFileName(outputFilename);
writer->SetInput(reader->GetOutput());
writer->Update();
- }
return EXIT_SUCCESS;
}