Skip to content

Commit e18efc7

Browse files
committed
update format name to match changes in FileIO PR
JuliaIO/FileIO.jl#147 now uses format"OMETIFF" to differentiate ome-tiffs from normal tiffs
1 parent b2de4d6 commit e18efc7

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/loader.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
function load(f::File{format"TIFF"})
1+
function load(f::File{format"OMETIFF"})
22
open(f) do s
33
ret = load(s)
44
end
55
end
66

7-
function load(io::Stream{format"TIFF"})
7+
function load(io::Stream{format"OMETIFF"})
88
if !contains(get(io.filename), ".ome.tif") && !contains(get(io.filename), ".ome.tiff")
99
throw(FileIO.LoaderError("Not an OME TIFF file!"))
1010
end

test/runtests.jl

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ using Base.Test
66
@testset "Small OME-TIFFs" begin
77
@testset "Single Channel OME-TIFF" begin
88
open("testdata/tiffs/single-channel.ome.tif") do f
9-
s = Stream(format"TIFF", f, f.name)
9+
s = Stream(format"OMETIFF", f, f.name)
1010
img = OMETIFF.load(s)
1111
@test size(img) == (167, 439)
1212
end
1313
end
1414
@testset "Multi Channel OME-TIFF" begin
1515
open("testdata/tiffs/multi-channel.ome.tif") do f
16-
s = Stream(format"TIFF", f, f.name)
16+
s = Stream(format"OMETIFF", f, f.name)
1717
img = OMETIFF.load(s)
1818
@test size(img) == (167, 439, 3)
1919
# check channel indexing
@@ -22,7 +22,7 @@ using Base.Test
2222
end
2323
@testset "Multi Channel Time Series OME-TIFF" begin
2424
open("testdata/tiffs/multi-channel-time-series.ome.tif") do f
25-
s = Stream(format"TIFF", f, f.name)
25+
s = Stream(format"OMETIFF", f, f.name)
2626
img = OMETIFF.load(s)
2727
@test size(img) == (167, 439, 3, 7)
2828
# check channel indexing
@@ -33,7 +33,7 @@ using Base.Test
3333
end
3434
@testset "Multi Channel Time Series OME-TIFF" begin
3535
open("testdata/tiffs/multi-channel-z-series.ome.tif") do f
36-
s = Stream(format"TIFF", f, f.name)
36+
s = Stream(format"OMETIFF", f, f.name)
3737
img = OMETIFF.load(s)
3838
@test size(img) == (167, 439, 5, 3)
3939
# check channel indexing

0 commit comments

Comments
 (0)