no_offset_view in Origin (#280)

Author: jishnub

Project.toml

@@ -1,6 +1,6 @@
 name = "OffsetArrays"
 uuid = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
-version = "1.11.0"
+version = "1.11.1"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"

src/OffsetArrays.jl

@@ -210,8 +210,8 @@ for FT in (:OffsetArray, :OffsetVector, :OffsetMatrix)
     @eval @inline $FT(A::AbstractArray, origin::Origin; checkoverflow = true) = $FT(A, origin.index .- first.(axes(A)); checkoverflow = checkoverflow)
 end
 
-(o::Origin)(A::AbstractArray) = OffsetArray(A, o)
-Origin(A::OffsetArray) = Origin(first.(axes(A)))
+(o::Origin)(A::AbstractArray) = OffsetArray(no_offset_view(A), o)
+Origin(A::AbstractArray) = Origin(first.(axes(A)))
 
 # conversion-related methods
 @inline OffsetArray{T}(M::AbstractArray, I...; kw...) where {T} = OffsetArray{T,ndims(M)}(M, I...; kw...)

test/origin.jl

@@ -48,4 +48,31 @@ using OffsetArrays: Origin
         oa = OffsetArray.(a, Origin(0, -1))
         @test get_origin.(oa) == [ (0,-1), (0,-1) ]
     end
+
+    @testset "as a callable" begin
+        a = [1 2; 3 4];
+        @test OffsetArray(a, Origin(2)) == Origin(2)(a)
+        for (index, firstinds) in Any[(1, (1,1)), ((2,3), (2,3))]
+            b = Origin(index)(a)
+            @test first.(axes(b)) == firstinds
+            @test Origin(b) == Origin(firstinds)
+            @test Origin(OffsetArrays.no_offset_view(b)) == Origin(ntuple(_ -> 1, Val(ndims(b))))
+        end
+        # compatibility with other array types
+        @test Origin(Ones(2,2)) == Origin(1,1)
+        @test Origin(SMatrix{2,2,Int,4}(1,2,3,4)) == Origin(1,1)
+    end
+    @testset "display" begin
+        io = IOBuffer()
+        show(io, Origin(1))
+        @test String(take!(io)) == "Origin(1)"
+        show(io, Origin(1, 1))
+        @test String(take!(io)) == "Origin(1, 1)"
+    end
+
+    @testset "avoid overflow (issue #279)" begin
+        A = Origin(typemin(Int)+1)(rand(3,3))
+        B = Origin(typemax(Int)-4)(A)
+        @test first.(axes(B)) == ntuple(_ -> typemax(Int)-4, Val(ndims(B)))
+    end
 end

test/runtests.jl

@@ -2594,25 +2594,6 @@ end
 
 include("origin.jl")
 
-@testset "Origin" begin
-    @testset "as a callable" begin
-        a = [1 2; 3 4];
-        @test OffsetArray(a, Origin(2)) === Origin(2)(a)
-        for (index, firstinds) in Any[(1, (1,1)), ((2,3), (2,3))]
-            b = Origin(index)(a)
-            @test first.(axes(b)) == firstinds
-            @test Origin(b) === Origin(firstinds)
-        end
-    end
-    @testset "display" begin
-        io = IOBuffer()
-        show(io, Origin(1))
-        @test String(take!(io)) == "Origin(1)"
-        show(io, Origin(1, 1))
-        @test String(take!(io)) == "Origin(1, 1)"
-    end
-end
-
 @testset "misc" begin
     @test OffsetArrays._subtractoffset(Base.OneTo(2), 1) isa AbstractUnitRange{Int}
     @test OffsetArrays._subtractoffset(Base.OneTo(2), 1) == 0:1