caiyu/gmio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gmio_stl: simpler API for gmio_stl_get_format()

Browse Source
This commit is contained in:
Hugues Delorme 2015-03-23 18:21:52 +01:00
parent 6fd9399fdd
commit b91b5ad196
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gmio_stl/stl_format.c
View File

@ -28,12 +28,12 @@
enum { GMIO_FIXED_BUFFER_SIZE = 512 }; enum { GMIO_FIXED_BUFFER_SIZE = 512 };
gmio_stl_format_t gmio_stl_get_format(gmio_stream_t *stream, size_t data_size) gmio_stl_format_t gmio_stl_get_format(gmio_stream_t *stream)
{ {
char fixed_buffer[GMIO_FIXED_BUFFER_SIZE]; char fixed_buffer[GMIO_FIXED_BUFFER_SIZE];
size_t read_size = 0; size_t read_size = 0;
if (stream == NULL || data_size == 0) if (stream == NULL)
return GMIO_STL_UNKNOWN_FORMAT; return GMIO_STL_UNKNOWN_FORMAT;
/* Read a chunk of bytes from stream, then try to find format from that */ /* Read a chunk of bytes from stream, then try to find format from that */
@ -41,14 +41,18 @@ gmio_stl_format_t gmio_stl_get_format(gmio_stream_t *stream, size_t data_size)
read_size = gmio_stream_read(stream, &fixed_buffer, 1, GMIO_FIXED_BUFFER_SIZE); read_size = gmio_stream_read(stream, &fixed_buffer, 1, GMIO_FIXED_BUFFER_SIZE);
read_size = GMIO_MIN(read_size, GMIO_FIXED_BUFFER_SIZE); read_size = GMIO_MIN(read_size, GMIO_FIXED_BUFFER_SIZE);
gmio_stream_rewind(stream);
/* Binary STL ? */ /* Binary STL ? */
if (read_size >= (GMIO_STLB_HEADER_SIZE + 4)) { if (read_size >= (GMIO_STLB_HEADER_SIZE + 4)) {
const size_t stream_size = gmio_stream_size(stream);
/* Try with little-endian format */ /* Try with little-endian format */
uint32_t facet_count = uint32_t facet_count =
gmio_decode_uint32_le((const uint8_t*)fixed_buffer + 80); gmio_decode_uint32_le((const uint8_t*)fixed_buffer + 80);
if ((GMIO_STLB_HEADER_SIZE + 4 + facet_count*GMIO_STLB_TRIANGLE_RAWSIZE) if ((GMIO_STLB_HEADER_SIZE + 4 + facet_count*GMIO_STLB_TRIANGLE_RAWSIZE)
== data_size) == stream_size)
{ {
return GMIO_STL_BINARY_LE_FORMAT; return GMIO_STL_BINARY_LE_FORMAT;
} }
@ -56,7 +60,7 @@ gmio_stl_format_t gmio_stl_get_format(gmio_stream_t *stream, size_t data_size)
/* Try with byte-reverted facet count */ /* Try with byte-reverted facet count */
facet_count = gmio_uint32_bswap(facet_count); facet_count = gmio_uint32_bswap(facet_count);
if ((GMIO_STLB_HEADER_SIZE + 4 + facet_count*GMIO_STLB_TRIANGLE_RAWSIZE) if ((GMIO_STLB_HEADER_SIZE + 4 + facet_count*GMIO_STLB_TRIANGLE_RAWSIZE)
== data_size) == stream_size)
{ {
return GMIO_STL_BINARY_BE_FORMAT; return GMIO_STL_BINARY_BE_FORMAT;
} }

6
src/gmio_stl/stl_format.h
View File

@ -41,14 +41,10 @@ GMIO_C_LINKAGE_BEGIN
* It will try to read 512 bytes from \p stream into a buffer and then * It will try to read 512 bytes from \p stream into a buffer and then
* analyses this data to guess the format. * analyses this data to guess the format.
* *
* Parameter \p data_size must provide the total size (in bytes) of the
* stream data (e.g. file size), it is required to guess endianness in case
* of binary format.
*
* \retval GMIO_STL_UNKNOWN_FORMAT in case of error. * \retval GMIO_STL_UNKNOWN_FORMAT in case of error.
*/ */
GMIO_LIBSTL_EXPORT GMIO_LIBSTL_EXPORT
gmio_stl_format_t gmio_stl_get_format(gmio_stream_t* stream, size_t data_size); gmio_stl_format_t gmio_stl_get_format(gmio_stream_t* stream);
GMIO_C_LINKAGE_END GMIO_C_LINKAGE_END