-void gdcmFile::SwapZone(void* im, int swap, int lgr, int nb) {
-guint32 s32;
-guint16 fort,faible;
-int i;
-
-if(nb == 16)
- switch(swap) {
- case 0:
- case 12:
- case 1234:
- break;
-
- case 21:
- case 3412:
- case 2143:
- case 4321:
-
- for(i=0;i<lgr;i++)
- ((unsigned short int*)im)[i]= ((((unsigned short int*)im)[i])>>8)
- | ((((unsigned short int*)im)[i])<<8);
- break;
-
- default:
- printf("SWAP value (16 bits) not allowed : %d\n", swap);
- }
-
-if( nb == 32 )
- switch (swap) {
- case 0:
- case 1234:
- break;
-
- case 4321:
- for(i=0;i<lgr;i++) {
- faible= ((unsigned long int*)im)[i]&0x0000ffff; /* 4321 */
- fort =((unsigned long int*)im)[i]>>16;
- fort= (fort>>8) | (fort<<8);
- faible=(faible>>8) | (faible<<8);
- s32=faible;
- ((unsigned long int*)im)[i]=(s32<<16)|fort;
- }
- break;
-
- case 2143:
- for(i=0;i<lgr;i++) {
- faible= ((unsigned long int*)im)[i]&0x0000ffff; /* 2143 */
- fort=((unsigned long int*)im)[i]>>16;
- fort= (fort>>8) | (fort<<8);
- faible=(faible>>8) | (faible<<8);
- s32=fort;
- ((unsigned long int*)im)[i]=(s32<<16)|faible;
- }
- break;
-
- case 3412:
- for(i=0;i<lgr;i++) {
- faible= ((unsigned long int*)im)[i]&0x0000ffff; /* 3412 */
- fort=((unsigned long int*)im)[i]>>16;
- s32=faible;
- ((unsigned long int*)im)[i]=(s32<<16)|fort;
- }
- break;
-
- default:
- printf("SWAP value (32 bits) not allowed : %d\n", swap);
- }
-return;
+void gdcmFile::SwapZone(void *im, int swap, int lgr, int nb)
+{
+ int i;
+
+ if( nb == 16 )
+ {
+ uint16_t* im16 = (uint16_t*)im;
+ switch( swap )
+ {
+ case 0:
+ case 12:
+ case 1234:
+ break;
+ case 21:
+ case 3412:
+ case 2143:
+ case 4321:
+ for(i=0; i < lgr/2; i++)
+ {
+ im16[i]= (im16[i] >> 8) | (im16[i] << 8 );
+ }
+ break;
+ default:
+ std::cout << "SWAP value (16 bits) not allowed :i" << swap <<
+ std::endl;
+ }
+ }
+ else if( nb == 32 )
+ {
+ uint32_t s32;
+ uint16_t fort, faible;
+ uint32_t* im32 = (uint32_t*)im;
+ switch ( swap )
+ {
+ case 0:
+ case 1234:
+ break;
+ case 4321:
+ for(i = 0; i < lgr/4; i++)
+ {
+ faible = im32[i] & 0x0000ffff; // 4321
+ fort = im32[i] >> 16;
+ fort = ( fort >> 8 ) | ( fort << 8 );
+ faible = ( faible >> 8 ) | ( faible << 8);
+ s32 = faible;
+ im32[i] = ( s32 << 16 ) | fort;
+ }
+ break;
+ case 2143:
+ for(i = 0; i < lgr/4; i++)
+ {
+ faible = im32[i] & 0x0000ffff; // 2143
+ fort = im32[i] >> 16;
+ fort = ( fort >> 8 ) | ( fort << 8 );
+ faible = ( faible >> 8) | ( faible << 8);
+ s32 = fort;
+ im32[i] = ( s32 << 16 ) | faible;
+ }
+ break;
+ case 3412:
+ for(i = 0; i < lgr/4; i++)
+ {
+ faible = im32[i] & 0x0000ffff; // 3412
+ fort = im32[i] >> 16;
+ s32 = faible;
+ im32[i] = ( s32 << 16 ) | fort;
+ }
+ break;
+ default:
+ std::cout << "SWAP value (32 bits) not allowed : " << swap <<
+ std::endl;
+ }
+ }