Pass context to endingIfd

drewnoakes · Jun 19, 2022 · 4cd33e7 · 4cd33e7
1 parent b86673f
commit 4cd33e7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Source/com/drew/imaging/tiff/TiffHandler.java b/Source/com/drew/imaging/tiff/TiffHandler.java
@@ -49,7 +49,7 @@ public interface TiffHandler
     boolean tryEnterSubIfd(int tagId);
     boolean hasFollowerIfd();
 
-    void endingIFD();
+    void endingIFD(TiffReaderContext context);
 
     @Nullable
     Long tryCustomProcessFormat(int tagId, int formatCode, long componentCount);

diff --git a/Source/com/drew/imaging/tiff/TiffReader.java b/Source/com/drew/imaging/tiff/TiffReader.java
@@ -301,7 +301,7 @@ public static void processIfd(@NotNull final TiffHandler handler,
                 }
             }
         } finally {
-            handler.endingIFD();
+            handler.endingIFD(context);
         }
     }
 

diff --git a/Source/com/drew/metadata/tiff/DirectoryTiffHandler.java b/Source/com/drew/metadata/tiff/DirectoryTiffHandler.java
@@ -21,6 +21,7 @@
 package com.drew.metadata.tiff;
 
 import com.drew.imaging.tiff.TiffHandler;
+import com.drew.imaging.tiff.TiffReaderContext;
 import com.drew.lang.Rational;
 import com.drew.lang.annotations.NotNull;
 import com.drew.lang.annotations.Nullable;
@@ -51,7 +52,7 @@ protected DirectoryTiffHandler(Metadata metadata, @Nullable Directory parentDire
     }
 
     @Override
-    public void endingIFD()
+    public void endingIFD(TiffReaderContext context)
     {
         _currentDirectory = _directoryStack.empty() ? null : _directoryStack.pop();
     }
-Original file line number
+Diff line change
@@ Expand Up @@
                     }
                 }
             } finally {
-                handler.endingIFD();
+                handler.endingIFD(context);
             }
         }
@@ Expand Down @@