BACKOUT: revert last changes on StreamingTraits

Code/Common/otbStreamingTraits.txx

@@ -28,8 +28,6 @@
 #include "itkLinearInterpolateImageFunction.h"
 #include "itkNearestNeighborInterpolateImageFunction.h"
 
-#include "otbImageRegionSquareTileSplitter.h"
-
 namespace otb
 {
 
@@ -55,30 +53,32 @@ unsigned long StreamingTraitsBase<TImage>
       break;
     case SET_BUFFER_MEMORY_SIZE:
       {
+      const unsigned long bufferMemorySizeOctet = bufferMemorySize / 8;
       unsigned long       numberColumnsOfRegion = region.GetSize()[0]; // X dimension
-      const unsigned long sizeLineInBytes = numberColumnsOfRegion * \
+      const unsigned long sizeLine = numberColumnsOfRegion * \
                                      image->GetNumberOfComponentsPerPixel() * \
                                      sizeof(PixelType);
-      unsigned long regionSizeInBytes = region.GetSize()[1] * sizeLineInBytes;
+      unsigned long regionSize = region.GetSize()[1] * sizeLine;
       otbMsgDevMacro(<< "image->GetNumberOfComponentsPerPixel()   = " << image->GetNumberOfComponentsPerPixel());
       otbMsgDevMacro(<< "sizeof(PixelType)                        = " << sizeof(PixelType));
       otbMsgDevMacro(<< "numberColumnsOfRegion                    = " << numberColumnsOfRegion);
-      otbMsgDevMacro(<< "sizeLine                                 = " << sizeLineInBytes);
-      otbMsgDevMacro(<< "regionSize                               = " << regionSizeInBytes);
+      otbMsgDevMacro(<< "sizeLine                                 = " << sizeLine);
+      otbMsgDevMacro(<< "regionSize                               = " << regionSize);
       otbMsgDevMacro(<< "BufferMemorySize                         = " << bufferMemorySize);
+      otbMsgDevMacro(<< "bufferMemorySizeOctet                    = " << bufferMemorySizeOctet);
 
       //Active streaming
-      if (regionSizeInBytes > bufferMemorySize)
+      if (regionSize > bufferMemorySizeOctet)
         {
         //The regionSize must be at list equal to the sizeLine
-        if (regionSizeInBytes < sizeLineInBytes)
+        if (regionSize < sizeLine)
           {
           otbMsgDevMacro(<< "Force buffer size.");
-          regionSizeInBytes = sizeLineInBytes;
+          regionSize = sizeLine;
           }
         //Calculate NumberOfStreamDivisions
         numDivisions = static_cast<unsigned long>(
-          vcl_ceil(static_cast<double>(regionSizeInBytes) / static_cast<double>(bufferMemorySize))
+          vcl_ceil(static_cast<double>(regionSize) / static_cast<double>(bufferMemorySizeOctet))
           );
         }
       else
@@ -161,19 +161,6 @@ unsigned long StreamingTraitsBase<TImage>
 
         otbMsgDevMacro(<< "streamMaxSizeBufferForStreaming in Bytes     = " << streamMaxSizeBufferForStreamingInBytes);
 
-
-        // Is the splitter a otb::ImageRegionSquareTileSplitter ?
-        otb::ImageRegionSquareTileSplitter<2>* squareTileSplitter = dynamic_cast<otb::ImageRegionSquareTileSplitter<2>*>(splitter);
-        if (squareTileSplitter)
-          {
-          // in that case, inform it about PixelSize so that the tiles
-          squareTileSplitter->SetPixelSizeInBytes(static_cast<std::streamoff>(image->GetNumberOfComponentsPerPixel()) *
-                                                  static_cast<std::streamoff>(sizeof(PixelType)));
-
-          squareTileSplitter->SetTileSizeInBytes(streamMaxSizeBufferForStreamingInBytes);
-          }
-
-
         //Calculate NumberOfStreamDivisions
         numDivisions =
           static_cast<unsigned long>(vcl_ceil(static_cast<double>(regionSizeInBytes) /