Compat update for String rename

JuliaImages · May 15, 2016 · 4c6fca4 · 4c6fca4
1 parent 614051f
commit 4c6fca4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/ImageView.jl b/src/ImageView.jl
@@ -14,7 +14,7 @@ using Cairo
 using Tk
 using Colors
 using Images
-using Compat
+using Compat; import Compat.String
 
 import Base: parent, show, delete!, empty!
 

diff --git a/src/annotations.jl b/src/annotations.jl
@@ -48,13 +48,13 @@ type AnnotationText
     t::Float64
     string::AbstractString
     color::Color
-    fontfamily::ASCIIString
-    fontoptions::ASCIIString
+    fontfamily::String
+    fontoptions::String
     fontsize::Integer
-    fontdesc::ASCIIString
+    fontdesc::String
     angle::Float64
-    halign::ASCIIString
-    valign::ASCIIString
+    halign::String
+    valign::String
     markup::Bool
     scale::Bool
 end

diff --git a/src/contrast.jl b/src/contrast.jl
@@ -6,7 +6,7 @@ using Tk
 using Winston
 using Images
 import Colors.Fractional
-using Compat
+using Compat; import Compat.String
 
 type ContrastSettings
     min

diff --git a/test/test4d.jl b/test/test4d.jl
@@ -1,5 +1,5 @@
 import Images
-using Compat
+using Compat; import Compat.String
 
 # Create a cone in 3d that changes color over time
 sz = [201, 301, 31]