Merge branch 'sd/binaryprovider' of github.com:JuliaGeometry/Clipper.jl into sd/binaryprovider

Author: SimonDanisch

.gitignore

@@ -11,5 +11,5 @@ test/config
 *.exp
 *.o
 *.so
-deps/usr/
+deps/usr
 deps/deps.jl

.travis.yml

@@ -2,6 +2,7 @@ language: julia
 os:
   - linux
   - osx
+
 julia:
   - 0.6
   - 0.7
@@ -13,3 +14,11 @@ matrix:
 notifications:
   email: false
 sudo: false
+=======
+git:
+  depth: 99999999
+## uncomment the following lines to allow failures on nightly julia
+## (tests will run but not make your overall status red)
+matrix:
+ allow_failures:
+ - julia: nightly

appveyor.yml

@@ -3,6 +3,12 @@ environment:
   - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
   - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
 
+## uncomment the following lines to allow failures on nightly julia
+## (tests will run but not make your overall status red)
+matrix:
+ allow_failures:
+ - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
+
 branches:
   only:
     - master
@@ -14,13 +20,13 @@ notifications:
     on_build_failure: false
     on_build_status_changed: false
 
-os: Visual Studio 2015
-platform:
-  - x64
-
 install:
   - ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
-  - call "c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64
+# If there's a newer build queued for the same PR, cancel this one
+  - ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
+        https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
+        Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
+        throw "There are newer queued builds for this pull request, failing early." }
 # Download most recent Julia Windows binary
   - ps: (new-object net.webclient).DownloadFile(
         $env:JULIA_URL,
@@ -35,4 +41,4 @@ build_script:
       Pkg.clone(pwd(), \"Clipper\"); Pkg.build(\"Clipper\")"
 
 test_script:
-  - C:\projects\julia\bin\julia --check-bounds=yes -e "Pkg.test(\"Clipper\")"
+  - C:\projects\julia\bin\julia -e "Pkg.test(\"Clipper\")"

src/Clipper.jl

@@ -34,36 +34,35 @@ module Clipper
     @enum EndType EndTypeClosedPolygon=0 EndTypeClosedLine=1 EndTypeOpenSquare=2 EndTypeOpenRound=3 EndTypeOpenButt=4
 
 
-
     immutable IntPoint
         X::Int64
         Y::Int64
     end
 
-    type PolyNode{T}
+    mutable struct PolyNode{T}
         contour::Vector{T}
         hole::Bool
         open::Bool
         children::Vector{PolyNode{T}}
         parent::PolyNode{T}
-        (::Type{PolyNode{T}}){T}(a,b,c) = new{T}(a,b,c)
-        function (::Type{PolyNode{T}}){T}(a,b,c,d)
+        PolyNode{T}(a,b,c) where {T} = new{T}(a,b,c)
+        function PolyNode{T}(a,b,c,d) where T
             p = new{T}(a,b,c,d)
             p.parent = p
             return p
         end
-        (::Type{PolyNode{T}}){T}(a,b,c,d,e) = new{T}(a,b,c,d,e)
+        PolyNode{T}(a,b,c,d,e) where {T} = new{T}(a,b,c,d,e)
     end
 
-    Base.convert{T}(::Type{PolyNode{T}}, x::PolyNode{T}) = x
-    function Base.convert{S,T}(::Type{PolyNode{S}}, x::PolyNode{T})
+    Base.convert(::Type{PolyNode{T}}, x::PolyNode{T}) where {T} = x
+    function Base.convert(::Type{PolyNode{S}}, x::PolyNode{T}) where {S,T}
         parent(x) !== x && error("must convert a top-level PolyNode (i.e. a PolyTree).")
 
         pn = PolyNode{S}(convert(Vector{S}, contour(x)), ishole(x), isopen(x))
         pn.children = [PolyNode(y,pn) for y in children(x)]
         pn.parent = pn
     end
-    function PolyNode{S}(x::PolyNode, parent::PolyNode{S})
+    function PolyNode(x::PolyNode, parent::PolyNode{S}) where S
         pn = PolyNode{S}(contour(x), ishole(x), isopen(x))
         pn.children = [PolyNode(y,pn) for y in children(x)]
         pn.parent = parent
@@ -147,13 +146,12 @@ module Clipper
     #==============================================================#
   	# Clipper object
   	#==============================================================#
-    type Clip
+    mutable struct Clip
         clipper_ptr::Ptr{Void}
 
         function Clip()
             clipper = new(ccall((:get_clipper, cclipper), Ptr{Void}, ()))
             finalizer(clipper, c -> ccall((:delete_clipper, cclipper), Void, (Ptr{Void},), c.clipper_ptr))
-
             clipper
         end
     end
@@ -216,7 +214,7 @@ module Clipper
         ccall((:clear, cclipper), Void, (Ptr{Void},), c.clipper_ptr)
     end
 
-    type IntRect
+    mutable struct IntRect
         left::Int64
         top::Int64
         right::Int64
@@ -230,7 +228,7 @@ module Clipper
     #==============================================================#
   	# ClipperOffset object
   	#==============================================================#
-    type ClipperOffset
+    mutable struct ClipperOffset
         clipper_ptr::Ptr{Void}
 
         function ClipperOffset(miterLimit::Float64 = 2.0, roundPrecision::Float64 = 0.25)
@@ -271,7 +269,6 @@ module Clipper
 
     function execute(c::ClipperOffset, delta::Float64)
         polys = Vector{Vector{IntPoint}}()
-
         result = ccall((:execute_offset, cclipper), Void, (Ptr{Void}, Cdouble, Any, Ptr{Void}),
                         c.clipper_ptr,
                         delta,

test/clipper_offset_test.jl

@@ -53,9 +53,5 @@ test("Offset") do
 
     poly = execute(c, 1.0)
 
-    if VERSION >= v"0.6.0-dev.2505" # julia PR #20288
-      @test string(poly) == "Array{Clipper.IntPoint,1}[Clipper.IntPoint[[1,2], [-1,2], [-1,-1], [1,-1]]]"
-    else
-      @test string(poly) == "Array{Clipper.IntPoint,1}[Clipper.IntPoint[[1,2],[-1,2],[-1,-1],[1,-1]]]"
-    end
+    @test poly == [[IntPoint(1,2), IntPoint(-1,2), IntPoint(-1,-1), IntPoint(1,-1)]]
 end

test/clipper_test.jl

@@ -238,7 +238,7 @@ test("Point in polygon") do
     @test pointinpolygon(IntPoint(-1,-1), path1) == 0
 end
 
-immutable IntPoint2
+struct IntPoint2
     X::Int64
     Y::Int64
 end