Merge pull request #105 from mdaus/byte_provider_update

CompressedByteProvider can return a single image buffer
ngageoint · Nov 27, 2018 · e03d21f · e03d21f
2 parents 9f7dbba + ddc9872
commit e03d21f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 22 deletions.
diff --git a/modules/c++/nitf/source/ByteProvider.cpp b/modules/c++/nitf/source/ByteProvider.cpp
@@ -31,21 +31,6 @@
 #include <nitf/IOStreamWriter.hpp>
 #include <io/ByteStream.h>
 
-namespace
-{
-void copyFromStreamAndClear(io::ByteStream& stream,
-                            std::vector<sys::byte>& rawBytes)
-{
-    rawBytes.resize(stream.getSize());
-    if (!rawBytes.empty())
-    {
-        ::memcpy(&rawBytes[0], stream.get(), stream.getSize());
-    }
-
-    stream.clear();
-}
-}
-
 namespace nitf
 {
 ByteProvider::ByteProvider() :

diff --git a/modules/c++/nitf/source/CompressedByteProvider.cpp b/modules/c++/nitf/source/CompressedByteProvider.cpp
@@ -160,15 +160,17 @@ size_t CompressedByteProvider::addImageData(
     }
 
     // Copy the image data into the buffer
-    size_t bytesWritten = 0;
-    for (size_t ii = blockRange.mStartElement;
-            ii < blockRange.mStartElement + blockRange.mNumElements;
-            ++ii)
+    // Since we have it in contiguous memory, this can be added as one buffer
+    size_t numBufferBytes(0);
+    for (size_t ii = blockRange.mStartElement, end = blockRange.endElement();
+         ii < end;
+         ++ii)
     {
-        buffers.pushBack(imageData + bytesWritten, bytesPerBlock[ii]);
-        bytesWritten += bytesPerBlock[ii];
+        numBufferBytes += bytesPerBlock[ii];
     }
-    return bytesWritten;
+    buffers.pushBack(imageData, numBufferBytes);
+
+    return numBufferBytes;
 }
 
 nitf::Off CompressedByteProvider::getNumBytes(size_t startRow, size_t numRows) const