Remove Colors and FixedPointNumbers (#133)

johnnychen94 · timholy · commit 6bf231ce061e · 2019-12-26T06:30:02.000-06:00
* remove Colors and FixedPointNumbers

* restrict lower bound of ImageCore to v0.8.1
diff --git a/Project.toml b/Project.toml
@@ -5,12 +5,10 @@ version = "0.6.7"
 [deps]
 CatIndices = "aafaddc9-749c-510e-ac4f-586e18779b91"
 ColorVectorSpace = "c3611d14-8923-5661-9e6a-0046d554d3a4"
-Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
 ComputationalResources = "ed09eef8-17a6-5b46-8889-db040fac31e3"
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
 FFTViews = "4f61f5a4-77b1-5117-aa51-3ab5ef4ef0cd"
 FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
-FixedPointNumbers = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
 ImageCore = "a09fc81d-aa75-5fe9-8630-4744c3626534"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 MappedArrays = "dbb5928d-eab1-5f90-85c2-b9b0edb7c900"
@@ -23,13 +21,11 @@ TiledIteration = "06e1c1a7-607b-532d-9fad-de7d9aa2abac"
 [compat]
 CatIndices = "0.2"
 ColorVectorSpace = "0.6, 0.7, 0.8"
-Colors = "0.9"
 ComputationalResources = "0.3"
 DataStructures = "0.14, 0.15, 0.16, 0.17"
 FFTViews = "0.3"
 FFTW = "0.3, 1"
-FixedPointNumbers = "0.5, 0.6"
-ImageCore = "0.8"
+ImageCore = "0.8.1"
 MappedArrays = "0.2"
 OffsetArrays = "0.10, 0.11"
 Requires = "0.5, 1.0"
diff --git a/src/ImageFiltering.jl b/src/ImageFiltering.jl
@@ -1,7 +1,7 @@
 module ImageFiltering
 
 using FFTW
-using Colors, FixedPointNumbers, ImageCore, MappedArrays, FFTViews, OffsetArrays, StaticArrays, ComputationalResources, TiledIteration
+using ImageCore, MappedArrays, FFTViews, OffsetArrays, StaticArrays, ComputationalResources, TiledIteration
 using Statistics, LinearAlgebra
 using ColorVectorSpace  # for filtering RGB arrays
 using Base: Indices, tail, fill_to_length, @pure, depwarn, @propagate_inbounds
diff --git a/src/utils.jl b/src/utils.jl
@@ -79,7 +79,7 @@ end
 
 ffteltype(::Type{T}) where T<:Union{Float32,Float64} = T
 ffteltype(::Type{Float16}) = Float32
-ffteltype(::Type{T}) where T<:Normed = ffteltype(FixedPointNumbers.floattype(T))
+ffteltype(::Type{T}) where T<:Normed = ffteltype(floattype(T))
 ffteltype(::Type{T}) where T = Float64
 
 dummyind(::Base.OneTo) = Base.OneTo(1)
diff --git a/test/2d.jl b/test/2d.jl
@@ -1,4 +1,4 @@
-using ImageFiltering, ImageCore, OffsetArrays, Colors, FFTViews, ColorVectorSpace, ComputationalResources, FixedPointNumbers
+using ImageFiltering, ImageCore, OffsetArrays, FFTViews, ColorVectorSpace, ComputationalResources
 using LinearAlgebra
 using Test
 using ImageFiltering: IdentityUnitRange
diff --git a/test/basic.jl b/test/basic.jl
@@ -1,4 +1,4 @@
-using ImageFiltering, OffsetArrays, Logging, ImageMetadata, FixedPointNumbers, Test
+using ImageFiltering, ImageCore, OffsetArrays, Logging, ImageMetadata, Test
 import AxisArrays
 using AxisArrays: AxisArray, Axis
 
diff --git a/test/border.jl b/test/border.jl
@@ -1,4 +1,4 @@
-using ImageFiltering, OffsetArrays, Colors, FixedPointNumbers, Random
+using ImageFiltering, OffsetArrays, ImageCore, Random
 using Test
 
 @testset "Border" begin
diff --git a/test/gradient.jl b/test/gradient.jl
@@ -1,4 +1,4 @@
-using ImageFiltering, Colors, ColorVectorSpace, FixedPointNumbers
+using ImageFiltering, ImageCore, ColorVectorSpace
 using Test
 
 @testset "gradient" begin
diff --git a/test/specialty.jl b/test/specialty.jl
@@ -1,4 +1,4 @@
-using ImageFiltering, ImageCore, OffsetArrays, Colors, FixedPointNumbers
+using ImageFiltering, ImageCore, OffsetArrays
 using Statistics, Test
 using ImageFiltering: IdentityUnitRange
 
diff --git a/test/triggs.jl b/test/triggs.jl
@@ -1,4 +1,4 @@
-using ImageFiltering, Colors, ComputationalResources, FixedPointNumbers
+using ImageFiltering, ImageCore, ComputationalResources
 using LinearAlgebra
 using Test
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using ImageFiltering, ImageCore, OffsetArrays, Colors, FFTViews, ColorVectorSpace, ComputationalResources, FixedPointNumbers`
	`1`	`+using ImageFiltering, ImageCore, OffsetArrays, FFTViews, ColorVectorSpace, ComputationalResources`
`2`	`2`	`using LinearAlgebra`
`3`	`3`	`using Test`
`4`	`4`	`using ImageFiltering: IdentityUnitRange`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using ImageFiltering, OffsetArrays, Logging, ImageMetadata, FixedPointNumbers, Test`
	`1`	`+using ImageFiltering, ImageCore, OffsetArrays, Logging, ImageMetadata, Test`
`2`	`2`	`import AxisArrays`
`3`	`3`	`using AxisArrays: AxisArray, Axis`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using ImageFiltering, OffsetArrays, Colors, FixedPointNumbers, Random`
	`1`	`+using ImageFiltering, OffsetArrays, ImageCore, Random`
`2`	`2`	`using Test`
`3`	`3`
`4`	`4`	`@testset "Border" begin`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using ImageFiltering, Colors, ColorVectorSpace, FixedPointNumbers`
	`1`	`+using ImageFiltering, ImageCore, ColorVectorSpace`
`2`	`2`	`using Test`
`3`	`3`
`4`	`4`	`@testset "gradient" begin`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using ImageFiltering, Colors, ComputationalResources, FixedPointNumbers`
	`1`	`+using ImageFiltering, ImageCore, ComputationalResources`
`2`	`2`	`using LinearAlgebra`
`3`	`3`	`using Test`
`4`	`4`