X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmSerieHelper.h;h=d791fe13f4cddeb6fac302b3aaef64c20d50e4ea;hb=88d681d129a1e8b361c75a0d4f246f68b39db1b9;hp=e30b08facb55b114a90e9e9b3be83f1a54d3e473;hpb=02e5b298070faff881e584dd818d85bfc05e92bf;p=gdcm.git

diff --git a/src/gdcmSerieHelper.h b/src/gdcmSerieHelper.h
index e30b08fa..d791fe13 100644
--- a/src/gdcmSerieHelper.h
+++ b/src/gdcmSerieHelper.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSerieHelper.h,v $
   Language:  C++
-  Date:      $Date: 2005/08/30 08:12:40 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2005/08/30 14:40:33 $
+  Version:   $Revision: 1.19 $
                                                                                 
   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,13 @@ public:
   
 /**
  * \brief Sets the LoadMode as a boolean string. 
+<<<<<<< gdcmSerieHelper.h
+ *        LD_NOSEQ, LD_NOSHADOW, LD_NOSHADOWSEQ
+ ... (nothing more, right now)
+=======
  *        NO_SEQ, NO_SHADOW, NO_SHADOWSEQ
  *        (nothing more, right now)
+>>>>>>> 1.17
  *        WARNING : before using NO_SHADOW, be sure *all* your files
  *        contain accurate values in the 0x0000 element (if any) 
  *        of *each* Shadow Group. The parser will fail if the size is wrong !
@@ -136,7 +141,8 @@ private:
 
    /// \brief If user knows more about his images than gdcm does,
    ///        he may supply his own comparison function.
-   /*static*/ BOOL_FUNCTION_PFILE_PFILE_POINTER UserLessThanFunction;
+    BOOL_FUNCTION_PFILE_PFILE_POINTER UserLessThanFunction;
+
 };
 
 } // end namespace gdcm