* src/gdcmHeader.h: LoadElements() is not a public method anymore

        (to avoid double call by end user).
      * Test/*.cxx LoadElements() doesn't need to be called explicitely
        by end user, since gdcmHeader::gdcmHeader now handles it. --- Frog

diff --git a/ChangeLog b/ChangeLog
index 8e91224a5c63ad7d4735227f800ee87dc3db12d3..157a564c3a60cf1f2488475e45b879950a1b51b1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,17 +1,24 @@
+2003-03-31 Eric Boix <Eric.Boix@creatis.insa-lyon.fr>
+      * src/gdcmHeader.h: LoadElements() is not a public method anymore
+        (to avoid double call by end user).
+      * Test/*.cxx LoadElements() doesn't need to be called explicitely
+        by end user, since gdcmHeader::gdcmHeader now handles it.
+
 2003-03-29 Eric Boix <Eric.Boix@creatis.insa-lyon.fr>
       * gdcm/Doc many doxygen changes:
         - Doxyfile now has two different versions, DoxyfileUsers that generates
-          the html.users end users oriented documentation and DoxyfileDeveloppers
-          that generates the html.developper developper oriented documentation.
+          the html.users end users oriented documentation and
+          DoxyfileDeveloppers that generates the html.developper developper
+          oriented documentation.
         - README changed accordingly
         - requirement.txt removed (old design info moved to TODO).
-        - Additional files DoxyInstallation.txt, DoxyIntroduction.txt, DoxyMainPage.txt,
-          DoxyPython.txt provide more information.
+        - Additional files DoxyInstallation.txt, DoxyIntroduction.txt,
+          DoxyMainPage.txt, DoxyPython.txt provide more information.
         - Note: the website http://www.creatis.insa-lyon.fr/Public/Gdcm/ can now
           be updated by simply regenerating the docs with doxygen and copying 
           html.developper and html.users to tux:/home/httpd/html/Public/Gdcm
-      * src/gdcmElValSet.cxx: stl <map>.count() can only return 0 or 1. Hence all
-        the tests in the form "if (<map>.count() >1)" were removed.
+      * src/gdcmElValSet.cxx: stl <map>.count() can only return 0 or 1. Hence
+        all the tests in the form "if (<map>.count() >1)" were removed.
       * src/gdcmFile.cxx: cosmetic changes to avoid messages of doxygen about
         ill-formed documentation sections.
       * src/gdcmHeader.cxx: ditto

diff --git a/Testing/TestBug.cxx b/Testing/TestBug.cxx
index 0d67a97da26b5bd5a7f8e04bca433246405645e5..a7fc6b9bc09a8edad1cbe9a145d4e2799141b954 100644 (file)
--- a/Testing/TestBug.cxx
+++ b/Testing/TestBug.cxx
@@ -9,7 +9,6 @@ int main(int argc, char* argv[])
                e1 = new gdcmHeader(argv[1]);
        else
                e1 = new gdcmHeader("test.acr");
-       e1->LoadElements();
        e1->PrintPubDict();
 }
 

diff --git a/Testing/TestChangeHeader.cxx b/Testing/TestChangeHeader.cxx
index d5fcdd90072384a9435fc1420265f57efbbf1559..d249f67ae8cc362a536f8bdcf11e8f83a5c7e30b 100644 (file)
--- a/Testing/TestChangeHeader.cxx
+++ b/Testing/TestChangeHeader.cxx
@@ -25,12 +25,9 @@ int main(int argc, char* argv[])
 
        premier = argv[1];
        f1 = new gdcmFile(premier);
-       f1->LoadElements();
        
        deuxieme = argv[2];
        f2 = new gdcmFile(deuxieme);
-       f2->LoadElements();
-       printf("apres LoadElements\n");
        
        //f1->PrintPubElVal();
        

diff --git a/src/gdcmHeader.h b/src/gdcmHeader.h
index 7aec5e5249bd53517ea12c0e17ca71f62fca2df4..a7d2241f24910756636b3add714a71f59833a615 100644 (file)
--- a/src/gdcmHeader.h
+++ b/src/gdcmHeader.h
@@ -97,6 +97,7 @@ private:
    void SkipElementValue(gdcmElValue *);
    void FixFoundLength(gdcmElValue*, guint32);
    bool IsAnInteger(gdcmElValue *);
+   void LoadElements(void);
    
    bool IsImplicitVRLittleEndianTransferSyntax(void);
    bool IsExplicitVRLittleEndianTransferSyntax(void);
@@ -122,7 +123,6 @@ protected:
    int write(ostream&);   
    int anonymize(ostream&);  // FIXME : anonymize should be a friend ?
 public:
-   void LoadElements(void);
    bool IsReadable(void);
    virtual void ParseHeader(bool exception_on_error = false)
      throw(gdcmFormatError);