X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmHeader.cxx;h=85756a3bad2a53283b5a97d81d274af5710fb728;hb=34a471bea70a384767359164ef244ab08b1b842d;hp=ddfe7557fa01dd342c22fe941493d55ca987845f;hpb=822a234a022899ba97ad11831df13ff009eaacd0;p=gdcm.git

diff --git a/src/gdcmHeader.cxx b/src/gdcmHeader.cxx
index ddfe7557..85756a3b 100644
--- a/src/gdcmHeader.cxx
+++ b/src/gdcmHeader.cxx
@@ -1,4 +1,4 @@
-// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.cxx,v 1.115 2003/11/12 15:35:19 jpr Exp $
+// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.cxx,v 1.121 2003/12/22 12:46:16 regrain Exp $
 
 #include "gdcmHeader.h"
 
@@ -11,7 +11,14 @@
 #include <netinet/in.h>
 #endif
 #include <cctype>    // for isalpha
-#include <sstream>
+
+#ifdef GDCM_NO_ANSI_STRING_STREAM
+#  include <strstream>
+#  define  ostringstream ostrstream
+# else
+#  include <sstream>
+#endif
+
 #include "gdcmUtil.h"
 #include "gdcmTS.h"
 
@@ -40,7 +47,7 @@ void gdcmHeader::Initialise(void) {
  */
 gdcmHeader::gdcmHeader(const char *InFilename, 
                        bool exception_on_error,
-		       bool  enable_sequences ) {
+                       bool enable_sequences ) {
    if (enable_sequences)
       enableSequences = 1;
    else
@@ -72,7 +79,7 @@ gdcmHeader::gdcmHeader(bool exception_on_error) {
  * @param   exception_on_error
  * @return  
  */
- bool gdcmHeader::OpenFile(bool exception_on_error)
+FILE *gdcmHeader::OpenFile(bool exception_on_error)
   throw(gdcmFileError) {
   fp=fopen(filename.c_str(),"rb");
   if(exception_on_error) {
@@ -86,20 +93,22 @@ gdcmHeader::gdcmHeader(bool exception_on_error) {
 
     //ACR -- or DICOM with no Preamble
     if( zero == 0x0008 || zero == 0x0800 || zero == 0x0002 || zero == 0x0200)
-       return true;
+       return(fp);
+
     //DICOM
     fseek(fp, 126L, SEEK_CUR);
     char dicm[4];
     fread(dicm,  (size_t)4, (size_t)1, fp);
     if( memcmp(dicm, "DICM", 4) == 0 )
-       return true;
+       return(fp);
+
     fclose(fp);
     dbg.Verbose(0, "gdcmHeader::gdcmHeader not DICOM/ACR", filename.c_str());
   }
   else {
     dbg.Verbose(0, "gdcmHeader::gdcmHeader cannot open file", filename.c_str());
   }
-  return false;
+  return(NULL);
 }
 
 /**
@@ -646,8 +655,8 @@ void gdcmHeader::FixFoundLength(gdcmElValue * ElVal, guint32 FoundLength) {
    else if (FoundLength == 13) {
       // The following 'if' will be removed when there is no more
       // images on Creatis HDs with a 13 length for Manufacturer...
-      if ( (ElVal->GetGroup() != 0x0008) &&  
-           ( (ElVal->GetElement() != 0x0070) || (ElVal->GetElement() != 0x0080) ) ) {
+      if ( (ElVal->GetGroup() != 0x0008) ||  
+           ( (ElVal->GetElement() != 0x0070) && (ElVal->GetElement() != 0x0080) ) ) {
       // end of remove area
          FoundLength =10;
 	 ElVal->SetReadLength(10); // a bug is to be fixed
@@ -739,7 +748,7 @@ void gdcmHeader::FixFoundLength(gdcmElValue * ElVal, guint32 FoundLength) {
    std::string  vr = ElVal->GetVR();
    guint16 length16;
    if( (element == 0x0010) && (group == 0x7fe0) ) {
-      dbg.SetDebug(0);
+      dbg.SetDebug(-1);
       dbg.Verbose(2, "gdcmHeader::FindLength: ",
                      "we reached 7fe0 0010");
    }   
@@ -1012,6 +1021,9 @@ void gdcmHeader::LoadElementValue(gdcmElValue * ElVal) {
             }
          }
       }					
+#ifdef GDCM_NO_ANSI_STRING_STREAM
+      s << std::ends; // to avoid oddities on Solaris
+#endif //GDCM_NO_ANSI_STRING_STREAM
       ElVal->SetValue(s.str());
       return;	
    }
@@ -1720,6 +1732,16 @@ void gdcmHeader::ParseHeader(bool exception_on_error) throw(gdcmFormatError) {
    }
 }
 
+/**
+ * \ingroup gdcmHeader
+ * \brief  
+ * @return 
+ */
+FileType gdcmHeader::GetFileType(void)
+{
+   return(filetype);
+}
+
 /**
  * \ingroup gdcmHeader
  * \brief  This predicate, based on hopefully reasonable heuristics,
@@ -1791,7 +1813,7 @@ void gdcmHeader::LoadElements(void) {
    //     LoadElementValue(tag->second);
    //}
    
-     for (std::list<gdcmElValue*>::iterator i = GetListElem().begin();  
+     for (ListTag::iterator i = GetListElem().begin();  
 	   i != GetListElem().end();
 	   ++i){
         LoadElementValue(*i);   
@@ -1902,16 +1924,12 @@ void * gdcmHeader::LoadElementVoidArea(guint16 Group, guint16 Elem) {
    int l=Element->GetLength();
    void * a = malloc(l);
    if(!a) {
-   	std::cout << "Big Broblem (LoadElementVoidArea, malloc) " 
-   	          << std::hex << Group << " " << Elem << std::endl;
    	return NULL;
    }  
    /* int res = */ PubElValSet.SetVoidAreaByNumber(a, Group, Elem);
    // TODO check the result 
    size_t l2 = fread(a, 1, l ,fp);
    if(l != l2) {
-   	std::cout << "Big Broblem (LoadElementVoidArea, fread) " 
-   	          << std::hex << Group << " " << Elem << std::endl;
    	free(a);
    	return NULL;
    }
@@ -2133,8 +2151,6 @@ std::string gdcmHeader::GetPixelType(void) {
    if (Signed == "0")
       Signed = std::string("U");
    else
-
-std::cout << "GetPixelType : " << BitsAlloc + Signed << std::endl;
       Signed = std::string("S");
 
    return( BitsAlloc + Signed);
@@ -2236,7 +2252,7 @@ int gdcmHeader::GetLUTNbits(void) {
   * @return Lookup Table RGBA
   */ 
   
-void * gdcmHeader::GetLUTRGBA(void) {
+unsigned char * gdcmHeader::GetLUTRGBA(void) {
 // Not so easy : see 
 // http://www.barre.nom.fr/medical/dicom2/limitations.html#Color%20Lookup%20Tables
 // and  OT-PAL-8-face.dcm
@@ -2359,3 +2375,32 @@ void * gdcmHeader::GetLUTRGBA(void) {
   return(LUTRGBA);   
 } 
  
+/////////////////////////////////////////////////////////////////
+/**
+ * \ingroup   gdcmFile
+ * \brief Sets the Pixel Area size in the Header
+ *        --> not-for-rats function
+ * 
+ * \warning WARNING doit-etre etre publique ? 
+ * TODO : y aurait il un inconvenient à fusionner ces 2 fonctions
+ *
+ * @param ImageDataSize new Pixel Area Size
+ *        warning : nothing else is checked
+ */
+
+void gdcmHeader::SetImageDataSize(size_t ImageDataSize) {
+   std::string content1;
+   char car[20];	
+   // Assumes ElValue (0x7fe0, 0x0010) exists ...	
+   sprintf(car,"%d",ImageDataSize);
+ 
+   gdcmElValue *a = GetElValueByNumber(0x7fe0, 0x0010);
+   a->SetLength(ImageDataSize);
+ 		
+   ImageDataSize+=8;
+   sprintf(car,"%d",ImageDataSize);
+   content1=car;	
+   SetPubElValByNumber(content1, 0x7fe0, 0x0000);
+}
+
+