ENH: Dummy cleanup patch

diff --git a/src/gdcmJpeg.cxx b/src/gdcmJpeg.cxx
index fbfe8de15d823e12e4584633c91b712dad968aa7..4c8f850352334dfeb0d6ed79ef78f024f2ebbfde 100644 (file)
--- a/src/gdcmJpeg.cxx
+++ b/src/gdcmJpeg.cxx
@@ -5,6 +5,10 @@
 
 #define BITS_IN_JSAMPLE 8
 
+#ifdef GDCM_DEBUG
+#define GDCM_jpr_DEBUG 0
+#endif   //GDCM_DEBUG
+
 /*
 DICOM provides a mechanism for supporting the use of JPEG Image Compression 
 through the Encapsulated Format (see PS 3.3 of the DICOM Standard). 

diff --git a/src/gdcmJpeg12.cxx b/src/gdcmJpeg12.cxx
index ab04c32fa9468ff4e4832ffaff6eb1842a4c62fd..97d7a77a66c3e829a3898b427cdbe1e227e2e360 100644 (file)
--- a/src/gdcmJpeg12.cxx
+++ b/src/gdcmJpeg12.cxx
@@ -5,6 +5,10 @@
 
 #define BITS_IN_JSAMPLE 12
 
+#ifdef GDCM_DEBUG
+#define GDCM_jpr_DEBUG 0
+#endif   //GDCM_DEBUG
+
 // BITS_IN_JSAMPLE is a compile time defined options.
 // We need both 8 an 12;
 // To avoid renaming *all* the Jpeg functions,

diff --git a/src/gdcmObject.cxx b/src/gdcmObject.cxx
index 78749dab8f4fdf2ccf644a99395fe811c00ebff4..331c41073a2369334946ab8d4e6a5bd7c45e946f 100644 (file)
--- a/src/gdcmObject.cxx
+++ b/src/gdcmObject.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmObject.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/07/02 13:55:28 $
-  Version:   $Revision: 1.21 $
+  Date:      $Date: 2004/07/17 22:47:01 $
+  Version:   $Revision: 1.22 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -77,8 +77,7 @@ void gdcmObject::FillObject(std::list<gdcmElement> elemList) {
   // FillObject rempli le SQItem qui sera accroche au bon endroit
 
    std::list<gdcmElement>::iterator it;
-   uint16_t tmpGr;
-   uint16_t tmpEl;
+   uint16_t tmpGr,tmpEl;
    gdcmDictEntry *dictEntry;
    gdcmValEntry *entry;
    

diff --git a/src/gdcmParsePixels.cxx b/src/gdcmParsePixels.cxx
index 5d1a6b236b049520b41478d6a72590dc637de421..078884d9c0eb4c120b733a9ecbb6ef52405de566 100644 (file)
--- a/src/gdcmParsePixels.cxx
+++ b/src/gdcmParsePixels.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmParsePixels.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/07/02 13:55:28 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2004/07/17 22:47:01 $
+  Version:   $Revision: 1.9 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -68,8 +68,7 @@ bool gdcmFile::ParsePixelData(void) {
          
    printf ("Checking the Dicom-encapsulated Jpeg/RLE Pixels\n");
       
-   uint16_t ItemTagGr;
-   uint16_t ItemTagEl; 
+   uint16_t ItemTagGr,ItemTagEl; 
    int ln;
    long ftellRes;
    //char * destination = NULL;

diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx
index 3c9a25e758f22579ac94776c17ab448a0088caf9..d34f7a9d640f622dd96e8f83d9783bea1d54ac7b 100644 (file)
--- a/src/gdcmSQItem.cxx
+++ b/src/gdcmSQItem.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSQItem.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/07/02 13:55:28 $
-  Version:   $Revision: 1.20 $
+  Date:      $Date: 2004/07/17 22:47:01 $
+  Version:   $Revision: 1.21 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -139,8 +139,8 @@ bool gdcmSQItem::AddEntry(gdcmDocEntry *entry)
  * @return  true if element was found or created successfully
  */
 
-bool gdcmSQItem::SetEntryByNumber(std::string val, uint16_t group, 
-                                                   uint16_t element)
+bool gdcmSQItem::SetEntryByNumber(std::string val,uint16_t group, 
+                                  uint16_t element)
 {
    for(ListDocEntry::iterator i=docEntries.begin();i!=docEntries.end();++i)
    { 
@@ -209,9 +209,12 @@ bool gdcmSQItem::SetEntryByNumber(std::string val, uint16_t group,
  */
 gdcmDocEntry *gdcmSQItem::GetDocEntryByNumber(uint16_t group, uint16_t element)
 {
-   for(ListDocEntry::iterator i=docEntries.begin();i!=docEntries.end();++i) {
+   for(ListDocEntry::iterator i=docEntries.begin();i!=docEntries.end();++i)
+   {
       if ( (*i)->GetGroup()==group && (*i)->GetElement()==element)
+      {
          return (*i);
+      }
    }   
    return NULL;
 }
@@ -223,8 +226,10 @@ gdcmDocEntry *gdcmSQItem::GetDocEntryByNumber(uint16_t group, uint16_t element)
 
 std::string gdcmSQItem::GetEntryByNumber(uint16_t group, uint16_t element)
 { 
-   for(ListDocEntry::iterator i=docEntries.begin();i!=docEntries.end();++i) {
-      if ( (*i)->GetGroup()==group && (*i)->GetElement()==element) {
+   for(ListDocEntry::iterator i=docEntries.begin();i!=docEntries.end();++i)
+   {
+      if ( (*i)->GetGroup()==group && (*i)->GetElement()==element)
+      {
          return ((gdcmValEntry *)(*i))->GetValue();
       }
    }   

diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index cc9eff410e85cfc679dd9b64fcf6dfa0a2e5db6f..4c053864a287ec7e4d79a998f0b6334c7d8aec58 100644 (file)
--- a/src/gdcmUtil.cxx
+++ b/src/gdcmUtil.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmUtil.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/06/25 19:37:05 $
-  Version:   $Revision: 1.46 $
+  Date:      $Date: 2004/07/17 22:47:01 $
+  Version:   $Revision: 1.47 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -102,12 +102,16 @@ void NormalizePath(std::string &name)
  */
 std::string GetPath(std::string &fullName)
 {
-   int pos1=fullName.rfind("/");
-   int pos2=fullName.rfind("\\");
-   if(pos1>pos2)
+   int pos1 = fullName.rfind("/");
+   int pos2 = fullName.rfind("\\");
+   if( pos1 > pos2)
+   {
       fullName.resize(pos1);
+   }
    else
+   {
       fullName.resize(pos2);
+   }
    return fullName;
 }