libstl: replace stl{a,b}_{read,write}.h files by stl_io.h

qmake/fougdatax.pro

@@ -63,11 +63,8 @@ contains(DATAX, stl) {
     ../src/libstl/stl_geom.h \
     ../src/libstl/stl_geom_creator.h \
     ../src/libstl/stl_global.h \
+    ../src/libstl/stl_io.h \
     ../src/libstl/stl_triangle.h \
-    ../src/libstl/stla_read.h \
-    ../src/libstl/stla_write.h \
-    ../src/libstl/stlb_read.h \
-    ../src/libstl/stlb_write.h \
     \
     ../src/internal/libstl/stlb_byte_swap.h \
     ../src/internal/libstl/stl_rw_common.h

src/libstl/stl_io.h

@@ -0,0 +1,40 @@
+#ifndef FOUG_DATAX_LIBSTL_STL_IO_H
+#define FOUG_DATAX_LIBSTL_STL_IO_H
+
+#include "stl_global.h"
+#include "stl_geom.h"
+#include "stl_geom_creator.h"
+#include "../endian.h"
+#include "../transfer.h"
+
+/*
+ *  STL ascii
+ */
+
+/*! Read geometry from STL ascii stream */
+FOUG_DATAX_LIBSTL_EXPORT int foug_stla_read(foug_stl_geom_creator_t* creator,
+                                            foug_transfer_t*         trsf,
+                                            size_t                   data_size_hint);
+
+/*! Write geometry in the STL ascii format */
+FOUG_DATAX_LIBSTL_EXPORT int foug_stla_write(foug_stl_geom_t* geom,
+                                             foug_transfer_t* trsf,
+                                             const char*      solid_name,
+                                             uint8_t          real32_prec);
+
+/*
+ *  STL binary
+ */
+
+/*! Read geometry from STL binary stream */
+FOUG_DATAX_LIBSTL_EXPORT int foug_stlb_read(foug_stl_geom_creator_t* creator,
+                                            foug_transfer_t*         trsf,
+                                            foug_endianness_t        byte_order);
+
+/*! Write geometry in the STL binary format */
+FOUG_DATAX_LIBSTL_EXPORT int foug_stlb_write(const foug_stl_geom_t* geom,
+                                             foug_transfer_t*       trsf,
+                                             const uint8_t*         header_data,
+                                             foug_endianness_t      byte_order);
+
+#endif /* FOUG_DATAX_LIBSTL_STL_IO_H */

src/libstl/stla_read.c

@@ -1,4 +1,4 @@
-#include "stla_read.h"
+#include "stl_io.h"
 
 #include "../internal/ascii_parse.h"
 #include "../internal/libstl/stl_rw_common.h"

src/libstl/stla_read.h

@@ -1,13 +0,0 @@
-#ifndef FOUG_DATAX_C_LIBSTL_STLA_READ_H
-#define FOUG_DATAX_C_LIBSTL_STLA_READ_H
-
-#include "stl_global.h"
-#include "stl_geom_creator.h"
-#include "../transfer.h"
-
-/* foug_stla_read() */
-FOUG_DATAX_LIBSTL_EXPORT int foug_stla_read(foug_stl_geom_creator_t* creator,
-                                            foug_transfer_t*         trsf,
-                                            size_t                   data_size_hint);
-
-#endif /* FOUG_DATAX_C_LIBSTL_STLA_READ_H */

src/libstl/stla_write.c

@@ -1,4 +1,4 @@
-#include "stla_write.h"
+#include "stl_io.h"
 
 #include "../error.h"
 #include "../internal/libstl/stl_rw_common.h"

src/libstl/stla_write.h

@@ -1,14 +0,0 @@
-#ifndef FOUG_DATAX_C_LIBSTL_STLA_WRITE_H
-#define FOUG_DATAX_C_LIBSTL_STLA_WRITE_H
-
-#include "stl_global.h"
-#include "stl_geom.h"
-#include "../transfer.h"
-
-/*! Write geometry in the STL ascii format */
-FOUG_DATAX_LIBSTL_EXPORT int foug_stla_write(foug_stl_geom_t* geom,
-                                             foug_transfer_t* trsf,
-                                             const char*      solid_name,
-                                             uint8_t          real32_prec);
-
-#endif /* FOUG_DATAX_C_LIBSTL_STLA_WRITE_H */

src/libstl/stlb_read.c

@@ -1,4 +1,4 @@
-#include "stlb_read.h"
+#include "stl_io.h"
 
 #include "../endian.h"
 #include "../error.h"

src/libstl/stlb_read.h

@@ -1,14 +0,0 @@
-#ifndef FOUG_DATAX_C_LIBSTL_STLB_READ_H
-#define FOUG_DATAX_C_LIBSTL_STLB_READ_H
-
-#include "stl_global.h"
-#include "stl_geom_creator.h"
-#include "../endian.h"
-#include "../transfer.h"
-
-/* foug_stlb_read() */
-FOUG_DATAX_LIBSTL_EXPORT int foug_stlb_read(foug_stl_geom_creator_t* creator,
-                                            foug_transfer_t*         trsf,
-                                            foug_endianness_t        byte_order);
-
-#endif /* FOUG_DATAX_C_LIBSTL_STLB_READ_H */

src/libstl/stlb_write.c

@@ -1,4 +1,4 @@
-#include "stlb_write.h"
+#include "stl_io.h"
 
 #include "../endian.h"
 #include "../error.h"

src/libstl/stlb_write.h

@@ -1,15 +0,0 @@
-#ifndef FOUG_DATAX_C_LIBSTL_STLB_WRITE_H
-#define FOUG_DATAX_C_LIBSTL_STLB_WRITE_H
-
-#include "stl_global.h"
-#include "stl_geom.h"
-#include "../endian.h"
-#include "../transfer.h"
-
-/* foug_stlb_write() */
-FOUG_DATAX_LIBSTL_EXPORT int foug_stlb_write(const foug_stl_geom_t* geom,
-                                             foug_transfer_t*       trsf,
-                                             const uint8_t*         header_data,
-                                             foug_endianness_t      byte_order);
-
-#endif /* FOUG_DATAX_C_LIBSTL_STLB_WRITE_H */

src/support/occ_libstl.h

@@ -3,10 +3,7 @@
 
 extern "C" {
 #include "support_global.h"
-#include "../libstl/stla_read.h"
+#include "../libstl/stl_io.h"
-#include "../libstl/stla_write.h"
-#include "../libstl/stlb_read.h"
-#include "../libstl/stlb_write.h"
 }
 #include <Handle_StlMesh_Mesh.hxx>