ENH: First pass at simplifying the JPEG stuff.

[gdcm.git] / src / gdcmFile.cxx

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index c6638963c2eb66e21c57280699165230af740886..593a0998dddb740408e43b48807ec1b358e7aefa 100644 (file)
--- a/src/gdcmFile.cxx
+++ b/src/gdcmFile.cxx
@@ -1,10 +1,10 @@
-  /*=========================================================================
+/*=========================================================================
                                                                                 
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/11 11:37:13 $
-  Version:   $Revision: 1.189 $
+  Date:      $Date: 2005/01/16 04:50:42 $
+  Version:   $Revision: 1.193 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -17,6 +17,8 @@
 =========================================================================*/
 
 #include "gdcmFile.h"
+#include "gdcmGlobal.h"
+#include "gdcmTS.h"
 #include "gdcmDocument.h"
 #include "gdcmDebug.h"
 #include "gdcmUtil.h"
@@ -125,7 +127,7 @@ File::~File()
 
 //-----------------------------------------------------------------------------
 // Print
-void File::Print(std::ostream &os)
+void File::Print(std::ostream &os, std::string const &)
 {
    HeaderInternal->SetPrintLevel(PrintLevel);
    HeaderInternal->Print(os);
@@ -138,9 +140,10 @@ void File::Print(std::ostream &os)
 // Public
 /**
  * \brief   Get the size of the image data
- * 
  *          If the image can be RGB (with a lut or by default), the size 
  *          corresponds to the RGB image
+ *         (use GetImageDataRawSize if you want to be sure to get *only*
+ *          the size of the pixels)
  * @return  The image size
  */
 size_t File::GetImageDataSize()
@@ -155,9 +158,9 @@ size_t File::GetImageDataSize()
 
 /**
  * \brief   Get the size of the image data
- * 
- *          If the image can be RGB by transformation in a LUT, this
- *          transformation isn't considered
+ *          If the image could be converted to RGB using a LUT, 
+ *          this transformation is not taken into account by GetImageDataRawSize
+ *          (use GetImageDataSize if you wish)
  * @return  The raw image size
  */
 size_t File::GetImageDataRawSize()
@@ -777,7 +780,7 @@ void File::SetWriteFileTypeToACR()
 void File::SetWriteFileTypeToExplicitVR()
 {
    std::string ts = Util::DicomString( 
-      Document::GetTransferSyntaxValue(ExplicitVRLittleEndian).c_str() );
+      Global::GetTS()->GetSpecialTransferSyntax(TS::ExplicitVRLittleEndian) );
 
    ValEntry *tss = CopyValEntry(0x0002,0x0010);
    tss->SetValue(ts);
@@ -788,7 +791,7 @@ void File::SetWriteFileTypeToExplicitVR()
 void File::SetWriteFileTypeToImplicitVR()
 {
    std::string ts = Util::DicomString(
-      Document::GetTransferSyntaxValue(ImplicitVRLittleEndian).c_str() );
+      Global::GetTS()->GetSpecialTransferSyntax(TS::ImplicitVRLittleEndian) );
 
    ValEntry *tss = CopyValEntry(0x0002,0x0010);
    tss->SetValue(ts);