Merge pull request #150 from JuliaIO/yyc/0.7

Fix most of depwarn and error on 0.7

Author: timholy

src/query.jl

@@ -89,7 +89,8 @@ function add_format{sym}(fmt::Type{DataFormat{sym}}, magic::Union{Tuple,Abstract
 end
 
 # for multiple magic bytes
-function add_format{sym, T <: Vector{UInt8}, N}(fmt::Type{DataFormat{sym}}, magics::NTuple{N, T}, extension)
+function add_format{sym, T <: Vector{UInt8}}(fmt::Type{DataFormat{sym}},
+                                             magics::Tuple{T,Vararg{T}}, extension)
     haskey(sym2info, sym) && error("format ", fmt, " is already registered")
     magics = map(canonicalize_magic, magics)
     for magic in magics

src/registry.jl

@@ -151,7 +151,7 @@ add_format(format"FLAC","fLaC",".flac",[:FLAC])
 const tiff_magic = (UInt8[0x4d,0x4d,0x00,0x2a], UInt8[0x4d,0x4d,0x00,0x2b], UInt8[0x49,0x49,0x2a,0x00],UInt8[0x49,0x49,0x2b,0x00])
 function detecttiff(io)
     seekstart(io)
-    magic = read(io, UInt8, 4)
+    magic = read!(io, Vector{UInt8}(4))
     # do any of the first 4 bytes match any of the 4 possible combinations of tiff magics
     return any(map(x->all(magic .== x), tiff_magic))
 end
@@ -218,8 +218,8 @@ function detect_stlascii(io)
 end
 
 function detect_stlbinary(io)
-    const size_header = 80+sizeof(UInt32)
-    const size_triangleblock = (4*3*sizeof(Float32)) + sizeof(UInt16)
+    size_header = 80+sizeof(UInt32)
+    size_triangleblock = (4*3*sizeof(Float32)) + sizeof(UInt16)
 
     position(io) != 0 && (seekstart(io); return false)
     seekend(io)

test/loadsave.jl

@@ -169,11 +169,11 @@ import FileIO: File, @format_str, Stream, stream, skipmagic
 
 load(f::File{format"AmbigExt1"}) = open(f) do io
     skipmagic(io)
-    readstring(stream(io))
+    read(stream(io), String)
 end
 load(f::File{format"AmbigExt2"}) = open(f) do io
     skipmagic(io)
-    readstring(stream(io))
+    read(stream(io), String)
 end
 
 save(f::File{format"AmbigExt1"}, testdata) = open(f, "w") do io