Show
Ignore:
Timestamp:
10/24/04 19:50:54 (9 years ago)
Author:
robert
Message:

From Fred Mammond, fixes for x86_64 build

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgPlugins/flt/flt.cpp

    r189 r3527  
    2626    else if (nSrc == 4) 
    2727    { 
    28         long tmp1; 
    29         tmp1 = *(long *)pSrc; 
     28        uint32 tmp1; 
     29        tmp1 = *(uint32 *)pSrc; 
    3030        tmp1 = (tmp1 << 24) | ((tmp1 << 8) & 0xff0000) | ((tmp1 >> 8) & 0xff00) | ((tmp1 >> 24) & 0xff); 
    31         *(long *)pDst = tmp1; 
     31        *(uint32 *)pDst = tmp1; 
    3232    } 
    3333    else if (nSrc == 8) 
    3434    { 
    35         long tmp1, tmp2; 
    36         tmp1 = *(long *)pSrc; 
    37         tmp2 = *(1 + (long *)pSrc); 
     35        uint32 tmp1, tmp2; 
     36        tmp1 = *(uint32 *)pSrc; 
     37        tmp2 = *(1 + (uint32 *)pSrc); 
    3838        tmp1 = (tmp1 << 24) | ((tmp1 << 8) & 0xff0000) | ((tmp1 >> 8) & 0xff00) | ((tmp1 >> 24) & 0xff); 
    3939        tmp2 = (tmp2 << 24) | ((tmp2 << 8) & 0xff0000) | ((tmp2 >> 8) & 0xff00) | ((tmp2 >> 24) & 0xff); 
    40         *(long *)pDst = tmp2; 
    41         *(1 + (long *)pDst) = tmp1; 
     40        *(uint32 *)pDst = tmp2; 
     41        *(1 + (uint32 *)pDst) = tmp1; 
    4242    } 
    4343}