Skip to content

Commit

Permalink
Eliminate duplicate types already defined in ColorTypes.jl (#734)
Browse files Browse the repository at this point in the history
  • Loading branch information
juliohm authored and timholy committed Aug 26, 2018
1 parent 9dd1777 commit 7578c1c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 17 deletions.
3 changes: 2 additions & 1 deletion REQUIRE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
20 changes: 4 additions & 16 deletions src/Images.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -193,14 +191,6 @@ export # types
# algorithms
backdiffx,
backdiffy,
dilate,
erode,
opening,
closing,
tophat,
bothat,
morphogradient,
morpholaplace,
forwarddiffx,
forwarddiffy,
imcorner,
Expand Down Expand Up @@ -238,8 +228,6 @@ export # types
imstretch,
cliphist,


# imthresh,
label_components,
label_components!,
component_boxes,
Expand Down

0 comments on commit 7578c1c

Please sign in to comment.