Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Making Binary IO readers multi-thread safe. (Thanks to Dominic Genest for the patch)

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@571 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2012-04-05 14:26:34 +00:00
parent 77ede4fac5
commit 75acdcf860
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/OpenMesh/Core/IO/BinaryHelper.cc
View File

@@ -67,17 +67,11 @@ namespace IO {
//== IMPLEMENTATION =========================================================== //== IMPLEMENTATION ===========================================================
union u1 { short int s; unsigned char c[2]; } sc;
union u2 { int i; unsigned char c[4]; } ic;
union u3 { float f; unsigned char c[4]; } fc;
union u4 { double d; unsigned char c[8]; } dc;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
short int read_short(FILE* _in, bool _swap) short int read_short(FILE* _in, bool _swap)
{ {
union u1 { short int s; unsigned char c[2]; } sc;
fread((char*)sc.c, 1, 2, _in); fread((char*)sc.c, 1, 2, _in);
if (_swap) std::swap(sc.c[0], sc.c[1]); if (_swap) std::swap(sc.c[0], sc.c[1]);
return sc.s; return sc.s;
@@ -89,6 +83,7 @@ short int read_short(FILE* _in, bool _swap)
int read_int(FILE* _in, bool _swap) int read_int(FILE* _in, bool _swap)
{ {
union u2 { int i; unsigned char c[4]; } ic;
fread((char*)ic.c, 1, 4, _in); fread((char*)ic.c, 1, 4, _in);
if (_swap) { if (_swap) {
std::swap(ic.c[0], ic.c[3]); std::swap(ic.c[0], ic.c[3]);
@@ -103,6 +98,7 @@ int read_int(FILE* _in, bool _swap)
float read_float(FILE* _in, bool _swap) float read_float(FILE* _in, bool _swap)
{ {
union u3 { float f; unsigned char c[4]; } fc;
fread((char*)fc.c, 1, 4, _in); fread((char*)fc.c, 1, 4, _in);
if (_swap) { if (_swap) {
std::swap(fc.c[0], fc.c[3]); std::swap(fc.c[0], fc.c[3]);
@@ -117,6 +113,7 @@ float read_float(FILE* _in, bool _swap)
double read_double(FILE* _in, bool _swap) double read_double(FILE* _in, bool _swap)
{ {
union u4 { double d; unsigned char c[8]; } dc;
fread((char*)dc.c, 1, 8, _in); fread((char*)dc.c, 1, 8, _in);
if (_swap) { if (_swap) {
std::swap(dc.c[0], dc.c[7]); std::swap(dc.c[0], dc.c[7]);
@@ -133,6 +130,7 @@ double read_double(FILE* _in, bool _swap)
void write_short(short int _i, FILE* _out, bool _swap) void write_short(short int _i, FILE* _out, bool _swap)
{ {
union u1 { short int s; unsigned char c[2]; } sc;
sc.s = _i; sc.s = _i;
if (_swap) std::swap(sc.c[0], sc.c[1]); if (_swap) std::swap(sc.c[0], sc.c[1]);
fwrite((char*)sc.c, 1, 2, _out); fwrite((char*)sc.c, 1, 2, _out);
@@ -144,6 +142,7 @@ void write_short(short int _i, FILE* _out, bool _swap)
void write_int(int _i, FILE* _out, bool _swap) void write_int(int _i, FILE* _out, bool _swap)
{ {
union u2 { int i; unsigned char c[4]; } ic;
ic.i = _i; ic.i = _i;
if (_swap) { if (_swap) {
std::swap(ic.c[0], ic.c[3]); std::swap(ic.c[0], ic.c[3]);
@@ -158,6 +157,7 @@ void write_int(int _i, FILE* _out, bool _swap)
void write_float(float _f, FILE* _out, bool _swap) void write_float(float _f, FILE* _out, bool _swap)
{ {
union u3 { float f; unsigned char c[4]; } fc;
fc.f = _f; fc.f = _f;
if (_swap) { if (_swap) {
std::swap(fc.c[0], fc.c[3]); std::swap(fc.c[0], fc.c[3]);
@@ -172,6 +172,7 @@ void write_float(float _f, FILE* _out, bool _swap)
void write_double(double _d, FILE* _out, bool _swap) void write_double(double _d, FILE* _out, bool _swap)
{ {
union u4 { double d; unsigned char c[8]; } dc;
dc.d = _d; dc.d = _d;
if (_swap) { if (_swap) {
std::swap(dc.c[0], dc.c[7]); std::swap(dc.c[0], dc.c[7]);