Remove my comments

[gdcm.git] / src / gdcmParsePixels.cxx

diff --git a/src/gdcmParsePixels.cxx b/src/gdcmParsePixels.cxx
index c388cb541d27bae7f53e240809a98b8847112e08..c7233f3026ff494a411ccaa4843935fb32e5fa31 100644 (file)
--- a/src/gdcmParsePixels.cxx
+++ b/src/gdcmParsePixels.cxx
@@ -1,19 +1,7 @@
 // gdcmParse.cxx
 //-----------------------------------------------------------------------------
-//This is needed when compiling in debug mode
-#ifdef _MSC_VER
-// 'type' : forcing value to bool 'true' or 'false' (performance warning)
-//#pragma warning ( disable : 4800 )
-// 'identifier' : class 'type' needs to have dll-interface to be used by
-// clients of class 'type2'
-#pragma warning ( disable : 4251 )
-// 'identifier' : identifier was truncated to 'number' characters in the
-// debug information
-#pragma warning ( disable : 4786 )
-#endif //_MSC_VER
-
+#include "gdcmCommon.h"
 #include "gdcmFile.h"
-#include "gdcmUtil.h"
 
 #define str2num(str, typeNum) *((typeNum *)(str))
 
@@ -58,16 +46,16 @@ bool gdcmFile::ParsePixelData(void) {
       nb = atoi(str_nb.c_str() );
       if (nb == 12) nb =16;
    }
-   int nBytes= nb/8;
+   //int nBytes= nb/8; //FIXME
       
-   int taille = Header->GetXSize() * Header->GetYSize() * Header->GetSamplesPerPixel(); 
+   //int taille = Header->GetXSize() * Header->GetYSize() * Header->GetSamplesPerPixel(); 
          
    printf ("Checking the Dicom-encapsulated Jpeg/RLE Pixels\n");
       
    guint16 ItemTagGr,ItemTagEl; 
    int ln;
    long ftellRes;
-   char * destination = NULL;
+   //char * destination = NULL;
 
   // -------------------- for Parsing : Position on begining of Jpeg/RLE Pixels 
 
@@ -82,16 +70,16 @@ bool gdcmFile::ParsePixelData(void) {
          ItemTagEl=Header->SwapShort(ItemTagEl);            
       }
       printf ("at %x : ItemTag (should be fffe,e000): %04x,%04x\n",
-                ftellRes,ItemTagGr,ItemTagEl );
+                (unsigned)ftellRes,ItemTagGr,ItemTagEl );
       ftellRes=ftell(fp);
       fread(&ln,4,1,fp); 
       if(Header->GetSwapCode()) 
-         ln=Header->SwapLong(ln);    // Basic Offset Table Item Lentgh
-      printf("at %x : Basic Offset Table Item Lentgh (??) %d x(%08x)\n",
-            ftellRes,ln,ln);
+         ln=Header->SwapLong(ln);    // Basic Offset Table Item Length
+      printf("at %x : Basic Offset Table Item Length (\?\?) %d x(%08x)\n",
+            (unsigned)ftellRes,ln,ln);
       if (ln != 0) {
          // What is it used for ??
-         char * BasicOffsetTableItemValue= (char *)malloc(ln+1);
+         char * BasicOffsetTableItemValue= new char[ln+1];
          fread(BasicOffsetTableItemValue,ln,1,fp); 
          guint32 a;
          for (int i=0;i<ln;i+=4){
@@ -108,7 +96,7 @@ bool gdcmFile::ParsePixelData(void) {
          ItemTagEl=Header->SwapShort(ItemTagEl);            
       }  
       printf ("at %x : ItemTag (should be fffe,e000 or e0dd): %04x,%04x\n",
-            ftellRes,ItemTagGr,ItemTagEl );
+            (unsigned)ftellRes,ItemTagGr,ItemTagEl );
       
       while ( ( ItemTagGr==0xfffe) && (ItemTagEl!=0xe0dd) ) { // Parse fragments
       
@@ -117,7 +105,7 @@ bool gdcmFile::ParsePixelData(void) {
          if(Header->GetSwapCode()) 
             ln=Header->SwapLong(ln);    // length
          printf("      at %x : fragment length %d x(%08x)\n",
-                ftellRes, ln,ln);
+                (unsigned)ftellRes, ln,ln);
 
         // destination += taille * nBytes; // location in user's memory        
         //printf ("      Destination will be x(%x) = %d \n",
@@ -135,7 +123,7 @@ bool gdcmFile::ParsePixelData(void) {
             ItemTagEl=Header->SwapShort(ItemTagEl);            
          }
          printf ("at %x : ItemTag (should be fffe,e000 or e0dd): %04x,%04x\n",
-               ftellRes,ItemTagGr,ItemTagEl );
+               (unsigned)ftellRes,ItemTagGr,ItemTagEl );
       } 
 
    } else {
@@ -154,17 +142,17 @@ bool gdcmFile::ParsePixelData(void) {
          ItemTagEl=Header->SwapShort(ItemTagEl);            
       }
       printf ("at %x : ItemTag (should be fffe,e000): %04x,%04x\n",
-                ftellRes,ItemTagGr,ItemTagEl );
+                (unsigned)ftellRes,ItemTagGr,ItemTagEl );
          // Item Length
       ftellRes=ftell(fp);
       fread(&ln,4,1,fp); 
       if(Header->GetSwapCode()) 
-         ln=Header->SwapLong(ln);    // Basic Offset Table Item Lentgh
-      printf("at %x : Basic Offset Table Item Lentgh (??) %d x(%08x)\n",
-            ftellRes,ln,ln);
+         ln=Header->SwapLong(ln);    // Basic Offset Table Item Length
+      printf("at %x : Basic Offset Table Item Length (\?\?) %d x(%08x)\n",
+            (unsigned)ftellRes,ln,ln);
       if (ln != 0) {
          // What is it used for ??
-         char * BasicOffsetTableItemValue= (char *)malloc(ln+1);
+         char * BasicOffsetTableItemValue= new char[ln+1];
          fread(BasicOffsetTableItemValue,ln,1,fp); 
          guint32 a;
          for (int i=0;i<ln;i+=4){
@@ -181,7 +169,7 @@ bool gdcmFile::ParsePixelData(void) {
          ItemTagEl=Header->SwapShort(ItemTagEl);            
       }  
       printf ("at %x : ItemTag (should be fffe,e000 or e0dd): %04x,%04x\n",
-            ftellRes,ItemTagGr,ItemTagEl );
+            (unsigned)ftellRes,ItemTagGr,ItemTagEl );
 
       // while 'Sequence Delimiter Item' (fffe,e0dd) not found
       while (  ( ItemTagGr == 0xfffe) && (ItemTagEl != 0xe0dd) ) { 
@@ -191,7 +179,7 @@ bool gdcmFile::ParsePixelData(void) {
          if(Header->GetSwapCode()) 
             fragmentLength=Header->SwapLong(fragmentLength);    // length
          printf("      at %x : 'fragment' length %d x(%08x)\n",
-                ftellRes, fragmentLength,fragmentLength);
+                (unsigned)ftellRes, (unsigned)fragmentLength,(unsigned)fragmentLength);
                        
           //------------------ scanning (not reading) fragment pixels
  
@@ -206,17 +194,17 @@ bool gdcmFile::ParsePixelData(void) {
             if(Header->GetSwapCode())
                RleSegmentOffsetTable[k]=Header->SwapLong(RleSegmentOffsetTable[k]);
             printf("        at : %x Offset Segment %d : %d (%x)\n",
-                    ftellRes,k,RleSegmentOffsetTable[k],
+                    (unsigned)ftellRes,k,RleSegmentOffsetTable[k],
                     RleSegmentOffsetTable[k]);
          }
 
           if (nbRleSegments>1) { // skipping (not reading) RLE Segments
-             for(int k=1; k<=nbRleSegments-1; k++) { 
+             for(unsigned int k=1; k<=nbRleSegments-1; k++) { 
                 RleSegmentLength[k]=   RleSegmentOffsetTable[k+1]
                                      - RleSegmentOffsetTable[k];
                 ftellRes=ftell(fp);
                 printf ("  Segment %d : Length = %d x(%x) Start at %x\n",
-                           k,RleSegmentLength[k],RleSegmentLength[k], ftellRes);
+                           k,(unsigned)RleSegmentLength[k],(unsigned)RleSegmentLength[k], (unsigned)ftellRes);
                 fseek(fp,RleSegmentLength[k],SEEK_CUR);    
              }
           }
@@ -224,8 +212,8 @@ bool gdcmFile::ParsePixelData(void) {
                                          - RleSegmentOffsetTable[nbRleSegments];
           ftellRes=ftell(fp);
           printf ("  Segment %d : Length = %d x(%x) Start at %x\n",
-                           nbRleSegments,RleSegmentLength[nbRleSegments],
-                           RleSegmentLength[nbRleSegments],ftellRes);
+                           nbRleSegments,(unsigned)RleSegmentLength[nbRleSegments],
+                           (unsigned)RleSegmentLength[nbRleSegments],(unsigned)ftellRes);
 
           fseek(fp,RleSegmentLength[nbRleSegments],SEEK_CUR); 
             
@@ -239,7 +227,7 @@ bool gdcmFile::ParsePixelData(void) {
             ItemTagEl=Header->SwapShort(ItemTagEl);            
          }
          printf ("at %x : ItemTag (should be fffe,e000 or e0dd): %04x,%04x\n",
-               ftellRes,ItemTagGr,ItemTagEl );
+               (unsigned)ftellRes,ItemTagGr,ItemTagEl );
       } 
    }
    return true;