Try to make gdcm1.2 and gdcm1.3 usable int the same source code.

[gdcm.git] / src / gdcmJPEGFragment.h

diff --git a/src/gdcmJPEGFragment.h b/src/gdcmJPEGFragment.h
index 70f3312bc79f4a29da4be8739a4ee1a235016617..b3cb8c255a609511b2ccab7a8c2c6cff60b036dd 100644 (file)
--- a/src/gdcmJPEGFragment.h
+++ b/src/gdcmJPEGFragment.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJPEGFragment.h,v $
   Language:  C++
-  Date:      $Date: 2005/02/06 14:43:27 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  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
@@ -17,15 +17,15 @@
 =========================================================================*/
 
 
-#ifndef GDCMJPEGFRAGMENT_H
-#define GDCMJPEGFRAGMENT_H
+#ifndef _GDCMJPEGFRAGMENT_H_
+#define _GDCMJPEGFRAGMENT_H_
 
-#include "gdcmCommon.h"
+#include "gdcmBase.h"
 
 #include <iostream>
 #include <fstream>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 /**
  * \brief *very* internal class . Shouldn't appear here !
@@ -39,11 +39,11 @@ namespace gdcm
  *        a given Document as they are JPEG fragments and they are
  *        collected in a \ref JPEGFragmentsInfo )
  */
-class GDCM_EXPORT JPEGFragment
+class GDCM_EXPORT JPEGFragment : public Base
 {
 public:
    JPEGFragment();
-   void Print( std::ostream &os = std::cout, std::string indent = "" );
+   void Print( std::ostream &os = std::cout, std::string const &indent = "" );
    void DecompressJPEGFramesFromFile(std::ifstream *fp, 
                                      uint8_t *buffer, int nBits, 
                                      int &statesuspension);
@@ -52,11 +52,11 @@ public:
    bool ReadJPEGFile12 (std::ifstream *fp, void *image_buffer, int &statesuspension );
    bool ReadJPEGFile16 (std::ifstream *fp, void *image_buffer, int &statesuspension );
 
-   void SetLength(uint32_t length) { Length = length; };
-   uint32_t GetLength()            { return Length;   };
-   void SetOffset(uint32_t offset) { Offset = offset; };
-   uint32_t GetOffset()            { return Offset;   };
-   uint8_t *GetImage()             { return pImage;   };
+   void SetLength(uint32_t length) { Length = length; }
+   uint32_t GetLength()            { return Length;   }
+   void SetOffset(uint32_t offset) { Offset = offset; }
+   uint32_t GetOffset()            { return Offset;   }
+   uint8_t *GetImage()             { return pImage;   }
 
 private:
    uint32_t Offset;