Merge pull request #388 from Larbino1/master

Update registry.jl
JuliaIO · Mar 16, 2024 · b7259eb · b7259eb
2 parents d30fbd7 + 9ffb6e7
commit b7259eb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/registry.jl b/src/registry.jl
@@ -461,9 +461,7 @@ function detect_stlbinary(io)
     number_of_triangle_blocks = read(io, UInt32)
      #1 normal, 3 vertices in Float32 + attrib count, usually 0
     len != (number_of_triangle_blocks*size_triangleblock)+size_header && (seekstart(io); return false)
-    skip(io, number_of_triangle_blocks*size_triangleblock-sizeof(UInt16))
-    attrib_byte_count = read(io, UInt16) # read last attrib_byte
-    attrib_byte_count != zero(UInt16) && (seekstart(io); return false) # should be zero as not used
+    skip(io, number_of_triangle_blocks*size_triangleblock)
     result = eof(io) # if end of file, we have a stl!
     return result
 end

diff --git a/test/files/binary_stl_with_nonzero_attribute_byte_count.stl b/test/files/binary_stl_with_nonzero_attribute_byte_count.stl
diff --git a/test/query.jl b/test/query.jl
@@ -358,6 +358,9 @@ let file_dir = joinpath(@__DIR__, "files"), file_path = Path(file_dir)
             @test typeof(q) <: File{format"STL_ASCII"}
             q = query(joinpath(file_dir, "binary_stl_from_solidworks.STL"))
             @test typeof(q) <: File{format"STL_BINARY"}
+            # See Pull Request # 388
+            q = query(joinpath(file_dir, "binary_stl_with_nonzero_attribute_byte_count.stl"))
+            @test typeof(q) <: File{format"STL_BINARY"}
             open(q) do io
                 @test position(io) == 0
                 skipmagic(io)