update to use new Graphics package

REQUIRE

@@ -5,3 +5,4 @@ BinDeps
 @osx Homebrew
 SIUnits
 Zlib
+Graphics 0.1

doc/function_reference.md

@@ -708,7 +708,7 @@ The returned image is non-zero only at maximal edge locations.
 
 `border` is any of the boundary conditions specified in `padarray`.
 
-In addition to the maximal edge image, the `_subpix` versions of these functions also return an estimate of the subpixel location of each local maxima, as a 2D array or image of `Base.Graphics.Point` objects.
+In addition to the maximal edge image, the `_subpix` versions of these functions also return an estimate of the subpixel location of each local maxima, as a 2D array or image of `Graphics.Point` objects.
 Additionally, each local maxima is adjusted to the estimated value at the subpixel location.
 
 Currently, the `_nonmaxsup` functions are identical to the first two function calls, except that they also accept additional keyword arguments.

src/Images.jl

@@ -1,7 +1,6 @@
 module Images
 
 import Base.Order: Ordering, ForwardOrdering, ReverseOrdering
-import Base.Graphics: width, height
 import Base: atan2, clamp, convert, copy, copy!, ctranspose, delete!, done, eltype,
              fft, float32, float64, get, getindex, haskey, hypot, ifft, length, map, map!,
              maximum, mimewritable, minimum, next, ndims, one, parent, permutedims, reinterpret,
@@ -11,6 +10,7 @@ import Base: atan2, clamp, convert, copy, copy!, ctranspose, delete!, done, elty
 
 using Color, FixedPointNumbers, Compat
 import Color: Fractional
+import Graphics: width, height
 import FixedPointNumbers: ufixed8, ufixed10, ufixed12, ufixed14, ufixed16
 
 using Base.Cartesian

src/edge.jl

@@ -203,7 +203,7 @@ thin_edges_subpix{T}(img::AbstractArray{T,2}, gradientangles::AbstractArray, bor
 #                  compatbility (Thanks to Chris Pudney)
 # June      2014 - Ported (and modified significantly) to Julia (Kevin Squire)
 
-import Base.Graphics.Point
+import Graphics.Point
 
 if !applicable(zero, Point)
     import Base.zero

test/edge.jl

@@ -228,8 +228,8 @@ function nms_test_horiz_vert(img, which)
 
     @assert test_axis1 ? all(t[:,[1,2,4,5]] .== 0) : all(t[[1,2,4,5],:] .== 0)
     @assert test_axis1 ? all(t[:,3]   .== peakval) : all(t[3,:]   .== peakval)
-    @assert test_axis1 ? all(s[:,[1,2,4,5]] .== zero(Base.Graphics.Point)) :
-                         all(s[[1,2,4,5],:] .== zero(Base.Graphics.Point))
+    @assert test_axis1 ? all(s[:,[1,2,4,5]] .== zero(Graphics.Point)) :
+                         all(s[[1,2,4,5],:] .== zero(Graphics.Point))
 
     if transposed
         if which == :horizontal