Merge branch 'hotfix-0.3.2'

CMakeLists.txt

@@ -39,7 +39,7 @@ include(CMakeDependentOption)
 project(gmio)
 set(GMIO_VERSION_MAJOR 0)
 set(GMIO_VERSION_MINOR 3)
-set(GMIO_VERSION_PATCH 1)
+set(GMIO_VERSION_PATCH 2)
 set(GMIO_VERSION
     ${GMIO_VERSION_MAJOR}.${GMIO_VERSION_MINOR}.${GMIO_VERSION_PATCH})
 

README.md

@@ -9,7 +9,7 @@
 </a>
 [![Coverage Status](https://coveralls.io/repos/fougue/gmio/badge.svg?branch=master&service=github)](https://coveralls.io/github/fougue/gmio?branch=master) 
 [![License](https://img.shields.io/badge/license-BSD%202--clause-blue.svg)](https://github.com/fougue/gmio/blob/master/LICENSE.txt)
-[![Version](https://img.shields.io/badge/version-v0.3.1-blue.svg?style=flat)](https://github.com/fougue/gmio/releases)  
+[![Version](https://img.shields.io/badge/version-v0.3.2-blue.svg?style=flat)](https://github.com/fougue/gmio/releases)  
 
 
 C library for geometry input/output

src/gmio_stl/internal/stla_infos_get.c

@@ -183,13 +183,26 @@ int gmio_stla_infos_get(
                 gmio_stringstream_skip_until_ascii_space(&sstream);
             }
         }
-        { /* Eat whole line */
+        {
+            /* Eat whole line containing "endsolid" */
             const char* c = gmio_stringstream_current_char(&sstream);
             while (c != NULL && *c != '\n' && *c != '\r')
                 c = gmio_stringstream_next_char(&sstream);
+            /* Try to move stream pos on EOF or next solid */
+            gmio_stringstream_skip_ascii_spaces(&sstream);
+        }
+        {
+            /* Whitespaces were just previously skipped, the stream pos can at
+             * either :
+             *     - on EOF => fine, stream is exhausted
+             *     - on some non-W/S => stream is then one char too far
+             * These two cases are detected by testing result of the
+             * stringstream's current char */
+            const int end_offset =
+                    gmio_stringstream_current_char(&sstream) != NULL ? 1 : 0;
+            infos->size -= sstream.strbuff_end - sstream.strbuff_at + end_offset;
+            infos->size = GMIO_MAX(0, infos->size);
         }
-        infos->size -= sstream.strbuff_end - sstream.strbuff_at;
-        infos->size = GMIO_MAX(0, infos->size);
     }
 
     return err;

src/gmio_stl/stlb_read.c

@@ -190,11 +190,23 @@ int gmio_stlb_read(
         gmio_task_iface_handle_progress(task, i_facet, total_facet_count);
     } /* end while */
 
-    if (gmio_no_error(error))
+    if (gmio_no_error(error)) {
         gmio_stl_mesh_creator_end_solid(mesh_creator);
-
-    if (gmio_no_error(error) && i_facet != total_facet_count)
-        error = GMIO_STL_ERROR_FACET_COUNT;
+        if (i_facet != total_facet_count) {
+            error = GMIO_STL_ERROR_FACET_COUNT;
+            goto label_end;
+        }
+        /* Try to eat EOF by probing next byte in stream */
+        if (!gmio_stream_at_end(stream)) {
+            struct gmio_streampos oldpos;
+            if (gmio_stream_get_pos(stream, &oldpos) == 0) {
+                uint8_t c;
+                gmio_stream_read_bytes(stream, &c, 1);
+                if (!gmio_stream_at_end(stream))
+                    gmio_stream_set_pos(stream, &oldpos);
+            }
+        }
+    }
 
 label_end:
     gmio_memblock_helper_release(&mblock_helper);

tests/main_test_stl.c

@@ -50,6 +50,10 @@ const char* all_tests()
 
     gmio_memblock_set_default_constructor(gmio_memblock_for_tests);
 
+#if 0
+    generate_stlb_tests_models();
+#endif
+
     UTEST_RUN(test_stl_coords_packing);
     UTEST_RUN(test_stl_triangle_packing);
     UTEST_RUN(test_stl_triangle_compute_normal);
@@ -69,10 +73,6 @@ const char* all_tests()
     UTEST_RUN(test_stlb_header_str);
     UTEST_RUN(test_stlb_header_to_printable_str);
 
-#if 0
-    generate_stlb_tests_models();
-#endif
-
     return NULL;
 }
 UTEST_MAIN(all_tests)

tests/test_stl_io.c

@@ -34,9 +34,10 @@
 #include "stl_utils.h"
 
 #include "../src/gmio_core/error.h"
+#include "../src/gmio_core/internal/helper_stream.h"
+#include "../src/gmio_core/internal/locale_utils.h"
 #include "../src/gmio_core/internal/min_max.h"
 #include "../src/gmio_core/internal/string.h"
-#include "../src/gmio_core/internal/locale_utils.h"
 #include "../src/gmio_stl/stl_error.h"
 #include "../src/gmio_stl/stl_infos.h"
 #include "../src/gmio_stl/stl_io.h"
@@ -333,12 +334,13 @@ static const char* __tstl__test_stl_read_multi_solid(
         struct gmio_stl_read_options roptions = {0};
         struct gmio_stl_mesh_creator null_creator = {0};
         roptions.func_stla_get_streamsize = gmio_stla_infos_get_streamsize;
-        while (gmio_no_error(error)) {
+        while (gmio_no_error(error) && !gmio_stream_at_end(&stream)) {
             error = gmio_stl_read(&stream, &null_creator, &roptions);
             if (gmio_no_error(error))
                 ++solid_count;
         }
         fclose(infile);
+        UTEST_ASSERT(gmio_no_error(error));
         UTEST_COMPARE_UINT(expected_solid_count, solid_count);
     }
     else {
@@ -434,7 +436,7 @@ static void generate_stlb_tests_models()
         struct gmio_stream ostream = gmio_stream_stdio(outfile);
         struct gmio_stl_read_options ropts = {0};
         ropts.func_stla_get_streamsize = gmio_stla_infos_get_streamsize;
-        while (gmio_no_error(read_error)) {
+        while (gmio_no_error(read_error) && !gmio_stream_at_end(&istream)) {
             struct gmio_stl_data data = {0};
             struct gmio_stl_mesh_creator creator = gmio_stl_data_mesh_creator(&data);
             struct gmio_stl_mesh mesh = {0};