FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Fred Mammond, fixes for x86_64 build

Browse Source
This commit is contained in:
Robert Osfield
2004-10-24 17:50:54 +00:00
parent a9e19fde9c
commit 1dd682f6b4
5 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osgPlugins/flt/AttrData.h
View File

@@ -26,7 +26,7 @@
namespace flt {
typedef signed long int32;
typedef signed int int32;
class AttrData : public osg::Object {
public:

2
src/osgPlugins/flt/LocalVertexPoolRecord.cpp
View File

@@ -369,7 +369,7 @@ void LocalVertexPoolRecord::endian()
// If equal, vertex pool record was not continued.
// If 16bit record length is less than length of vertex pool, then the original vertex
// pool record was continued with one or more CONTINUATION_OP records.
assert ( pool->RecHeader._wLength <= ( ( (uint32) vertex ) - ( (uint32) pool ) ) );
assert ( pool->RecHeader._wLength <= ( ( (unsigned long) vertex ) - ( (unsigned long) pool ) ) );
}

20
src/osgPlugins/flt/ReaderWriterATTR.cpp
View File

@@ -49,8 +49,8 @@ typedef signed char int8;
typedef unsigned char uint8;
typedef signed short int16;
typedef unsigned short uint16;
typedef signed long int32;
typedef unsigned long uint32;
typedef signed int int32;
typedef unsigned int uint32;
typedef float float32;
typedef double float64;
@@ -75,20 +75,20 @@ static void endian2(void* pSrc, int nSrc, void* pDst)
}
else if (nSrc == 4)
{
long tmp1;
tmp1 = *(long *)pSrc;
uint32 tmp1;
tmp1 = *(uint32 *)pSrc;
tmp1 = (tmp1 << 24) | ((tmp1 << 8) & 0xff0000) | ((tmp1 >> 8) & 0xff00) | ((tmp1 >> 24) & 0xff);
*(long *)pDst = tmp1;
*(uint32 *)pDst = tmp1;
}
else if (nSrc == 8)
{
long tmp1, tmp2;
tmp1 = *(long *)pSrc;
tmp2 = *(1 + (long *)pSrc);
uint32 tmp1, tmp2;
tmp1 = *(uint32 *)pSrc;
tmp2 = *(1 + (uint32 *)pSrc);
tmp1 = (tmp1 << 24) | ((tmp1 << 8) & 0xff0000) | ((tmp1 >> 8) & 0xff00) | ((tmp1 >> 24) & 0xff);
tmp2 = (tmp2 << 24) | ((tmp2 << 8) & 0xff0000) | ((tmp2 >> 8) & 0xff00) | ((tmp2 >> 24) & 0xff);
*(long *)pDst = tmp2;
*(1 + (long *)pDst) = tmp1;
*(uint32 *)pDst = tmp2;
*(1 + (uint32 *)pDst) = tmp1;
}
}

16
src/osgPlugins/flt/flt.cpp
View File

@@ -25,20 +25,20 @@ void flt::endian2(void* pSrc, int nSrc, void* pDst, int )
}
else if (nSrc == 4)
{
long tmp1;
tmp1 = *(long *)pSrc;
uint32 tmp1;
tmp1 = *(uint32 *)pSrc;
tmp1 = (tmp1 << 24) | ((tmp1 << 8) & 0xff0000) | ((tmp1 >> 8) & 0xff00) | ((tmp1 >> 24) & 0xff);
*(long *)pDst = tmp1;
*(uint32 *)pDst = tmp1;
}
else if (nSrc == 8)
{
long tmp1, tmp2;
tmp1 = *(long *)pSrc;
tmp2 = *(1 + (long *)pSrc);
uint32 tmp1, tmp2;
tmp1 = *(uint32 *)pSrc;
tmp2 = *(1 + (uint32 *)pSrc);
tmp1 = (tmp1 << 24) | ((tmp1 << 8) & 0xff0000) | ((tmp1 >> 8) & 0xff00) | ((tmp1 >> 24) & 0xff);
tmp2 = (tmp2 << 24) | ((tmp2 << 8) & 0xff0000) | ((tmp2 >> 8) & 0xff00) | ((tmp2 >> 24) & 0xff);
*(long *)pDst = tmp2;
*(1 + (long *)pDst) = tmp1;
*(uint32 *)pDst = tmp2;
*(1 + (uint32 *)pDst) = tmp1;
}
}

4
src/osgPlugins/flt/flt.h
View File

@@ -65,8 +65,8 @@ typedef signed char int8;
typedef unsigned char uint8;
typedef signed short int16;
typedef unsigned short uint16;
typedef signed long int32;
typedef unsigned long uint32;
typedef signed int int32;
typedef unsigned int uint32;
typedef float float32;
typedef double float64;