Check on iteration.

Author: evetion

src/dataset.jl

@@ -3,6 +3,7 @@ struct Dataset{Version}
     filehandle::Ptr{Cvoid}
     header::LazHeader  # this enables iterating without unsafe_load everytime
     point::Ptr{RawPoint}
+    am::CoordinateTransformations.AffineMap
 end
 
 function Base.show(io::IO, ds::Dataset{Version}) where {Version}
@@ -36,20 +37,23 @@ function open(f::AbstractString)
     point_ptr = Ref{Ptr{RawPoint}}()
     @check laszip_reader[] laszip_get_point_pointer(laszip_reader[], point_ptr)
 
+    # Get coordinate transformation
+    am = CoordinateTransformations.AffineMap(Diagonal(SA_F64[header.x_scale_factor 0 0; 0 header.y_scale_factor 0; 0 0 header.z_scale_factor]), SA_F64[header.x_offset, header.y_offset, header.z_offset])
+
     header.point_data_format > 3 && @warn "The LAS 1.4+ format is not fully supported yet."
-    Dataset{header.point_data_format}(f, laszip_reader[], header, point_ptr[])
+    Dataset{header.point_data_format}(f, laszip_reader[], header, point_ptr[], am)
 end
 
 function CoordinateTransformations.AffineMap(ds::Dataset)
-    CoordinateTransformations.AffineMap(Diagonal(SA_F64[ds.header.x_scale_factor 0 0; 0 ds.header.y_scale_factor 0; 0 0 ds.header.z_scale_factor]), SA_F64[ds.header.x_offset, ds.header.y_offset, ds.header.z_offset])
+    ds.am
 end
 
 """Iteration of LAZ file."""
 function Base.iterate(ds::Dataset, state::Int)
     if state >= length(ds)
         return nothing
     else
-        laszip_read_point(ds.filehandle)
+        @check ds.filehandle laszip_read_point(ds.filehandle)
         return eltype(ds)(unsafe_load(ds.point), CoordinateTransformations.AffineMap(ds)), state + 1
     end
 end
@@ -59,25 +63,26 @@ function Base.iterate(ds::Dataset)
     if length(ds) == 0
         nothing
     else
-        laszip_seek_point(ds.filehandle, 0)
-        laszip_read_point(ds.filehandle)
+        @check ds.filehandle laszip_seek_point(ds.filehandle, 0)
+        @check ds.filehandle laszip_read_point(ds.filehandle)
         eltype(ds)(unsafe_load(ds.point), CoordinateTransformations.AffineMap(ds)), 1
     end
 end
 
 function Base.getindex(ds::Dataset, i::Integer)
     (1 <= i <= length(ds)) || throw(BoundsError(ds, i))
-    laszip_seek_point(ds.filehandle, i - 1)
-    laszip_read_point(ds.filehandle)
+    @check ds.filehandle laszip_seek_point(ds.filehandle, i - 1)
+    @check ds.filehandle laszip_read_point(ds.filehandle)
     eltype(ds)(unsafe_load(ds.point), CoordinateTransformations.AffineMap(ds))
 end
 
 function Base.getindex(ds::Dataset, i::UnitRange{<:Integer})
     out = Vector{eltype(ds)}(undef, length(i))
+    isempty(i) && return out
     (1 <= i[begin] <= length(ds)) && (1 <= i[end] <= length(ds)) || throw(BoundsError(ds, i))
-    laszip_seek_point(ds.filehandle, i[begin] - 1)
+    @check ds.filehandle laszip_seek_point(ds.filehandle, i[begin] - 1)
     for I in eachindex(out)
-        laszip_read_point(ds.filehandle)
+        @check ds.filehandle laszip_read_point(ds.filehandle)
         out[I] = eltype(ds)(unsafe_load(ds.point), CoordinateTransformations.AffineMap(ds))
     end
     out
@@ -87,8 +92,8 @@ function Base.getindex(ds::Dataset, i::StepRange{<:Integer,<:Integer})
     out = Vector{eltype(ds)}(undef, length(i))
     (1 <= i[begin] <= length(ds)) && (1 <= i[end] <= length(ds)) || throw(BoundsError(ds, i))
     for I in eachindex(out)
-        laszip_seek_point(ds.filehandle, i[I] - 1)
-        laszip_read_point(ds.filehandle)
+        @check ds.filehandle laszip_seek_point(ds.filehandle, i[I] - 1)
+        @check ds.filehandle laszip_read_point(ds.filehandle)
         out[I] = eltype(ds)(unsafe_load(ds.point), CoordinateTransformations.AffineMap(ds))
     end
     out

src/laszip_h.jl

@@ -13,7 +13,7 @@ Base.@kwdef mutable struct LazVLR
     record_id::UInt16 = UInt16(0)
     record_length_after_header::UInt16 = UInt16(0)
     description::NTuple{32,UInt8} = ntuple(i -> UInt8(0x0), 32)
-    data::Ptr{UInt8} = pointer("")
+    data::Ptr{UInt8} = C_NULL
 end
 
 Base.convert(::Type{LasIO.LasVariableLengthRecord}, vlr::LazVLR) =
@@ -68,10 +68,10 @@ Base.@kwdef mutable struct LazHeader
     extended_number_of_points_by_return::NTuple{15,UInt64} = ntuple(i -> UInt64(0), 15)
     # extended_number_of_points_by_return::Array{UInt64, 1} = Array{UInt64, 1}(zeros(0, 15))
     user_data_in_header_size::UInt32 = UInt32(0)
-    user_data_in_header::Ptr{UInt8} = pointer("")
-    vlrs::Ptr{LazVLR} = pointer("")
+    user_data_in_header::Ptr{UInt8} = C_NULL
+    vlrs::Ptr{LazVLR} = C_NULL
     user_data_after_header_size::UInt32 = UInt32(0)
-    user_data_after_header::Ptr{UInt8} = pointer("")
+    user_data_after_header::Ptr{UInt8} = C_NULL
 end
 
 function bounds(h::LazHeader)
@@ -126,7 +126,7 @@ Base.@kwdef mutable struct RawPoint
     rgb::NTuple{4,UInt16} = ntuple(i -> UInt16(0), 4)
     wave_packet::NTuple{29,UInt8} = ntuple(i -> UInt8(0), 29)
     num_extra_bytes::Int32 = Int32(0)
-    extra_bytes::Ptr{UInt8} = pointer("")
+    extra_bytes::Ptr{UInt8} = C_NULL
 end
 
 const classes = (created=0,

test/test_convert.jl

@@ -51,7 +51,7 @@ using LazIO
         rgb=ntuple(i -> UInt16(65535), 4),
         wave_packet=ntuple(i -> UInt8(255), 29),
         num_extra_bytes=Int32(24244),
-        extra_bytes=pointer("")
+        extra_bytes=C_NULL
     )
 
     las0 = convert(LazIO.LasPoint0, lazp)

test/testio.jl

@@ -46,6 +46,7 @@ end
     @inferred ds[1:2]
     @inferred ds[1:2:5]
     @inferred collect(ds)
+    @time collect(ds)
     @test LazIO.boundingbox(ds) == (xmin=1.44e6, ymin=375000.03, zmin=832.1800000000001, xmax=1.44499996e6, ymax=379999.99, zmax=972.6700000000001)
     @test first(ds).return_number == 0x00
     @test first(ds).number_of_returns == 0x00