From a15d54c92c4fdd437f046c521d5a54b37873f594 Mon Sep 17 00:00:00 2001
From: Harald Kuhr <harald.kuhr@gmail.com>
Date: Fri, 16 Oct 2020 18:17:51 +0200
Subject: [PATCH] Code clean-up.

(cherry picked from commit d88f27b251562151a041fce2a35264c28d7e338f)
---
 .../imageio/plugins/jpeg/JPEGImageReader.java         | 11 ++---------
 1 file changed, 2 insertions(+), 9 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 3ca27287..6fb038a4 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
@@ -123,8 +123,6 @@ public final class JPEGImageReader extends ImageReaderBase {
     private ImageReader thumbnailReader;
     private List<ThumbnailReader> thumbnails;
 
-    private JPEGImage10MetadataCleaner metadataCleaner;
-
     /** Cached list of JPEG segments we filter from the underlying stream */
     private List<Segment> segments;
 
@@ -158,8 +156,6 @@ public final class JPEGImageReader extends ImageReaderBase {
             thumbnailReader.reset();
         }
 
-        metadataCleaner = null;
-
         installListeners();
     }
 
@@ -469,15 +465,12 @@ public final class JPEGImageReader extends ImageReaderBase {
         }
 
         // We'll need a read param
-        Rectangle origSourceRegion;
         if (param == null) {
             param = delegate.getDefaultReadParam();
-            origSourceRegion = null;
-        }
-        else {
-            origSourceRegion = param.getSourceRegion();
         }
 
+        Rectangle origSourceRegion = param.getSourceRegion();
+
         Rectangle srcRegion = new Rectangle();
         Rectangle dstRegion = new Rectangle();
         computeRegions(param, origWidth, origHeight, image, srcRegion, dstRegion);