Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Common/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ CodecZstd = "6b39b394-51ab-5f42-8807-6242bab2b4c2"
ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
DBInterface = "a10d1c49-ce27-4219-8d33-6db1a4562965"
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
DataToolkitCore = "e209d0c3-e863-446f-9b45-de6ca9730756"
DataToolkitCore = "caac3e55-418c-402e-a061-64d454aa8f4f"
DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
Expand Down
4 changes: 2 additions & 2 deletions Common/ext/TiffImagesExt.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module TiffImagesExt
using TiffImages
import DataToolkitCommon: _read_tiff, _write_tiff

_read_tiff(from::IO) =
TiffImages.load(from)
_read_tiff(from::IO; kwargs...) =
TiffImages.load(from; kwargs...)

_write_tiff(dest::IO, info::AbstractMatrix) =
TiffImages.save(dest, info)
Expand Down
12 changes: 10 additions & 2 deletions Common/src/transformers/saveload/tiff.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ function _write_tiff end # Implemented in `../../../ext/TiffImagesExt.jl`

function load(loader::DataLoader{:tiff}, from::IO, ::Type{AbstractMatrix})
@require TiffImages
invokelatest(_read_tiff, from)
verbose = @getparam loader."verbose"::Bool false
lazyio = @getparam loader."lazyio"::Bool false
mmap = @getparam loader."mmap"::Bool false
invokelatest(_read_tiff, from; verbose, lazyio, mmap)
end

function save(writer::DataWriter{:tiff}, dest::IO, info::AbstractMatrix)
Expand All @@ -22,7 +25,9 @@ Encode and decode Tiff files

# Input/output

The `tiff` driver expects data to be provided via `IO`.
The `tiff` driver expects data to be provided via `IOStream`. You can set
`verbose`, `lazyio`, and `mmap` as described in
[TiffImages.jl's documentation](https://tamasnagy.com/TiffImages.jl/stable/lib/public/#TiffImages.load).

It will parse to a `TiffImages.AbstractTIFF`.

Expand All @@ -35,5 +40,8 @@ It will parse to a `TiffImages.AbstractTIFF`.
```toml
[[someimage.loader]]
driver = "tiff"
verbose = false # default
lazyio = false # default
mmap = false # default
```
"""
24 changes: 24 additions & 0 deletions Common/test/Data.toml
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,30 @@ uuid = "66a5fc67-cee1-4481-b9f2-e750be2897ff"
[[lighthouse-tiff.loader]]
driver = "tiff"

[[lighthouse-tiff-mmap]]
uuid = "c7443fa2-8b9f-4a4c-821f-7815ba31716b"

[[lighthouse-tiff-mmap.storage]]
driver = "web"
checksum = "k12:56893a4e9f184ea70602710f34040467"
url = "https://raw.githubusercontent.com/tecosaur/DataToolkitTestAssets/master/data/lighthouse.tiff"

[[lighthouse-tiff-mmap.loader]]
driver = "tiff"
mmap = true

[[lighthouse-tiff-lazyio]]
uuid = "baee9117-a3ef-43af-885e-c73776498643"

[[lighthouse-tiff-lazyio.storage]]
driver = "web"
checksum = "k12:56893a4e9f184ea70602710f34040467"
url = "https://raw.githubusercontent.com/tecosaur/DataToolkitTestAssets/master/data/lighthouse.tiff"

[[lighthouse-tiff-lazyio.loader]]
driver = "tiff"
lazyio = true

[[lighthouse-webp]]
uuid = "62ef89d8-2d69-4ca1-a13b-d24e5e56995b"

Expand Down
2 changes: 2 additions & 0 deletions Common/test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ end
end
@testset "tiff" begin
@test read(dataset("lighthouse-tiff"), AbstractMatrix) isa AbstractMatrix
@test read(dataset("lighthouse-tiff-mmap"), AbstractMatrix) isa AbstractMatrix
@test read(dataset("lighthouse-tiff-lazyio"), AbstractMatrix) isa AbstractMatrix
end
@testset "toml" begin
@test sort([k => length(v) for (k, v) in read(dataset("sample-toml"))], by=first) ==
Expand Down