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

gmio_stl: refactor gmio_stlb_infos_get()

Browse Source
This commit is contained in:
Hugues Delorme 2016-01-07 17:12:58 +01:00
parent bdb02a9d8b
commit b0803b0a7b
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/gmio_stl/internal/stlb_infos_get.c
View File

@ -25,35 +25,33 @@ int gmio_stlb_infos_get(
enum gmio_endianness byte_order, enum gmio_endianness byte_order,
unsigned flags) unsigned flags)
{ {
struct gmio_stl_infos* infos = &args->infos;
int error = GMIO_ERROR_OK;
if (flags != 0) { if (flags != 0) {
struct gmio_stl_infos* infos = &args->infos;
uint32_t facet_count = 0;
uint8_t buff[GMIO_STLB_HEADER_SIZE + sizeof(uint32_t)]; uint8_t buff[GMIO_STLB_HEADER_SIZE + sizeof(uint32_t)];
if (gmio_stream_read(&args->stream, buff, 1, sizeof(buff))
== sizeof(buff))
{
uint32_t facet_count = 0;
memcpy(&facet_count, buff + GMIO_STLB_HEADER_SIZE, sizeof(uint32_t)); { /* Read header and facet count into buff */
if (byte_order != GMIO_ENDIANNESS_HOST) const size_t read_size =
facet_count = gmio_uint32_bswap(facet_count); gmio_stream_read(&args->stream, buff, 1, sizeof(buff));
if (read_size != sizeof(buff))
if (flags & GMIO_STLB_INFO_FLAG_HEADER) return GMIO_ERROR_STREAM;
memcpy(infos->stlb_header.data, buff, GMIO_STLB_HEADER_SIZE);
if (flags & GMIO_STL_INFO_FLAG_FACET_COUNT)
infos->facet_count = facet_count;
if (flags & GMIO_STL_INFO_FLAG_SIZE) {
infos->size =
GMIO_STLB_HEADER_SIZE
+ sizeof(uint32_t)
+ facet_count * GMIO_STLB_TRIANGLE_RAWSIZE;
}
} }
else {
error = GMIO_ERROR_STREAM; memcpy(&facet_count, buff + GMIO_STLB_HEADER_SIZE, sizeof(uint32_t));
if (byte_order != GMIO_ENDIANNESS_HOST)
facet_count = gmio_uint32_bswap(facet_count);
if (flags & GMIO_STLB_INFO_FLAG_HEADER)
memcpy(infos->stlb_header.data, buff, GMIO_STLB_HEADER_SIZE);
if (flags & GMIO_STL_INFO_FLAG_FACET_COUNT)
infos->facet_count = facet_count;
if (flags & GMIO_STL_INFO_FLAG_SIZE) {
infos->size =
GMIO_STLB_HEADER_SIZE
+ sizeof(uint32_t)
+ facet_count * GMIO_STLB_TRIANGLE_RAWSIZE;
} }
} }
return error; return GMIO_ERROR_OK;
} }