Skip to content

Commit

Permalink
Rely on ImageCore for FixedPointNumbers&ColorTypes (#174)
Browse files Browse the repository at this point in the history
  • Loading branch information
timholy authored Dec 30, 2019
1 parent c1bc7e8 commit 3a9ea3c
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 10 deletions.
8 changes: 2 additions & 6 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
name = "ImageMagick"
uuid = "6218d12a-5da1-5696-b52f-db25d2ecc6d1"
version = "1.1.0"
version = "1.1.1"

[deps]
ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
FixedPointNumbers = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
ImageCore = "a09fc81d-aa75-5fe9-8630-4744c3626534"
ImageMagick_jll = "c73af94c-d91f-53ed-93a7-00f77d67a9d7"
InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
Expand All @@ -14,10 +12,8 @@ Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"

[compat]
ColorTypes = "0.8"
FileIO = "1"
FixedPointNumbers = "0.6.1"
ImageCore = "0.8"
ImageCore = "0.8.1"
ImageMagick_jll = "6.9.10"
julia = "1.3"

Expand Down
1 change: 0 additions & 1 deletion src/ImageMagick.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
module ImageMagick

using FixedPointNumbers, ColorTypes
using FileIO: DataFormat, @format_str, Stream, File, filename, stream
using InteractiveUtils: subtypes
using ImageCore
Expand Down
2 changes: 1 addition & 1 deletion test/constructed_images.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using ImageMagick, ColorTypes, FixedPointNumbers, IndirectArrays, FileIO, OffsetArrays
using ImageMagick, IndirectArrays, FileIO, OffsetArrays
using ImageShow # for show(io, ::MIME, img) & ImageMeta
using Test
using ImageCore
Expand Down
4 changes: 2 additions & 2 deletions test/readremote.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using ImageMagick
using FileIO, Colors, FixedPointNumbers, ZipFile
using FileIO, ImageCore, ZipFile
using Test

workdir = joinpath(tempdir(), "Images")
Expand Down Expand Up @@ -65,7 +65,7 @@ end
file = getfile("rose.png")
img = ImageMagick.load(file)
@test ImageMagick.metadata(file) == (reverse(size(img)), RGB{N0f8})
# Mac reader reports RGB4, imagemagick reports RGB
# Mac reader reports RGBX, imagemagick reports RGB
@test ndims(img) == 2
@test eltype(img) == RGB{N0f8}
outname = joinpath(writedir, "rose.tiff")
Expand Down

2 comments on commit 3a9ea3c

@timholy
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register()

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/7324

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if Julia TagBot is installed, or can be done manually through the github interface, or via:

git tag -a v1.1.1 -m "<description of version>" 3a9ea3cf790d9fb071c32b18bd4871def2a8246b
git push origin v1.1.1

Please sign in to comment.