diff --git a/REQUIRE b/REQUIRE index 762fcbb4..466f1bb5 100644 --- a/REQUIRE +++ b/REQUIRE @@ -1,12 +1,13 @@ julia 0.7 Reexport Colors 0.7.0 +ColorTypes 0.7.4 ColorVectorSpace 0.2 FixedPointNumbers 0.3.0 ImageCore 0.6.0 ImageTransformations 0.2.2 ImageFiltering -ImageMorphology +ImageMorphology 0.1.1 ImageDistances 0.0.2 AxisArrays ImageAxes diff --git a/src/Images.jl b/src/Images.jl index f46e05f1..a92cc82c 100644 --- a/src/Images.jl +++ b/src/Images.jl @@ -32,16 +32,14 @@ using Reexport using ColorVectorSpace, FileIO export load, save import Colors: Fractional, red, green, blue -const AbstractGray{T} = Color{T,1} -const TransparentRGB{C<:AbstractRGB,T} = TransparentColor{C,T,4} -const TransparentGray{C<:AbstractGray,T} = TransparentColor{C,T,2} -const NumberLike = Union{Number,AbstractGray} -const RealLike = Union{Real,AbstractGray} import Graphics import Graphics: width, height, Point using StatsBase # TODO: eliminate this dependency using IndirectArrays, MappedArrays -# using Compat.TypeUtils + +# TODO: can we get rid of these definitions? +const NumberLike = Union{Number,AbstractGray} +const RealLike = Union{Real,AbstractGray} const is_little_endian = ENDIAN_BOM == 0x04030201 @@ -193,14 +191,6 @@ export # types # algorithms backdiffx, backdiffy, - dilate, - erode, - opening, - closing, - tophat, - bothat, - morphogradient, - morpholaplace, forwarddiffx, forwarddiffy, imcorner, @@ -238,8 +228,6 @@ export # types imstretch, cliphist, - -# imthresh, label_components, label_components!, component_boxes,