Allow merging of IFDs with different offset types. (#69)

* Allow merging of IFDs with different offset types. * add test Co-authored-by: Tamas Nagy <[email protected]>
tlnagy · Nov 5, 2021 · 61d16ec · 61d16ec · tlnagy · Nov 5, 2021
1 parent a1f00c1
commit 61d16ec
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "TiffImages"
 uuid = "731e570b-9d59-4bfa-96dc-6df516fadf69"
 authors = ["Tamas Nagy <[email protected]>"]
-version = "0.5.1"
+version = "0.5.2"
 
 [deps]
 ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"

diff --git a/src/ifds.jl b/src/ifds.jl
@@ -68,7 +68,7 @@ Base.delete!(ifd::IFD, key::TiffTag) = delete!(ifd, UInt16(key))
 Base.delete!(ifd::IFD, key::UInt16) = delete!(ifd.tags, key)
 
 Base.similar(::IFD{O}) where {O <: Unsigned} = IFD(O)
-Base.merge(ifd::IFD{O}, other::IFD{O}) where {O <: Unsigned} = IFD(O, DefaultDict(Vector{Int}, merge(ifd.tags, other.tags)))
+Base.merge(ifd::IFD{O}, other::IFD) where {O <: Unsigned} = IFD(O, DefaultDict(Vector{Int}, merge(ifd.tags, other.tags)))
 
 Base.setindex!(ifd::IFD, value::Tag, key::UInt16) = setindex!(ifd.tags, [value], key)
 Base.setindex!(ifd::IFD, value::Tag, key::TiffTag) = setindex!(ifd, value, UInt16(key))
@@ -248,4 +248,4 @@ function Base.write(tf::TiffFile{O}, ifd::IFD{O}) where {O <: Unsigned}
     seek(tf, ifd_end_pos)
 
     return ifd_end_pos
-end
+end
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -210,3 +210,10 @@ end
 @testset "Interpreting IFD layouts" begin
     include("layouts.jl")
 end
+
+@testset "Issue #69" begin
+    rawarray = Gray.(zeros(10, 10, 2))
+    ifds = [TiffImages.IFD(UInt64), TiffImages.IFD(UInt64)]
+    # test that the constructor can handle small images using 64bit offsets 
+    @test size(TiffImages.DenseTaggedImage(rawarray, ifds)) == size(rawarray)
+end