From cdbad8d2ec3a4098944976d52b9f59188258f75a Mon Sep 17 00:00:00 2001
From: Vincent Privat <vincent.privat@gmail.com>
Date: Sun, 19 Jun 2022 01:27:49 +0200
Subject: [PATCH] Make RandomAccessReader.isMotorolaByteOrder read only.

If the byte order changes during extraction, a new reader is made via WithByteOrder.
That new reader is naturally scoped to the sub-reading operation, and the byte order
does not need to be reverted.
---
 Source/com/drew/imaging/tiff/TiffReader.java  | 16 ++----
 Source/com/drew/lang/ByteArrayReader.java     | 23 ++++++--
 .../com/drew/lang/RandomAccessFileReader.java | 23 ++++++--
 Source/com/drew/lang/RandomAccessReader.java  | 23 +++-----
 .../drew/lang/RandomAccessStreamReader.java   | 37 +++++++++---
 .../com/drew/metadata/avi/AviRiffHandler.java | 13 +++--
 Source/com/drew/metadata/eps/EpsReader.java   |  4 +-
 .../metadata/exif/ExifDescriptorBase.java     |  4 +-
 .../drew/metadata/exif/ExifTiffHandler.java   | 56 +++++++------------
 .../PanasonicMakernoteDirectory.java          |  8 +--
 .../makernotes/SonyTag9050bDirectory.java     |  4 +-
 .../com/drew/metadata/wav/WavRiffHandler.java |  7 ++-
 .../drew/metadata/webp/WebpRiffHandler.java   | 14 ++---
 Tests/com/drew/lang/RandomAccessTestBase.java | 13 ++---
 14 files changed, 135 insertions(+), 110 deletions(-)

diff --git a/Source/com/drew/imaging/tiff/TiffReader.java b/Source/com/drew/imaging/tiff/TiffReader.java
index 46f075683..3fb629adf 100644
--- a/Source/com/drew/imaging/tiff/TiffReader.java
+++ b/Source/com/drew/imaging/tiff/TiffReader.java
@@ -44,7 +44,7 @@ public class TiffReader
      *                                 ignored or recovered from
      * @throws IOException an error occurred while accessing the required data
      */
-    public void processTiff(@NotNull final RandomAccessReader reader,
+    public void processTiff(@NotNull RandomAccessReader reader,
                             @NotNull final TiffHandler handler) throws TiffProcessingException, IOException
     {
         // Standard TIFF
@@ -67,9 +67,9 @@ public void processTiff(@NotNull final RandomAccessReader reader,
         short byteOrderIdentifier = reader.getInt16(0);
 
         if (byteOrderIdentifier == 0x4d4d) { // "MM"
-            reader.setMotorolaByteOrder(true);
+            reader = reader.withByteOrder(true);
         } else if (byteOrderIdentifier == 0x4949) { // "II"
-            reader.setMotorolaByteOrder(false);
+            reader = reader.withByteOrder(false);
         } else {
             throw new TiffProcessingException("Unclear distinction between Motorola/Intel byte ordering: " + byteOrderIdentifier);
         }
@@ -134,7 +134,7 @@ public void processTiff(@NotNull final RandomAccessReader reader,
      * @throws IOException an error occurred while accessing the required data
      */
     public static void processIfd(@NotNull final TiffHandler handler,
-                                  @NotNull final RandomAccessReader reader,
+                                  @NotNull RandomAccessReader reader,
                                   @NotNull final Set<Integer> processedIfdOffsets,
                                   final int ifdOffset,
                                   final boolean isBigTiff) throws IOException
@@ -161,7 +161,6 @@ public static void processIfd(@NotNull final TiffHandler handler,
         //   - 8 bytes: component count
         //   - 8 bytes: inline value, or offset pointer if too large to fit in eight bytes
 
-        Boolean resetByteOrder = null;
         try {
             // Check for directories we've already visited to avoid stack overflows when recursive/cyclic directory structures exist.
             // Note that we track these offsets in the global frame, not the reader's local frame.
@@ -169,7 +168,7 @@ public static void processIfd(@NotNull final TiffHandler handler,
 
             // remember that we've visited this directory so that we don't visit it again later
             if (!processedIfdOffsets.add(globalIfdOffset)) {
-            	return;
+                return;
             }
 
             // Validate IFD offset
@@ -188,9 +187,8 @@ public static void processIfd(@NotNull final TiffHandler handler,
             // Here we detect switched bytes that suggest this problem, and temporarily swap the byte order.
             // This was discussed in GitHub issue #136.
             if (!isBigTiff && dirTagCount > 0xFF && (dirTagCount & 0xFF) == 0) {
-                resetByteOrder = reader.isMotorolaByteOrder();
                 dirTagCount >>= 8;
-                reader.setMotorolaByteOrder(!reader.isMotorolaByteOrder());
+                reader = reader.withByteOrder(!reader.isMotorolaByteOrder());
             }
 
             int dirLength = isBigTiff
@@ -312,8 +310,6 @@ public static void processIfd(@NotNull final TiffHandler handler,
             }
         } finally {
             handler.endingIFD();
-            if (resetByteOrder != null)
-                reader.setMotorolaByteOrder(resetByteOrder);
         }
     }
 
diff --git a/Source/com/drew/lang/ByteArrayReader.java b/Source/com/drew/lang/ByteArrayReader.java
index 6a47d78c0..2e4f88667 100644
--- a/Source/com/drew/lang/ByteArrayReader.java
+++ b/Source/com/drew/lang/ByteArrayReader.java
@@ -51,6 +51,14 @@ public ByteArrayReader(@NotNull byte[] buffer)
     @com.drew.lang.annotations.SuppressWarnings(value = "EI_EXPOSE_REP2", justification = "Design intent")
     public ByteArrayReader(@NotNull byte[] buffer, int baseOffset)
     {
+        this(buffer, baseOffset, true);
+    }
+
+    @SuppressWarnings({ "ConstantConditions" })
+    @com.drew.lang.annotations.SuppressWarnings(value = "EI_EXPOSE_REP2", justification = "Design intent")
+    public ByteArrayReader(@NotNull byte[] buffer, int baseOffset, boolean isMotorolaByteOrder)
+    {
+        super(isMotorolaByteOrder);
         if (buffer == null)
             throw new NullPointerException();
         if (baseOffset < 0)
@@ -61,13 +69,20 @@ public ByteArrayReader(@NotNull byte[] buffer, int baseOffset)
     }
 
     @Override
-    public RandomAccessReader withShiftedBaseOffset(int shift) throws IOException {
+    public ByteArrayReader withByteOrder(boolean isMotorolaByteOrder) {
+        if (isMotorolaByteOrder == isMotorolaByteOrder()) {
+            return this;
+        } else {
+            return new ByteArrayReader(_buffer, _baseOffset, isMotorolaByteOrder);
+        }
+    }
+
+    @Override
+    public ByteArrayReader withShiftedBaseOffset(int shift) throws IOException {
         if (shift == 0) {
             return this;
         } else {
-            RandomAccessReader reader = new ByteArrayReader(_buffer, _baseOffset + shift);
-            reader.setMotorolaByteOrder(isMotorolaByteOrder());
-            return reader;
+            return new ByteArrayReader(_buffer, _baseOffset + shift, isMotorolaByteOrder());
         }
     }
 
diff --git a/Source/com/drew/lang/RandomAccessFileReader.java b/Source/com/drew/lang/RandomAccessFileReader.java
index 513bb0e34..37b2fa6c2 100644
--- a/Source/com/drew/lang/RandomAccessFileReader.java
+++ b/Source/com/drew/lang/RandomAccessFileReader.java
@@ -52,6 +52,14 @@ public RandomAccessFileReader(@NotNull RandomAccessFile file) throws IOException
     @com.drew.lang.annotations.SuppressWarnings(value = "EI_EXPOSE_REP2", justification = "Design intent")
     public RandomAccessFileReader(@NotNull RandomAccessFile file, int baseOffset) throws IOException
     {
+        this(file, baseOffset, true);
+    }
+
+    @SuppressWarnings({ "ConstantConditions" })
+    @com.drew.lang.annotations.SuppressWarnings(value = "EI_EXPOSE_REP2", justification = "Design intent")
+    public RandomAccessFileReader(@NotNull RandomAccessFile file, int baseOffset, boolean isMotorolaByteOrder) throws IOException
+    {
+        super(isMotorolaByteOrder);
         if (file == null)
             throw new NullPointerException();
 
@@ -61,13 +69,20 @@ public RandomAccessFileReader(@NotNull RandomAccessFile file, int baseOffset) th
     }
 
     @Override
-    public RandomAccessReader withShiftedBaseOffset(int shift) throws IOException {
+    public RandomAccessFileReader withByteOrder(boolean isMotorolaByteOrder) throws IOException {
+        if (isMotorolaByteOrder == isMotorolaByteOrder()) {
+            return this;
+        } else {
+            return new RandomAccessFileReader(_file, _baseOffset, isMotorolaByteOrder);
+        }
+    }
+
+    @Override
+    public RandomAccessFileReader withShiftedBaseOffset(int shift) throws IOException {
         if (shift == 0) {
             return this;
         } else {
-            RandomAccessReader reader = new RandomAccessFileReader(_file, _baseOffset + shift);
-            reader.setMotorolaByteOrder(isMotorolaByteOrder());
-            return reader;
+            return new RandomAccessFileReader(_file, _baseOffset + shift, isMotorolaByteOrder());
         }
     }
 
diff --git a/Source/com/drew/lang/RandomAccessReader.java b/Source/com/drew/lang/RandomAccessReader.java
index 8424d6917..338d363bb 100644
--- a/Source/com/drew/lang/RandomAccessReader.java
+++ b/Source/com/drew/lang/RandomAccessReader.java
@@ -45,7 +45,14 @@
  */
 public abstract class RandomAccessReader
 {
-    private boolean _isMotorolaByteOrder = true;
+    private final boolean _isMotorolaByteOrder;
+
+    protected RandomAccessReader(boolean isMotorolaByteOrder)
+    {
+        _isMotorolaByteOrder = isMotorolaByteOrder;
+    }
+
+    public abstract RandomAccessReader withByteOrder(boolean isMotorolaByteOrder) throws IOException;
 
     public abstract RandomAccessReader withShiftedBaseOffset(int shift) throws IOException;
 
@@ -106,20 +113,6 @@ public abstract class RandomAccessReader
      */
     public abstract long getLength() throws IOException;
 
-    /**
-     * Sets the endianness of this reader.
-     * <ul>
-     * <li><code>true</code> for Motorola (or big) endianness (also known as network byte order), with MSB before LSB.</li>
-     * <li><code>false</code> for Intel (or little) endianness, with LSB before MSB.</li>
-     * </ul>
-     *
-     * @param motorolaByteOrder <code>true</code> for Motorola/big endian, <code>false</code> for Intel/little endian
-     */
-    public void setMotorolaByteOrder(boolean motorolaByteOrder)
-    {
-        _isMotorolaByteOrder = motorolaByteOrder;
-    }
-
     /**
      * Gets the endianness of this reader.
      * <ul>
diff --git a/Source/com/drew/lang/RandomAccessStreamReader.java b/Source/com/drew/lang/RandomAccessStreamReader.java
index 3f4aae628..2ecc16b78 100644
--- a/Source/com/drew/lang/RandomAccessStreamReader.java
+++ b/Source/com/drew/lang/RandomAccessStreamReader.java
@@ -55,6 +55,12 @@ public RandomAccessStreamReader(@NotNull InputStream stream, int chunkLength)
 
     public RandomAccessStreamReader(@NotNull InputStream stream, int chunkLength, long streamLength)
     {
+        this(stream, chunkLength, streamLength, true);
+    }
+
+    public RandomAccessStreamReader(@NotNull InputStream stream, int chunkLength, long streamLength, boolean isMotorolaByteOrder)
+    {
+        super(isMotorolaByteOrder);
         if (stream == null)
             throw new NullPointerException();
         if (chunkLength <= 0)
@@ -213,14 +219,21 @@ public byte[] getBytes(int index, int count) throws IOException
         return bytes;
     }
 
+    @Override
+    public RandomAccessReader withByteOrder(boolean isMotorolaByteOrder) {
+        if (isMotorolaByteOrder == isMotorolaByteOrder()) {
+            return this;
+        } else {
+            return new ShiftedRandomAccessStreamReader(this, 0, isMotorolaByteOrder);
+        }
+    }
+
     @Override
     public RandomAccessReader withShiftedBaseOffset(int shift) {
         if (shift == 0) {
             return this;
         } else {
-            RandomAccessReader reader = new ShiftedRandomAccessStreamReader(this, shift);
-            reader.setMotorolaByteOrder(isMotorolaByteOrder());
-            return reader;
+            return new ShiftedRandomAccessStreamReader(this, shift, isMotorolaByteOrder());
         }
     }
 
@@ -229,8 +242,9 @@ private static class ShiftedRandomAccessStreamReader extends RandomAccessReader
         private final RandomAccessStreamReader _baseReader;
         private final int _baseOffset;
 
-        public ShiftedRandomAccessStreamReader(RandomAccessStreamReader baseReader, int baseOffset)
+        public ShiftedRandomAccessStreamReader(RandomAccessStreamReader baseReader, int baseOffset, boolean isMotorolaByteOrder)
         {
+            super(isMotorolaByteOrder);
             if (baseOffset < 0)
                 throw new IllegalArgumentException("Must be zero or greater.");
 
@@ -239,13 +253,20 @@ public ShiftedRandomAccessStreamReader(RandomAccessStreamReader baseReader, int
         }
 
         @Override
-        public RandomAccessReader withShiftedBaseOffset(int shift) {
+        public ShiftedRandomAccessStreamReader withByteOrder(boolean isMotorolaByteOrder) throws IOException {
+            if (isMotorolaByteOrder == isMotorolaByteOrder()) {
+                return this;
+            } else {
+                return new ShiftedRandomAccessStreamReader(_baseReader, _baseOffset, isMotorolaByteOrder);
+            }
+        }
+
+        @Override
+        public ShiftedRandomAccessStreamReader withShiftedBaseOffset(int shift) {
             if (shift == 0) {
                 return this;
             } else {
-                RandomAccessReader reader = new ShiftedRandomAccessStreamReader(_baseReader, _baseOffset + shift);
-                reader.setMotorolaByteOrder(isMotorolaByteOrder());
-                return reader;
+                return new ShiftedRandomAccessStreamReader(_baseReader, _baseOffset + shift, isMotorolaByteOrder());
             }
         }
 
diff --git a/Source/com/drew/metadata/avi/AviRiffHandler.java b/Source/com/drew/metadata/avi/AviRiffHandler.java
index 49e7ad1ee..b0a96c08c 100644
--- a/Source/com/drew/metadata/avi/AviRiffHandler.java
+++ b/Source/com/drew/metadata/avi/AviRiffHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 Drew Noakes and contributors
+ * Copyright 2002-2022 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 
 import com.drew.imaging.riff.RiffHandler;
 import com.drew.lang.ByteArrayReader;
+import com.drew.lang.RandomAccessReader;
 import com.drew.lang.annotations.NotNull;
 import com.drew.metadata.Metadata;
 
@@ -54,11 +55,13 @@ public AviRiffHandler(@NotNull Metadata metadata)
         metadata.addDirectory(_directory);
     }
 
+    @Override
     public boolean shouldAcceptRiffIdentifier(@NotNull String identifier)
     {
         return identifier.equals(AviDirectory.FORMAT);
     }
 
+    @Override
     public boolean shouldAcceptChunk(@NotNull String fourCC)
     {
         return fourCC.equals(AviDirectory.CHUNK_STREAM_HEADER)
@@ -66,6 +69,7 @@ public boolean shouldAcceptChunk(@NotNull String fourCC)
             || fourCC.equals(AviDirectory.CHUNK_DATETIME_ORIGINAL);
     }
 
+    @Override
     public boolean shouldAcceptList(@NotNull String fourCC)
     {
         return fourCC.equals(AviDirectory.LIST_HEADER)
@@ -73,12 +77,12 @@ public boolean shouldAcceptList(@NotNull String fourCC)
             || fourCC.equals(AviDirectory.FORMAT);
     }
 
+    @Override
     public void processChunk(@NotNull String fourCC, @NotNull byte[] payload)
     {
         try {
             if (fourCC.equals(AviDirectory.CHUNK_STREAM_HEADER)) {
-                ByteArrayReader reader = new ByteArrayReader(payload);
-                reader.setMotorolaByteOrder(false);
+                RandomAccessReader reader = new ByteArrayReader(payload, 0, false);
 
                 String fccType = new String(reader.getBytes(0, 4));
                 String fccHandler = new String(reader.getBytes(4, 4));
@@ -114,8 +118,7 @@ public void processChunk(@NotNull String fourCC, @NotNull byte[] payload)
                     }
                 }
             } else if (fourCC.equals(AviDirectory.CHUNK_MAIN_HEADER)) {
-                ByteArrayReader reader = new ByteArrayReader(payload);
-                reader.setMotorolaByteOrder(false);
+                RandomAccessReader reader = new ByteArrayReader(payload, 0, false);
 
 //                int dwMicroSecPerFrame = reader.getInt32(0);
 //                int dwMaxBytesPerSec = reader.getInt32(4);
diff --git a/Source/com/drew/metadata/eps/EpsReader.java b/Source/com/drew/metadata/eps/EpsReader.java
index d816253dd..a1083cd10 100644
--- a/Source/com/drew/metadata/eps/EpsReader.java
+++ b/Source/com/drew/metadata/eps/EpsReader.java
@@ -53,7 +53,7 @@ public class EpsReader
      */
     public void extract(@NotNull final InputStream inputStream, @NotNull final Metadata metadata) throws IOException
     {
-        RandomAccessStreamReader reader = new RandomAccessStreamReader(inputStream);
+        RandomAccessReader reader = new RandomAccessStreamReader(inputStream);
         EpsDirectory directory = new EpsDirectory();
         metadata.addDirectory(directory);
 
@@ -64,7 +64,7 @@ public void extract(@NotNull final InputStream inputStream, @NotNull final Metad
          */
         switch (reader.getInt32(0)) {
             case 0xC5D0D3C6:
-                reader.setMotorolaByteOrder(false);
+                reader = reader.withByteOrder(false);
                 int postScriptOffset = reader.getInt32(4);
                 int postScriptLength = reader.getInt32(8);
                 int wmfOffset = reader.getInt32(12);
diff --git a/Source/com/drew/metadata/exif/ExifDescriptorBase.java b/Source/com/drew/metadata/exif/ExifDescriptorBase.java
index 2b2499c25..f21866826 100644
--- a/Source/com/drew/metadata/exif/ExifDescriptorBase.java
+++ b/Source/com/drew/metadata/exif/ExifDescriptorBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 Drew Noakes and contributors
+ * Copyright 2002-2022 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -1158,7 +1158,7 @@ private int[] decodeCfaPattern(int tagType)
             if (end > values.length) // sanity check in case of byte order problems; calculated 'end' should be <= length of the values
             {
                 // try swapping byte order (I have seen this order different than in EXIF)
-                reader.setMotorolaByteOrder(!reader.isMotorolaByteOrder());
+                reader = reader.withByteOrder(!reader.isMotorolaByteOrder());
                 item0 = reader.getInt16(0);
                 item1 = reader.getInt16(2);
 
diff --git a/Source/com/drew/metadata/exif/ExifTiffHandler.java b/Source/com/drew/metadata/exif/ExifTiffHandler.java
index d423383b4..9f36f88fd 100644
--- a/Source/com/drew/metadata/exif/ExifTiffHandler.java
+++ b/Source/com/drew/metadata/exif/ExifTiffHandler.java
@@ -435,8 +435,6 @@ private boolean processMakernote(final int makernoteOffset,
         final String firstTenChars    = getReaderString(reader, makernoteOffset, 10);
         final String firstTwelveChars = getReaderString(reader, makernoteOffset, 12);
 
-        boolean byteOrderBefore = reader.isMotorolaByteOrder();
-
         if ("OLYMP\0".equals(firstSixChars) || "EPSON".equals(firstFiveChars) || "AGFA".equals(firstFourChars)) {
             // Olympus Makernote
             // Epson and Agfa use Olympus makernote standard: http://www.ozhiker.com/electronics/pjmt/jpeg_info/
@@ -491,19 +489,17 @@ private boolean processMakernote(final int makernoteOffset,
             pushDirectory(SonyType1MakernoteDirectory.class);
             TiffReader.processIfd(this, reader, processedIfdOffsets, makernoteOffset, isBigTiff);
         } else if ("SEMC MS\u0000\u0000\u0000\u0000\u0000".equals(firstTwelveChars)) {
-            // force MM for this directory
-            reader.setMotorolaByteOrder(true);
+            // force Motorola byte order for this directory
             // skip 12 byte header + 2 for "MM" + 6
             pushDirectory(SonyType6MakernoteDirectory.class);
-            TiffReader.processIfd(this, reader, processedIfdOffsets, makernoteOffset + 20, isBigTiff);
+            TiffReader.processIfd(this, reader.withByteOrder(true), processedIfdOffsets, makernoteOffset + 20, isBigTiff);
         } else if ("SIGMA\u0000\u0000\u0000".equals(firstEightChars) || "FOVEON\u0000\u0000".equals(firstEightChars)) {
             pushDirectory(SigmaMakernoteDirectory.class);
             TiffReader.processIfd(this, reader, processedIfdOffsets, makernoteOffset + 10, isBigTiff);
         } else if ("KDK".equals(firstThreeChars)) {
-            reader.setMotorolaByteOrder(firstSevenChars.equals("KDK INFO"));
             KodakMakernoteDirectory directory = new KodakMakernoteDirectory();
             _metadata.addDirectory(directory);
-            processKodakMakernote(directory, makernoteOffset, reader);
+            processKodakMakernote(directory, makernoteOffset, reader.withByteOrder(firstSevenChars.equals("KDK INFO")));
         } else if ("Canon".equalsIgnoreCase(cameraMake)) {
             pushDirectory(CanonMakernoteDirectory.class);
             TiffReader.processIfd(this, reader, processedIfdOffsets, makernoteOffset, isBigTiff);
@@ -516,22 +512,18 @@ private boolean processMakernote(final int makernoteOffset,
                 TiffReader.processIfd(this, reader, processedIfdOffsets, makernoteOffset, isBigTiff);
             }
         } else if ("FUJIFILM".equals(firstEightChars) || "Fujifilm".equalsIgnoreCase(cameraMake)) {
-            // Note that this also applies to certain Leica cameras, such as the Digilux-4.3
-            reader.setMotorolaByteOrder(false);
-            // the 4 bytes after "FUJIFILM" in the makernote point to the start of the makernote
-            // IFD, though the offset is relative to the start of the makernote, not the TIFF
-            // header (like everywhere else)
-            RandomAccessReader makernoteReader = reader.withShiftedBaseOffset(makernoteOffset);
+            // Note that this also applies to certain Leica cameras, such as the Digilux-4.3.
+            // The 4 bytes after "FUJIFILM" in the makernote point to the start of the makernote
+            // IFD, though the offset is relative to the start of the makernote, not the TIFF header
+            RandomAccessReader makernoteReader = reader.withShiftedBaseOffset(makernoteOffset).withByteOrder(false);
             int ifdStart = makernoteReader.getInt32(8);
             pushDirectory(FujifilmMakernoteDirectory.class);
-            TiffReader.processIfd(this, reader.withShiftedBaseOffset(makernoteOffset), processedIfdOffsets, ifdStart, isBigTiff);
+            TiffReader.processIfd(this, makernoteReader, processedIfdOffsets, ifdStart, isBigTiff);
         } else if ("KYOCERA".equals(firstSevenChars)) {
             // http://www.ozhiker.com/electronics/pjmt/jpeg_info/kyocera_mn.html
             pushDirectory(KyoceraMakernoteDirectory.class);
             TiffReader.processIfd(this, reader, processedIfdOffsets, makernoteOffset + 22, isBigTiff);
         } else if ("LEICA".equals(firstFiveChars)) {
-            reader.setMotorolaByteOrder(false);
-
             // used by the X1/X2/X VARIO/T
             // (X1 starts with "LEICA\0\x01\0", Make is "LEICA CAMERA AG")
             // (X2 starts with "LEICA\0\x05\0", Make is "LEICA CAMERA AG")
@@ -546,14 +538,14 @@ private boolean processMakernote(final int makernoteOffset,
                 "LEICA\0\u0007\0".equals(firstEightChars))
             {
                 pushDirectory(LeicaType5MakernoteDirectory.class);
-                TiffReader.processIfd(this, reader.withShiftedBaseOffset(makernoteOffset), processedIfdOffsets, 8, isBigTiff);
+                TiffReader.processIfd(this, reader.withByteOrder(false).withShiftedBaseOffset(makernoteOffset), processedIfdOffsets, 8, isBigTiff);
             } else if ("Leica Camera AG".equals(cameraMake)) {
                 pushDirectory(LeicaMakernoteDirectory.class);
-                TiffReader.processIfd(this, reader, processedIfdOffsets, makernoteOffset + 8, isBigTiff);
+                TiffReader.processIfd(this, reader.withByteOrder(false), processedIfdOffsets, makernoteOffset + 8, isBigTiff);
             } else if ("LEICA".equals(cameraMake)) {
                 // Some Leica cameras use Panasonic makernote tags
                 pushDirectory(PanasonicMakernoteDirectory.class);
-                TiffReader.processIfd(this, reader, processedIfdOffsets, makernoteOffset + 8, isBigTiff);
+                TiffReader.processIfd(this, reader.withByteOrder(false), processedIfdOffsets, makernoteOffset + 8, isBigTiff);
             } else {
                 return false;
             }
@@ -598,17 +590,13 @@ private boolean processMakernote(final int makernoteOffset,
                 return false;
             } else if (firstFiveChars.equalsIgnoreCase("Ricoh")) {
                 // Always in Motorola byte order
-                reader.setMotorolaByteOrder(true);
                 pushDirectory(RicohMakernoteDirectory.class);
-                TiffReader.processIfd(this, reader.withShiftedBaseOffset(makernoteOffset), processedIfdOffsets, 8, isBigTiff);
+                TiffReader.processIfd(this, reader.withByteOrder(true).withShiftedBaseOffset(makernoteOffset), processedIfdOffsets, 8, isBigTiff);
             }
         } else if (firstTenChars.equals("Apple iOS\0")) {
             // Always in Motorola byte order
-            boolean orderBefore = reader.isMotorolaByteOrder();
-            reader.setMotorolaByteOrder(true);
             pushDirectory(AppleMakernoteDirectory.class);
-            TiffReader.processIfd(this, reader.withShiftedBaseOffset(makernoteOffset), processedIfdOffsets, 14, isBigTiff);
-            reader.setMotorolaByteOrder(orderBefore);
+            TiffReader.processIfd(this, reader.withByteOrder(true).withShiftedBaseOffset(makernoteOffset), processedIfdOffsets, 14, isBigTiff);
         } else if (reader.getUInt16(makernoteOffset) == ReconyxHyperFireMakernoteDirectory.MAKERNOTE_VERSION) {
             ReconyxHyperFireMakernoteDirectory directory = new ReconyxHyperFireMakernoteDirectory();
             _metadata.addDirectory(directory);
@@ -631,7 +619,6 @@ private boolean processMakernote(final int makernoteOffset,
             return false;
         }
 
-        reader.setMotorolaByteOrder(byteOrderBefore);
         return true;
     }
 
@@ -666,8 +653,6 @@ private static boolean handlePrintIM(@NotNull final Directory directory, final i
      */
     private static void processPrintIM(@NotNull final PrintIMDirectory directory, final int tagValueOffset, @NotNull final RandomAccessReader reader, final int byteCount) throws IOException
     {
-        Boolean resetByteOrder = null;
-
         if (byteCount == 0) {
             directory.addError("Empty PrintIM data");
             return;
@@ -685,14 +670,14 @@ private static void processPrintIM(@NotNull final PrintIMDirectory directory, fi
             return;
         }
 
+        RandomAccessReader localReader = reader;
         // check size of PrintIM block
-        int num = reader.getUInt16(tagValueOffset + 14);
+        int num = localReader.getUInt16(tagValueOffset + 14);
 
         if (byteCount < 16 + num * 6) {
             // size is too big, maybe byte ordering is wrong
-            resetByteOrder = reader.isMotorolaByteOrder();
-            reader.setMotorolaByteOrder(!reader.isMotorolaByteOrder());
-            num = reader.getUInt16(tagValueOffset + 14);
+            localReader = reader.withByteOrder(!reader.isMotorolaByteOrder());
+            num = localReader.getUInt16(tagValueOffset + 14);
             if (byteCount < 16 + num * 6) {
                 directory.addError("Bad PrintIM size");
                 return;
@@ -705,14 +690,11 @@ private static void processPrintIM(@NotNull final PrintIMDirectory directory, fi
 
         for (int n = 0; n < num; n++) {
             int pos = tagValueOffset + 16 + n * 6;
-            int tag = reader.getUInt16(pos);
-            long val = reader.getUInt32(pos + 2);
+            int tag = localReader.getUInt16(pos);
+            long val = localReader.getUInt32(pos + 2);
 
             directory.setObject(tag, val);
         }
-
-        if (resetByteOrder != null)
-            reader.setMotorolaByteOrder(resetByteOrder);
     }
 
     private static void processKodakMakernote(@NotNull final KodakMakernoteDirectory directory, final int tagValueOffset, @NotNull final RandomAccessReader reader)
diff --git a/Source/com/drew/metadata/exif/makernotes/PanasonicMakernoteDirectory.java b/Source/com/drew/metadata/exif/makernotes/PanasonicMakernoteDirectory.java
index ce17249c5..e3dfd5eee 100644
--- a/Source/com/drew/metadata/exif/makernotes/PanasonicMakernoteDirectory.java
+++ b/Source/com/drew/metadata/exif/makernotes/PanasonicMakernoteDirectory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 Drew Noakes and contributors
+ * Copyright 2002-2022 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -637,8 +637,7 @@ public Face[] getDetectedFaces()
         if (bytes==null)
             return null;
 
-        RandomAccessReader reader = new ByteArrayReader(bytes);
-        reader.setMotorolaByteOrder(false);
+        RandomAccessReader reader = new ByteArrayReader(bytes, 0, false);
 
         try {
             int faceCount = reader.getUInt16(0);
@@ -668,8 +667,7 @@ public Face[] getRecognizedFaces()
         if (bytes == null)
             return null;
 
-        RandomAccessReader reader = new ByteArrayReader(bytes);
-        reader.setMotorolaByteOrder(false);
+        RandomAccessReader reader = new ByteArrayReader(bytes, 0, false);
 
         try {
             int faceCount = reader.getUInt16(0);
diff --git a/Source/com/drew/metadata/exif/makernotes/SonyTag9050bDirectory.java b/Source/com/drew/metadata/exif/makernotes/SonyTag9050bDirectory.java
index 74f74d49f..814d1cdd7 100644
--- a/Source/com/drew/metadata/exif/makernotes/SonyTag9050bDirectory.java
+++ b/Source/com/drew/metadata/exif/makernotes/SonyTag9050bDirectory.java
@@ -1,6 +1,7 @@
 package com.drew.metadata.exif.makernotes;
 
 import com.drew.lang.ByteArrayReader;
+import com.drew.lang.RandomAccessReader;
 import com.drew.lang.annotations.NotNull;
 
 import java.io.IOException;
@@ -72,8 +73,7 @@ public static SonyTag9050bDirectory read(byte[] bytes)
             // First, decipher the bytes
             decipherInPlace(bytes);
 
-            ByteArrayReader reader = new ByteArrayReader(bytes);
-            reader.setMotorolaByteOrder(false);
+            ByteArrayReader reader = new ByteArrayReader(bytes).withByteOrder(false);
 
             // Shutter
             int offset = TAG_SHUTTER;
diff --git a/Source/com/drew/metadata/wav/WavRiffHandler.java b/Source/com/drew/metadata/wav/WavRiffHandler.java
index 6f73e1e8f..73dd1c695 100644
--- a/Source/com/drew/metadata/wav/WavRiffHandler.java
+++ b/Source/com/drew/metadata/wav/WavRiffHandler.java
@@ -2,6 +2,7 @@
 
 import com.drew.imaging.riff.RiffHandler;
 import com.drew.lang.ByteArrayReader;
+import com.drew.lang.RandomAccessReader;
 import com.drew.lang.annotations.NotNull;
 import com.drew.metadata.Metadata;
 import com.drew.metadata.MetadataException;
@@ -39,11 +40,13 @@ public WavRiffHandler(@NotNull Metadata metadata)
         metadata.addDirectory(_directory);
     }
 
+    @Override
     public boolean shouldAcceptRiffIdentifier(@NotNull String identifier)
     {
         return identifier.equals(WavDirectory.FORMAT);
     }
 
+    @Override
     public boolean shouldAcceptChunk(@NotNull String fourCC)
     {
         return fourCC.equals(WavDirectory.CHUNK_FORMAT)
@@ -63,12 +66,12 @@ public boolean shouldAcceptList(@NotNull String fourCC)
         }
     }
 
+    @Override
     public void processChunk(@NotNull String fourCC, @NotNull byte[] payload)
     {
         try {
             if (fourCC.equals(WavDirectory.CHUNK_FORMAT)) {
-                ByteArrayReader reader = new ByteArrayReader(payload);
-                reader.setMotorolaByteOrder(false);
+                ByteArrayReader reader = new ByteArrayReader(payload, 0, false);
                 int wFormatTag = reader.getInt16(0);
                 int wChannels = reader.getInt16(2);
                 int dwSamplesPerSec = reader.getInt32(4);
diff --git a/Source/com/drew/metadata/webp/WebpRiffHandler.java b/Source/com/drew/metadata/webp/WebpRiffHandler.java
index d1ac57c16..501d6d7d4 100644
--- a/Source/com/drew/metadata/webp/WebpRiffHandler.java
+++ b/Source/com/drew/metadata/webp/WebpRiffHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 Drew Noakes and contributors
+ * Copyright 2002-2022 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -53,11 +53,13 @@ public WebpRiffHandler(@NotNull Metadata metadata)
         _metadata = metadata;
     }
 
+    @Override
     public boolean shouldAcceptRiffIdentifier(@NotNull String identifier)
     {
         return identifier.equals(WebpDirectory.FORMAT);
     }
 
+    @Override
     public boolean shouldAcceptChunk(@NotNull String fourCC)
     {
         return fourCC.equals(WebpDirectory.CHUNK_VP8X)
@@ -74,6 +76,7 @@ public boolean shouldAcceptList(@NotNull String fourCC)
         return false;
     }
 
+    @Override
     public void processChunk(@NotNull String fourCC, @NotNull byte[] payload)
     {
         WebpDirectory directory = new WebpDirectory();
@@ -89,8 +92,7 @@ public void processChunk(@NotNull String fourCC, @NotNull byte[] payload)
         } else if (fourCC.equals(WebpDirectory.CHUNK_XMP)) {
             new XmpReader().extract(payload, _metadata);
         } else if (fourCC.equals(WebpDirectory.CHUNK_VP8X) && payload.length == 10) {
-            RandomAccessReader reader = new ByteArrayReader(payload);
-            reader.setMotorolaByteOrder(false);
+            RandomAccessReader reader = new ByteArrayReader(payload, 0, false);
 
             try {
                 // Flags
@@ -116,8 +118,7 @@ public void processChunk(@NotNull String fourCC, @NotNull byte[] payload)
                 directory.addError(e.getMessage());
             }
         } else if (fourCC.equals(WebpDirectory.CHUNK_VP8L) && payload.length > 4) {
-            RandomAccessReader reader = new ByteArrayReader(payload);
-            reader.setMotorolaByteOrder(false);
+            RandomAccessReader reader = new ByteArrayReader(payload, 0, false);
 
             try {
                 // https://developers.google.com/speed/webp/docs/webp_lossless_bitstream_specification#2_riff_header
@@ -143,8 +144,7 @@ public void processChunk(@NotNull String fourCC, @NotNull byte[] payload)
                 directory.addError(e.getMessage());
             }
         } else if (fourCC.equals(WebpDirectory.CHUNK_VP8) && payload.length > 9) {
-            RandomAccessReader reader = new ByteArrayReader(payload);
-            reader.setMotorolaByteOrder(false);
+            RandomAccessReader reader = new ByteArrayReader(payload, 0, false);
 
             try {
                 // https://tools.ietf.org/html/rfc6386#section-9.1
diff --git a/Tests/com/drew/lang/RandomAccessTestBase.java b/Tests/com/drew/lang/RandomAccessTestBase.java
index 68ee674a7..d7a69e92c 100644
--- a/Tests/com/drew/lang/RandomAccessTestBase.java
+++ b/Tests/com/drew/lang/RandomAccessTestBase.java
@@ -94,7 +94,7 @@ public void testGetInt16() throws Exception
         assertEquals((short)0x017F, reader.getInt16(1));
         assertEquals((short)0x7FFF, reader.getInt16(2));
 
-        reader.setMotorolaByteOrder(false);
+        reader = reader.withByteOrder(false);
 
         assertEquals((short)0x0100, reader.getInt16(0));
         assertEquals((short)0x7F01, reader.getInt16(1));
@@ -111,7 +111,7 @@ public void testGetUInt16() throws Exception
         assertEquals(0x017F, reader.getUInt16(1));
         assertEquals(0x7FFF, reader.getUInt16(2));
 
-        reader.setMotorolaByteOrder(false);
+        reader = reader.withByteOrder(false);
 
         assertEquals(0x0100, reader.getUInt16(0));
         assertEquals(0x7F01, reader.getUInt16(1));
@@ -143,7 +143,7 @@ public void testGetInt32() throws Exception
         assertEquals(0x7FFF0203, reader.getInt32(2));
         assertEquals(0xFF020304, reader.getInt32(3));
 
-        reader.setMotorolaByteOrder(false);
+        reader = reader.withByteOrder(false);
 
         assertEquals(0xFF7F0100, reader.getInt32(0));
         assertEquals(0x02FF7F01, reader.getInt32(1));
@@ -164,7 +164,7 @@ public void testGetUInt32() throws Exception
         assertEquals(0x7FFF0203L, reader.getUInt32(2));
         assertEquals(0xFF020304L, reader.getUInt32(3));
 
-        reader.setMotorolaByteOrder(false);
+        reader = reader.withByteOrder(false);
 
         assertEquals(4286513408L, reader.getUInt32(0));
         assertEquals(0x02FF7F01L, reader.getUInt32(1));
@@ -193,7 +193,7 @@ public void testGetInt64() throws IOException
         assertEquals(0x0001020304050607L, reader.getInt64(0));
         assertEquals(0x01020304050607FFL, reader.getInt64(1));
 
-        reader.setMotorolaByteOrder(false);
+        reader = reader.withByteOrder(false);
 
         assertEquals(0x0706050403020100L, reader.getInt64(0));
         assertEquals(0xFF07060504030201L, reader.getInt64(1));
@@ -342,8 +342,7 @@ public void testGetInt8EOF() throws Exception
     @Test
     public void testWithShiftedBaseOffset() throws Exception
     {
-        RandomAccessReader reader = createReader(new byte[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9});
-        reader.setMotorolaByteOrder(false);
+        RandomAccessReader reader = createReader(new byte[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}).withByteOrder(false);
 
         assertEquals(10, reader.getLength());
         assertEquals(0, reader.getByte(0));