dcm4che/dcm4chee-arc-light#98: Decompression of JPEG Loss Less Multif…

…rame Images with padded Data Fragments fails
dcm4che · Apr 22, 2016 · e839deb · e839deb
1 parent 758ca23
commit e839deb
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/...geio/src/main/java/org/dcm4che3/imageio/stream/EncapsulatedPixelDataImageInputStream.java b/...geio/src/main/java/org/dcm4che3/imageio/stream/EncapsulatedPixelDataImageInputStream.java
@@ -96,10 +96,15 @@ public boolean seekNextFrame() throws IOException {
         if (endOfStream)
             return false;
 
-        while (!endOfFrame()) {
-            seek(fragmEndPos-1);
-            super.read(); // ensure to read whole Data Fragment from DicomInputStream
+        if (frameEndPos >= 0) {
+            seek(frameEndPos);
             flush();
+        } else {
+            while (!endOfFrame()) {
+                seek(fragmEndPos-1);
+                super.read(); // ensure to read wh ole Data Fragment from DicomInputStream
+                flush();
+            }
         }
         frameStartPos = streamPos;
         frameEndPos = -1L;
@@ -125,12 +130,11 @@ private boolean endOfFrame() throws IOException {
         if (streamPos < fragmEndPos)
             return false;
 
-        frameEndPos = fragmEndPos;
-        if (!readItemHeader() || fragmStartWord == frameStartWord)
-            return true;
+        if (readItemHeader() && fragmStartWord != frameStartWord)
+            return false;
 
-        frameEndPos = -1L;
-        return false;
+        frameEndPos = streamPos;
+        return true;
     }
 
 }