Skip to content

Commit

Permalink
Remove LASzip_jll for now
Browse files Browse the repository at this point in the history
Signed-off-by: BenCurran98 <b.curran@fugro.com>
  • Loading branch information
BenCurran98 committed Apr 30, 2024
1 parent 50b6e20 commit a6e911f
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 656 deletions.
1 change: 0 additions & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
FixedPointNumbers = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
LASzip_jll = "8372b9c3-1e34-5cc3-bfab-1a98e101de11"
PackedReadWrite = "5d6e2f64-5c87-46b6-9ff4-cf810e78676d"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
Expand Down
3 changes: 0 additions & 3 deletions src/LAS.jl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ using Dates
using DocStringExtensions
using FileIO
using FixedPointNumbers
using LASzip_jll
using PackedReadWrite
import Pkg.Types: read_project
using Printf
Expand All @@ -26,8 +25,6 @@ include("header.jl")
include("parse_points.jl")
include("records.jl")
include("dataset.jl")
include("laz_interface.jl")
include("laszip.jl")
include("read.jl")
include("write.jl")

Expand Down
3 changes: 2 additions & 1 deletion src/dataset.jl
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,7 @@ end
Construct an extra bytes VLR with a field name `col_name` and data type `T`
"""
function construct_extra_bytes_vlr(col_name::Symbol, ::Type{T}) where T
extra_bytes = ExtraBytes(0x00, String(col_name), zero(T), zero(T), zero(T), zero(T), zero(T), "Custom Column $(col_name)")
@assert length(String(col_name)) 32 "Custom column name $(col_name) too long! Must be ≤ 32 Bytes, got $(length(String(col_name))) Bytes"
extra_bytes = ExtraBytes(0x00, String(col_name), zero(T), zero(T), zero(T), zero(T), zero(T), "$(col_name)")
LasVariableLengthRecord(LAS_SPEC_USER_ID, ID_EXTRABYTES, String(col_name), extra_bytes)
end
6 changes: 3 additions & 3 deletions src/georef.jl
Original file line number Diff line number Diff line change
Expand Up @@ -198,12 +198,12 @@ end

@register_vlr_type OGC_WKT LAS_PROJ_USER_ID ID_OGCWKTTAG

function read_vlr_data(io::IO, ::Type{OGC_WKT}, nb::Int)
function read_vlr_data(io::IO, ::Type{OGC_WKT}, nb::Integer)
wkt_str = readstring(io, nb)
return OGC_WKT(wkt_str, nb)
return OGC_WKT(wkt_str, Int(nb))
end

function OGC_WKT(wkt_string::String, nb::Int = sizeof(wkt_string))
function OGC_WKT(wkt_string::String, nb::Integer = sizeof(wkt_string))
# try and parse the wkt string
src = missing
unit = vert_unit = missing
Expand Down
Loading

0 comments on commit a6e911f

Please sign in to comment.