Skip to content

Commit 6722f25

Browse files
authored
Merge pull request #5 from JuliaGeometry/sjk/travis05
[travis] test on 0.5
2 parents a4c37c0 + 21904f4 commit 6722f25

File tree

5 files changed

+8
-5
lines changed

5 files changed

+8
-5
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ language: julia
33
os:
44
- linux
55
julia:
6-
- nightly
76
- 0.4
7+
- 0.5
8+
- nightly
89
notifications:
910
email: false
1011
# uncomment the following lines to override the default test script

REQUIRE

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
julia 0.4
2-
GeometryTypes
2+
GeometryTypes 0.1.6
3+
Compat 0.8.6

src/Meshing.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ VERSION >= v"0.4.0-dev+6521" && __precompile__()
33
module Meshing
44

55
using GeometryTypes
6+
using Compat
67

78
include("marching_tetrahedra.jl")
89
include("marching_cubes.jl")

src/marching_cubes.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ Tetrahedra guarentees a manifold mesh.
288288
"""
289289
function marching_cubes{ST,FT,M<:AbstractMesh}(sdf::SignedDistanceField{3,ST,FT},
290290
iso=0.0,
291-
MT::Type{M}=HomogenousMesh{Point{3,Float64},Face{3,Int,0}})
291+
MT::Type{M}=HomogenousMesh)
292292
nx, ny, nz = size(sdf)
293293
h = HyperRectangle(sdf)
294294
w = widths(h)

src/marching_tetrahedra.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,14 +293,14 @@ end
293293
isosurface(lsf,isoval) = isosurface(lsf,isoval, convert(eltype(lsf), 0.001))
294294

295295

296-
function call{MT <: AbstractMesh, T}(::Type{MT}, volume::Array{T, 3}, iso_val::Real, eps_val=0.001)
296+
@compat function (::Type{MT}){MT <: AbstractMesh, T}(volume::Array{T, 3}, iso_val::Real, eps_val=0.001)
297297
iso_val = convert(T, iso_val)
298298
eps_val = convert(T, eps_val)
299299
vts, fcs = isosurface(volume, iso_val, eps_val)
300300
MT(vts, fcs)
301301
end
302302

303-
function call{MT <: AbstractMesh}(::Type{MT}, df::SignedDistanceField, eps_val=0.001)
303+
@compat function (::Type{MT}){MT <: AbstractMesh}(df::SignedDistanceField, eps_val=0.001)
304304
vts, fcs = isosurface(df.data, 0.0, eps_val)
305305
MT(vts, fcs)
306306
end

0 commit comments

Comments
 (0)