From 1402e78144570c8157f52d66d1cd4d2d9b76bb7b Mon Sep 17 00:00:00 2001
From: Rune Bremnes <rune@bremnes.name>
Date: Mon, 3 Mar 2014 16:09:01 +0100
Subject: [PATCH] Clean up after merge.

---
 .../imageio/plugins/jpeg/JPEGImageReader.java |  4 --
 .../plugins/jpeg/JPEGImageReaderTest.java     | 50 -------------------
 2 files changed, 54 deletions(-)

diff --git a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReader.java b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReader.java
index 0b39d33f..ba8837ea 100644
--- a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReader.java
+++ b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReader.java
@@ -445,10 +445,6 @@ public class JPEGImageReader extends ImageReaderBase {
             for (int y = srcRegion.y; y < srcMaxY; y += step) {
                 int scan = Math.min(step, srcMaxY - y);
 
-                if(scan <= param.getSubsamplingYOffset()) {
-                    param.setSourceSubsampling(param.getSourceXSubsampling(),param.getSourceYSubsampling(),param.getSubsamplingXOffset(),0);
-                }
-
                 // Let the progress delegator handle progress, using corrected range
                 progressDelegator.updateProgressRange(100f * (y + scan) / srcRegion.height);
 
diff --git a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
index 7a901fc9..7a12da6f 100644
--- a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
+++ b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
@@ -1105,54 +1105,4 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTestCase<JPEGImageRe
 
         return sortedNodes;
     }
-    @Test
-    public void testReadImage1028() throws IOException {
-      JPEGImageReader reader = createReader();
-      reader.setInput(ImageIO.createImageInputStream(getClassLoaderResource("/jpeg/read-error1028.jpg")));
-      
-      ImageReadParam param = reader.getDefaultReadParam();
-      param.setSourceSubsampling(3, 3, 1, 1);
-      BufferedImage image = reader.read(0, param);
-      assertNotNull(image);
-    }
-    @Test
-    public void testReadImage1027() throws IOException {
-      JPEGImageReader reader = createReader();
-      reader.setInput(ImageIO.createImageInputStream(getClassLoaderResource("/jpeg/read-error1027.jpg")));
-      
-      ImageReadParam param = reader.getDefaultReadParam();
-      param.setSourceSubsampling(3, 3, 2, 2);
-      BufferedImage image = reader.read(0, param);
-      assertNotNull(image);
-    }
-    @Test
-    public void testReadImage1026() throws IOException {
-      JPEGImageReader reader = createReader();
-      reader.setInput(ImageIO.createImageInputStream(getClassLoaderResource("/jpeg/read-error1026.jpg")));
-      
-      ImageReadParam param = reader.getDefaultReadParam();
-      param.setSourceSubsampling(3, 3, 1, 1);
-      BufferedImage image = reader.read(0, param);
-      assertNotNull(image);
-    }
-    @Test
-    public void testReadImage1025() throws IOException {
-      JPEGImageReader reader = createReader();
-      reader.setInput(ImageIO.createImageInputStream(getClassLoaderResource("/jpeg/read-error1025.jpg")));
-      
-      ImageReadParam param = reader.getDefaultReadParam();
-      param.setSourceSubsampling(3, 3, 1, 1);
-      BufferedImage image = reader.read(0, param);
-      assertNotNull(image);
-    }
-    @Test
-    public void testReadImage1024() throws IOException {
-      JPEGImageReader reader = createReader();
-      reader.setInput(ImageIO.createImageInputStream(getClassLoaderResource("/jpeg/read-error1024.jpg")));
-      
-      ImageReadParam param = reader.getDefaultReadParam();
-      param.setSourceSubsampling(3, 3, 1, 1);
-      BufferedImage image = reader.read(0, param);
-      assertNotNull(image);
-    }
 }