csg 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75fa78d0a7457950ab6f58724d12d6889a1ad040
-  data.tar.gz: e42df82e618300fd3ecbb378b5671e30c241adc0
+  metadata.gz: f6584bd1d35c5a3c3ab0b3af47606de75251cfea
+  data.tar.gz: fb8f9ccabd59f3874db5fed637deb1623b8c630f
 SHA512:
-  metadata.gz: f38fca9b843039bd79aee405e6b25fb9284f925cb3799ab9b11438800c76960c47a688bf5ed4e6946a52ae8f915712dbae7152103c1df9c582153dd2d7bd42ff
-  data.tar.gz: 8aa32fdda09f7abba5cbac125581ac258cee68761a97eddd659749a6408268846dc377e85a319c2716c71f7ba6e05c97c810e5384dcd0f548d4c27f430560a58
+  metadata.gz: 4130b268ee4fa904c1193ccd829a9476b06b3e3d804b8aa50d83c20c911fdd5a4d754e6921c6d0af688e348bd67726e3a9a48b4b9427b65b3a4965b945a82c11
+  data.tar.gz: cf872186381f7ae129b4334ba2434e7082a9bad8ce7ddd89de29ac5daa4046f7337b040bdd621c1731d368b1dc2fafd21ac55e6d9aeb3e8866a84d2b81f347b6

data/src/stl.c

@@ -1,9 +1,12 @@
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <ctype.h>
 #include <fcntl.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
+#include <unistd.h>
 
 #include "dbg.h"
 
@@ -178,6 +181,26 @@ stl_object *stl_read_object(int fd) {
 		rc = read(fd, &n_tris, sizeof(n_tris));
 		check(rc == sizeof(n_tris), "Failed to read facet count.");
 
+		// The expected file size, as annotated. The `stl_facet` struct layout
+		// is spelled out and summed, otherwise the sizeof(stl_facet) constant might
+		// be wrong because of padding for alignement:
+		// (normal(4b) + (3 * vertex(4)) + attr(2) = 18b, which can't dword align)
+		size_t req_size =
+			sizeof(header) +               // Header size
+			sizeof(n_tris) +               // Triangle count
+			(n_tris * (                    // The number of triangles *
+				sizeof(float3) +           //   float3 normal
+				(3 * sizeof(float3)) +     //   float3 vertex * 3
+				sizeof(uint16_t)));        //   short attr
+		struct stat fd_stat = {0};
+		check((rc = fstat(fd, &fd_stat) == 0), "Failed to stat fd(%d)", fd);
+
+		// Do we have a file that supports that size?
+		check(fd_stat.st_size == req_size,
+			  "File at fd(%d) is %zd bytes, needs to be %zd bytes for %u facets.",
+			  fd, fd_stat.st_size, req_size, n_tris);
+
+		// Allocate space for the object we know we can hold
 		obj = stl_alloc(header, n_tris);
 
 		for(uint32_t i = 0; i < obj->facet_count; i++) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csg
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Yaroslav Shirokov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi