#include "gdcmFile.h"
#include "gdcmUtil.h"
-
-
-// TODO : remove DEBUG
-#define DEBUG 0
-
-
-#include "iddcmjpeg.h"
+#include "iddcmjpeg.h" // for the 'LibIDO' Jpeg LossLess
using namespace std;
+#define str2num(str, typeNum) *((typeNum *)(str))
+
/////////////////////////////////////////////////////////////////
/**
* \ingroup gdcmFile
nb = atoi(str_nb.c_str() );
if (nb == 12) nb =16;
}
- lgrTotale = GetXSize() * GetYSize() * GetZSize() * (nb/8)* GetSamplesPerPixel();;
+ lgrTotale = GetXSize() * GetYSize() * GetZSize() * (nb/8)* GetSamplesPerPixel();
+
+ string str_PhotometricInterpretation = gdcmHeader::GetPubElValByNumber(0x0028,0x0004);
+ if ( str_PhotometricInterpretation == "PALETTE COLOR "
+ || str_PhotometricInterpretation == "YBR_FULL") { // --> some more to be added !!
+ lgrTotale*=3;
+ }
+
+ // remaining to check :
+ // str_PhotometricInterpretation == "YBR_FULL"
+ // str_PhotometricInterpretation == "YBR_FULL_422" (no LUT, no Palette)
+ // -->and some more !!
}
/////////////////////////////////////////////////////////////////
}
+/////////////////////////////////////////////////////////////////
+/**
+ * \ingroup gdcmFile
+ * \brief Parse pixel data from disk and *prints* the result
+ * \ For multi-fragment Jpeg files checking purpose *only*
+ * \ Allows to 'see' if the file *does* conform
+ * \ (some of them do not)
+ * \ with Dicom Part 3, Annex A (PS 3.5-2003, page 58)
+ *
+ */
+bool gdcmFile::ParsePixelData(void) {
+ if ( !OpenFile())
+ return false;
+
+ if ( fseek(fp, GetPixelOffset(), SEEK_SET) == -1 ) {
+ CloseFile();
+ return false;
+ }
+
+ if ( !IsDicomV3() ||
+ IsImplicitVRLittleEndianTransferSyntax() ||
+ IsExplicitVRLittleEndianTransferSyntax() ||
+ IsExplicitVRBigEndianTransferSyntax() ||
+ IsDeflatedExplicitVRLittleEndianTransferSyntax() ) {
+
+ printf ("gdcmFile::ParsePixelData : non JPEG File\n");
+ return 0;
+ }
+
+ int nb;
+ string str_nb=gdcmHeader::GetPubElValByNumber(0x0028,0x0100);
+ if (str_nb == "gdcm::Unfound" ) {
+ nb = 16;
+ } else {
+ nb = atoi(str_nb.c_str() );
+ if (nb == 12) nb =16;
+ }
+ int nBytes= nb/8;
+
+ //int taille = GetXSize() * GetYSize() * GetZSize() * GetSamplesPerPixel();
+ int taille = GetXSize() * GetYSize() * GetSamplesPerPixel();
+
+ printf ("Checking the Dicom-Jpeg/RLE Pixels\n");
+
+ // ------------------------------- for Parsing : Position on begining of Jpeg Pixels
+ guint16 ItemTagGr,ItemTagEl;
+ int ln;
+ long ftellRes;
+ char * destination = NULL;
+ ftellRes=ftell(fp);
+ fread(&ItemTagGr,2,1,fp); // Reading (fffe) : Basic Offset Table Item Tag Gr
+ fread(&ItemTagEl,2,1,fp); // Reading (e000) : Basic Offset Table Item Tag El
+ if(GetSwapCode()) {
+ ItemTagGr=SwapShort(ItemTagGr);
+ ItemTagEl=SwapShort(ItemTagEl);
+ }
+ printf ("at %x : ItemTag (should be fffe,e000): %04x,%04x\n",
+ ftellRes,ItemTagGr,ItemTagEl );
+ ftellRes=ftell(fp);
+ fread(&ln,4,1,fp);
+ if(GetSwapCode())
+ ln=SwapLong(ln); // Basic Offset Table Item Lentgh
+ printf("at %x : Basic Offset Table Item Lentgh (??) %d x(%08x)\n",
+ ftellRes,ln,ln);
+ if (ln != 0) {
+ // What is it used for ??
+ char * BasicOffsetTableItemValue= (char *)malloc(ln+1);
+ fread(BasicOffsetTableItemValue,ln,1,fp);
+ guint32 a;
+ for (int i=0;i<ln;i+=4){
+ a=str2num(&BasicOffsetTableItemValue[i],guint32);
+ printf(" x(%08x) %d\n",a,a);
+ }
+ }
+
+ ftellRes=ftell(fp);
+ fread(&ItemTagGr,2,1,fp); // Reading (fffe) : Item Tag Gr
+ fread(&ItemTagEl,2,1,fp); // Reading (e000) : Item Tag El
+ if(GetSwapCode()) {
+ ItemTagGr=SwapShort(ItemTagGr);
+ ItemTagEl=SwapShort(ItemTagEl);
+ }
+ printf ("at %x : ItemTag (should be fffe,e000 or e0dd): %04x,%04x\n",
+ ftellRes,ItemTagGr,ItemTagEl );
+
+ while ( ( ItemTagGr == 0xfffe) && (ItemTagEl != 0xe0dd) ) { // Parse fragments
+
+ ftellRes=ftell(fp);
+ fread(&ln,4,1,fp);
+ if(GetSwapCode())
+ ln=SwapLong(ln); // length
+ printf(" at %x : fragment length %d x(%08x)\n",
+ ftellRes, ln,ln);
+
+ destination += taille * nBytes; // location in user's memory
+
+ printf (" Destination will be x(%x) = %d \n",
+ destination,destination );
+
+ fseek(fp,ln,SEEK_CUR); // skipping (not reading) fragment pixels
+
+ ftellRes=ftell(fp);
+ fread(&ItemTagGr,2,1,fp); // Reading (fffe) : Item Tag Gr
+ fread(&ItemTagEl,2,1,fp); // Reading (e000) : Item Tag El
+ if(GetSwapCode()) {
+ ItemTagGr=SwapShort(ItemTagGr);
+ ItemTagEl=SwapShort(ItemTagEl);
+ }
+ printf ("at %x : ItemTag (should be fffe,e000 or e0dd): %04x,%04x\n",
+ ftellRes,ItemTagGr,ItemTagEl );
+
+
+ }
+ return 1;
+}
+
/////////////////////////////////////////////////////////////////
/**
* \ingroup gdcmFile
* \brief Read pixel data from disk (optionaly decompressing) into the
* caller specified memory location.
- * @param destination Where the pixel data should be stored.
+ * @param destination where the pixel data should be stored.
*
*/
bool gdcmFile::ReadPixelData(void* destination) {
+
if ( !OpenFile())
return false;
- printf("GetPixelOffset() %d\n",GetPixelOffset() );
-
if ( fseek(fp, GetPixelOffset(), SEEK_SET) == -1 ) {
CloseFile();
return false;
}
+
+// ------------------------------- Uncompressed File
if ( !IsDicomV3() ||
IsImplicitVRLittleEndianTransferSyntax() ||
return true;
}
}
-
- // ------------------------------- Position on begining of Jpeg Pixels
-
- int ln;
- fseek(fp,4,SEEK_CUR);
- fread(&ln,4,1,fp);
- if(GetSwapCode())
- ln=SwapLong(ln);
- if (DEBUG)
- printf ("ln %d\n",ln);
- fseek(fp,ln,SEEK_CUR);
- fseek(fp,4,SEEK_CUR);
- fread(&ln,4,1,fp);
- if(GetSwapCode())
- ln=SwapLong(ln);
- if (DEBUG)
- printf ("ln image comprimée %d\n",ln);
-
-
- // ------------------------------- JPEG LossLess : call to Jpeg Libido
-
- if (IsJPEGLossless()) {
-
- ClbJpeg* jpg = _IdDcmJpegRead(fp);
- if(jpg == NULL) {
- CloseFile();
- return false;
- }
- // Gros soucis :
- // jpg->DataImg est alloue en int32 systematiquement :
- // il faut le copier pixel par pixel dans destination ...
- // ... qui est un void *
- // --> du CAST sportif a faire ...
-
- // memcpy(destination,jpg->DataImg,lgrTotale);
-
- // Bon ...
- // ... y'a p't etre + ruse (?)
-
+
+ // ----------------------------- JPEG Compressed File .
+
int nb;
string str_nb=gdcmHeader::GetPubElValByNumber(0x0028,0x0100);
if (str_nb == "gdcm::Unfound" ) {
if (nb == 12) nb =16;
}
int nBytes= nb/8;
- int * dataJpg = jpg->DataImg;
- int taille = GetXSize() * GetYSize() * GetZSize() * GetSamplesPerPixel();
+
+ //int taille = GetXSize() * GetYSize() * GetZSize() * GetSamplesPerPixel();
+ int taille = GetXSize() * GetYSize() * GetSamplesPerPixel();
- switch (nBytes) {
+
+ // ------------------------------- JPEG LossLess : call to Jpeg Libido
+
+ if (IsJPEGLossless() && GetZSize() == 1) {
+
+ int ln; // Position on begining of Jpeg Pixels
+ fseek(fp,4,SEEK_CUR); // skipping (fffe,e000) : Basic Offset Table Item
+ fread(&ln,4,1,fp);
+ if(GetSwapCode())
+ ln=SwapLong(ln); // Item length
+ fseek(fp,ln,SEEK_CUR); // skipping Basic Offset Table ('ln' bytes)
+ fseek(fp,4,SEEK_CUR); // skipping (fffe,e000) : First fragment Item Tag
+ fread(&ln,4,1,fp); // First fragment length (just to know)
+ if(GetSwapCode())
+ ln=SwapLong(ln);
+
+ ClbJpeg* jpg = _IdDcmJpegRead(fp); // TODO : find a 'full' one.
+ // (We use the LibIDO one :-(
+ if(jpg == NULL) {
+ CloseFile();
+ return false;
+ }
+ int * dataJpg = jpg->DataImg;
+ switch (nBytes) {
case 1:
{
unsigned short *dest = (unsigned short *)destination;
for (int i=0; i<taille; i++) {
- if (DEBUG)
- if (*(dataJpg +i) >255) printf("data %d\n",*(dataJpg +i) );
- *((unsigned char *)dest+i) = *(dataJpg +i);
+ *((unsigned char *)dest+i) = *(dataJpg +i);
}
}
break;
case 2:
{
unsigned short *dest = (unsigned short *)destination;
-
- // etonnant (?)
- // la ligne commentee ci-dessous fait passer l'exec de 0.15 sec a 5.5 sec
- // pour la meme image 512*512 ...
- // optimiseur pas mis en oeuvre (?)
- //for (int i=0; i<GetXSize() * GetYSize() * GetZSize(); i++)
-
- for (int i=0; i<taille; i++) {
+ for (int i=0; i<taille; i++) {
*((unsigned short *)dest+i) = *(dataJpg +i);
}
}
- break;
-
- case 4:
- {
- unsigned int *dest=(unsigned int *)destination;
- for (int i=0;i<taille; i++) {
- *((unsigned int *)dest+i) = *(dataJpg +i);
- }
- }
- break;
+ break;
}
-
_IdDcmJpegFree (jpg);
return true;
}
// ------------------------------- JPEG Lossy : call to IJG 6b
-
- // TODO : faire qq chose d'intelligent pour limiter
- // la duplication du code JPEG <bits=8 / bits=12>
- // TODO : eplucher icelui pour traiter *egalement* bits=16
- int nBS;
- if ((nBS = GetBitsStored()) != 12) {
- printf("Sorry, Bits Stored = %d not yet taken into account\n",nBS);
- return false;
+
+ long fragmentBegining; // for ftell, fseek
+
+ bool a=0, b=0;
+
+ a = gdcmHeader::IsRLELossLessTransferSyntax();
+ if (!a)
+ bool b = gdcmHeader::IsJPEG2000();
+
+ bool res;
+ guint16 ItemTagGr,ItemTagEl;
+ int ln; // Position on begining of Jpeg Pixels
+
+ fread(&ItemTagGr,2,1,fp); // Reading (fffe) : Item Tag Gr
+ fread(&ItemTagEl,2,1,fp); // Reading (e000) : Item Tag El
+ if(GetSwapCode()) {
+ ItemTagGr=SwapShort(ItemTagGr);
+ ItemTagEl=SwapShort(ItemTagEl);
+ }
+ fread(&ln,4,1,fp);
+ if(GetSwapCode())
+ ln=SwapLong(ln); // Basic Offset Table Item length
+
+ if (ln != 0) {
+ // What is it used for ?!?
+ char *BasicOffsetTableItemValue = (char *)malloc(ln+1);
+ fread(BasicOffsetTableItemValue,ln,1,fp);
}
- int res = gdcm_read_JPEG_file (destination);
- if (DEBUG)
- printf ("res : %d\n",res);
+ // first Fragment initialisation
+ fread(&ItemTagGr,2,1,fp); // Reading (fffe) : Item Tag Gr
+ fread(&ItemTagEl,2,1,fp); // Reading (e000) : Item Tag El
+ if(GetSwapCode()) {
+ ItemTagGr=SwapShort(ItemTagGr);
+ ItemTagEl=SwapShort(ItemTagEl);
+ }
+
+ // parsing fragments until Sequence Delim. Tag found
+ //unsigned short *dest = (unsigned short *)destination;
+
+ while ( ( ItemTagGr == 0xfffe) && (ItemTagEl != 0xe0dd) ) {
+ fread(&ln,4,1,fp);
+ if(GetSwapCode())
+ ln=SwapLong(ln); // Fragment Item length
+
+ // FIXME : multi fragments
+ fragmentBegining=ftell(fp);
+
+ if (a)
+ res = (bool)gdcm_read_RLE_file (destination); // Reading Fragment pixels
+ else if (b)
+ res = (bool)gdcm_read_JPEG2000_file (destination); // Reading Fragment pixels
+
+ else if (IsJPEGLossless()) { // ------------- call to LibIDO Jpeg for each Frame/fragment
+
+ // Warning : Works only if there is one fragment per frame
+ // (Or a single fragment for the multiframe file)
+ ClbJpeg* jpg = _IdDcmJpegRead(fp); // TODO : find a 'full' one.
+ // (We use the LibIDO one :-(
+ if(jpg == NULL) {
+ CloseFile();
+ return false;
+ }
+ int * dataJpg = jpg->DataImg;
+ unsigned short *dest = (unsigned short *)destination;
+ switch (nBytes) {
+ case 1:
+ {
+ for (int i=0; i<taille; i++) {
+ *((unsigned char *)dest+i) = *(dataJpg +i);
+ }
+ break;
+ }
+
+ case 2:
+ {
+ for (int i=0; i<taille; i++) {
+ *((unsigned short *)dest+i) = *(dataJpg +i);
+ }
+ break;
+ }
+ }
+ _IdDcmJpegFree (jpg);
+
+ } // ------------------------------------- endif (IsJPEGLossless())
+
+ else
+ if (GetBitsStored() == 8) {
+ res = (bool)gdcm_read_JPEG_file (destination); // Reading Fragment pixels
+ } else {
+ res = (bool)gdcm_read_JPEG_file12 (destination);// Reading Fragment pixels
+ }
+
+ if (!res) break;
+
+ // FIXME : will work only when each fragment corresponds to a Frame :-(
+
+ (char *) destination += taille * nBytes; // location in user's memory
+ // for next fragment (if any)
+ // TODO : find a suitable file (multifragment/single Frame Jpeg file) to check
+
+ fseek(fp,fragmentBegining,SEEK_SET); // To be sure we start
+ fseek(fp,ln,SEEK_CUR); // at the begining of next fragment
+
+ ItemTagGr = ItemTagEl =0;
+ fread(&ItemTagGr,2,1,fp); // Reading (fffe) : Item Tag Gr
+ fread(&ItemTagEl,2,1,fp); // Reading (e000) : Item Tag El
+ if(GetSwapCode()) {
+ ItemTagGr=SwapShort(ItemTagGr);
+ ItemTagEl=SwapShort(ItemTagEl);
+ }
+
+ //(char *) destination += taille * nBytes;
+ //cout << "destination" << destination << "\n";
+ }
+
return res;
-
}
/**
* \ingroup gdcmFile
* \brief Allocates necessary memory, copies the pixel data
* (image[s]/volume[s]) to newly allocated zone.
- * @return Pointer to newly allocated pixel data.
+ * @return Pointer to newly allocated pixel data.
+ * \ NULL if alloc fails
*/
void * gdcmFile::GetImageData (void) {
PixelData = (void *) malloc(lgrTotale);
- GetImageDataIntoVector(PixelData, lgrTotale);
+ if (PixelData)
+ GetImageDataIntoVector(PixelData, lgrTotale);
return(PixelData);
}
return (size_t)0;
}
- (void)ReadPixelData(destination);
+ (void)ReadPixelData(destination);
// Nombre de Bits Alloues pour le stockage d'un Pixel
- str_nb = GetPubElValByNumber(0x0028,0x0100);
- if (str_nb == "gdcm::Unfound" ) {
- nb = 16;
- } else {
- nb = atoi(str_nb.c_str() );
- }
+ str_nb = GetPubElValByNumber(0x0028,0x0100);
+ if (str_nb == "gdcm::Unfound" ) {
+ nb = 16;
+ } else {
+ nb = atoi(str_nb.c_str() );
+ }
// Nombre de Bits Utilises
- str_nbu=GetPubElValByNumber(0x0028,0x0101);
- if (str_nbu == "gdcm::Unfound" ) {
- nbu = nb;
- } else {
- nbu = atoi(str_nbu.c_str() );
- }
+ str_nbu=GetPubElValByNumber(0x0028,0x0101);
+ if (str_nbu == "gdcm::Unfound" ) {
+ nbu = nb;
+ } else {
+ nbu = atoi(str_nbu.c_str() );
+ }
// Position du Bit de Poids Fort
- str_highBit=GetPubElValByNumber(0x0028,0x0102);
- if (str_highBit == "gdcm::Unfound" ) {
- highBit = nb - 1;
- } else {
- highBit = atoi(str_highBit.c_str() );
- }
+ str_highBit=GetPubElValByNumber(0x0028,0x0102);
+ if (str_highBit == "gdcm::Unfound" ) {
+ highBit = nb - 1;
+ } else {
+ highBit = atoi(str_highBit.c_str() );
+ }
// Signe des Pixels
- str_signe=GetPubElValByNumber(0x0028,0x0103);
- if (str_signe == "gdcm::Unfound" ) {
- signe = 1;
- } else {
- signe = atoi(str_signe.c_str() );
- }
-
- // On remet les Octets dans le bon ordre si besoin est
+ str_signe=GetPubElValByNumber(0x0028,0x0103);
+ if (str_signe == "gdcm::Unfound" ) {
+ signe = 1;
+ } else {
+ signe = atoi(str_signe.c_str() );
+ }
+
+ // re arange bytes inside the integer
if (nb != 8)
SwapZone(destination, GetSwapCode(), lgrTotale, nb);
- // On remet les Bits des Octets dans le bon ordre si besoin est
+ // re arange bits inside the bytes
if (nbu != nb){
int l = (int)lgrTotale / (nb/8);
if (nb == 16) {
dbg.Verbose(0, "gdcmFile::GetImageDataIntoVector: wierd image");
return (size_t)0;
}
+ }
+
+ // Try to deal with the color
+ // --------------------------
+
+ string str_PhotometricInterpretation = gdcmHeader::GetPubElValByNumber(0x0028,0x0004);
+
+ if ( (str_PhotometricInterpretation == "MONOCHROME1 ")
+ || (str_PhotometricInterpretation == "MONOCHROME2 ")
+ || (str_PhotometricInterpretation == "RGB")) {
+ return lgrTotale;
}
+
+ switch ( GetPlanarConfiguration() ) {
+ case 0:
+ // Pixels are already RGB
+ break;
+
+ case 1:
+ // need to make RGB Pixels from Planes R,G,B
+ {
+ int l = lgrTotale/3 ;
+
+ char * a = (char *)destination;
+ char * b = a + l;
+ char * c = b + l;
+ char * newDest = (char*) malloc(lgrTotale);
+ // TODO :
+ // any trick not to have to allocate temporary buffer is welcome ...
+ char *x = newDest;
+ for (int j=0;j<l; j++) {
+ *(x++) = *(a++);
+ *(x++) = *(b++);
+ *(x++) = *(c++);
+ }
+ memmove(destination,newDest,lgrTotale);
+ free(newDest);
+ // now, it's an RGB image
+ string spp = "3";
+ gdcmHeader::SetPubElValByNumber(spp,0x0028,0x0002);
+ string rgb="RGB";
+ gdcmHeader::SetPubElValByNumber(rgb,0x0028,0x0004);
+ break;
+ }
+
+ case 2:
+ // from Lut R + Lut G + Lut B
+
+ // we no longer use gdcmHeader::GetLUTRGB
+ // since a lot of images have wrong info
+ // in the Lookup Table Descriptors (0028,1101),...
+ {
+ unsigned char *lutR =(unsigned char *)GetPubElValVoidAreaByNumber(0x0028,0x1201);
+ unsigned char *lutG =(unsigned char *)GetPubElValVoidAreaByNumber(0x0028,0x1202);
+ unsigned char *lutB =(unsigned char *)GetPubElValVoidAreaByNumber(0x0028,0x1203);
+
+ if (lutR && lutG && lutB ) { // need to make RGB Pixels
+ // from grey Pixels
+ // and Lut R,Lut G,Lut B
+ unsigned char * newDest = (unsigned char*) malloc(lgrTotale);
+ int l = lgrTotale/3;
+ memmove(newDest, destination, l);// move Gray pixels to temp area
+
+ unsigned char * x = newDest;
+ unsigned char * a = (unsigned char *)destination;
+ int j;
+ for (int i=0;i<l; i++) {
+ j=newDest[i]*2; // Who can explain *why* we have to skip bytes
+ *a++ = lutR[j];
+ *a++ = lutG[j];
+ *a++ = lutB[j];
+ }
+ free(newDest);
+
+ // now, it's an RGB image
+ string spp = "3";
+ gdcmHeader::SetPubElValByNumber(spp,0x0028,0x0002);
+ string rgb="RGB";
+ gdcmHeader::SetPubElValByNumber(rgb,0x0028,0x0004);
+
+ } else { // need to make RGB Pixels (?)
+ // from grey Pixels (?!)
+ // and Gray Lut (!?!)
+ unsigned char *lutGray =(unsigned char *)GetPubElValVoidAreaByNumber(0x0028,0x1200);
+ // Well . I'll wait till I find such an image
+ }
+ break;
+ }
+ }
+
return lgrTotale;
}
-
//
// Je laisse le code integral, au cas ça puisse etre reutilise ailleurs
//
+/**
+ * \ingroup gdcmFile
+ * \brief Swap the bytes, according to swap code.
+ * \warning not end user intended
+ * @param im area to deal with
+ * @param swap swap code
+ * @param lgr Area Length
+ * @param nb Pixels Bit number
+ */
+
void gdcmFile::SwapZone(void* im, int swap, int lgr, int nb) {
guint32 s32;
guint16 fort,faible;
int i;
-if(nb == 16)
-
- switch(swap) {
- case 0:
- case 12:
- case 1234:
- break;
+if(nb == 16)
+ switch(swap) {
+ case 0:
+ case 12:
+ case 1234:
+ break;
- case 21:
- case 3412:
- case 2143:
- case 4321:
-
- for(i=0;i<lgr;i++)
- ((unsigned short int*)im)[i]= ((((unsigned short int*)im)[i])>>8)
- | ((((unsigned short int*)im)[i])<<8);
- break;
+ case 21:
+ case 3412:
+ case 2143:
+ case 4321:
+
+ for(i=0;i<lgr;i++)
+ ((unsigned short int*)im)[i]= ((((unsigned short int*)im)[i])>>8)
+ | ((((unsigned short int*)im)[i])<<8);
+ break;
- default:
- printf("valeur de SWAP (16 bits) non autorisee : %d\n", swap);
- }
+ default:
+ printf("valeur de SWAP (16 bits) not allowed : %d\n", swap);
+ }
if( nb == 32 )
+ switch (swap) {
+ case 0:
+ case 1234:
+ break;
- switch (swap) {
- case 0:
- case 1234:
- break;
-
- case 4321:
- for(i=0;i<lgr;i++) {
- faible= ((unsigned long int*)im)[i]&0x0000ffff; /* 4321 */
- fort =((unsigned long int*)im)[i]>>16;
- fort= (fort>>8) | (fort<<8);
- faible=(faible>>8) | (faible<<8);
- s32=faible;
- ((unsigned long int*)im)[i]=(s32<<16)|fort;
- }
- break;
-
- case 2143:
- for(i=0;i<lgr;i++) {
- faible= ((unsigned long int*)im)[i]&0x0000ffff; /* 2143 */
- fort=((unsigned long int*)im)[i]>>16;
- fort= (fort>>8) | (fort<<8);
- faible=(faible>>8) | (faible<<8);
- s32=fort;
- ((unsigned long int*)im)[i]=(s32<<16)|faible;
- }
- break;
+ case 4321:
+ for(i=0;i<lgr;i++) {
+ faible= ((unsigned long int*)im)[i]&0x0000ffff; /* 4321 */
+ fort =((unsigned long int*)im)[i]>>16;
+ fort= (fort>>8) | (fort<<8);
+ faible=(faible>>8) | (faible<<8);
+ s32=faible;
+ ((unsigned long int*)im)[i]=(s32<<16)|fort;
+ }
+ break;
+
+ case 2143:
+ for(i=0;i<lgr;i++) {
+ faible= ((unsigned long int*)im)[i]&0x0000ffff; /* 2143 */
+ fort=((unsigned long int*)im)[i]>>16;
+ fort= (fort>>8) | (fort<<8);
+ faible=(faible>>8) | (faible<<8);
+ s32=fort;
+ ((unsigned long int*)im)[i]=(s32<<16)|faible;
+ }
+ break;
- case 3412:
- for(i=0;i<lgr;i++) {
- faible= ((unsigned long int*)im)[i]&0x0000ffff; /* 3412 */
- fort=((unsigned long int*)im)[i]>>16;
- s32=faible;
- ((unsigned long int*)im)[i]=(s32<<16)|fort;
- }
- break;
+ case 3412:
+ for(i=0;i<lgr;i++) {
+ faible= ((unsigned long int*)im)[i]&0x0000ffff; /* 3412 */
+ fort=((unsigned long int*)im)[i]>>16;
+ s32=faible;
+ ((unsigned long int*)im)[i]=(s32<<16)|fort;
+ }
+ break;
- default:
- printf("valeur de SWAP (32 bits) non autorisee : %d\n", swap);
- }
+ default:
+ printf(" SWAP value (32 bits) not allowed : %d\n", swap);
+ }
return;
}
/**
* \ingroup gdcmFile
* \brief TODO JPR
- * \warning doit-etre etre publique ? FIXME JPR
+ * \warning doit-etre etre publique ?
* TODO : y a-t-il un inconvenient à fusioner ces 2 fonctions
*
- * @param inData TODO JPR
- * @param ExpectedSize TODO JPR
+ * @param inData
+ * @param ExpectedSize
*
- * @return TODO JPR
+ * @return integer acts as a boolean
*/
int gdcmFile::SetImageData(void * inData, size_t ExpectedSize) {
SetImageDataSize(ExpectedSize);
PixelData = inData;
lgrTotale = ExpectedSize;
-
-
return(1);
}
/////////////////////////////////////////////////////////////////
/**
* \ingroup gdcmFile
- * \brief TODO JPR
- * \
- * \warning WARNING doit-etre etre publique ? FIXME JPR
+ * \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 TODO JPR
- *
+ * @param ImageDataSize new Pixel Area Size
+ * warning : nothing else is checked
*/
void gdcmFile::SetImageDataSize(size_t ImageDataSize) {
-
- string content1;
- char car[20];
-
- // suppose que le ElValue (0x7fe0, 0x0010) existe ...
-
- sprintf(car,"%d",ImageDataSize);
+ string content1;
+ char car[20];
+ // Assumes ElValue (0x7fe0, 0x0010) exists ...
+ sprintf(car,"%d",ImageDataSize);
- gdcmElValue*a = GetElValueByNumber(0x7fe0, 0x0010);
- a->SetLength(ImageDataSize);
+ gdcmElValue*a = GetElValueByNumber(0x7fe0, 0x0010);
+ a->SetLength(ImageDataSize);
- ImageDataSize+=8;
- sprintf(car,"%d",ImageDataSize);
- content1=car;
- SetPubElValByNumber(content1, 0x7fe0, 0x0000);
+ ImageDataSize+=8;
+ sprintf(car,"%d",ImageDataSize);
+ content1=car;
+ SetPubElValByNumber(content1, 0x7fe0, 0x0000);
}
* \brief Ecrit sur disque les pixels d'UNE image
* Aucun test n'est fait sur l'"Endiannerie" du processeur.
* Ca sera à l'utilisateur d'appeler son Reader correctement
- * (Equivalent a IdImaWriteRawFile) FIXME JPR
+ * (Equivalent a IdImaWriteRawFile)
*
- * @param nomFichier TODO JPR
- *
- * @return TODO JPR
+ * @param fileName
+ * @return
*/
-int gdcmFile::WriteRawData (string nomFichier) {
-
- FILE * fp1;
- fp1 = fopen(nomFichier.c_str(),"wb");
- if (fp1 == NULL) {
- printf("Echec ouverture (ecriture) Fichier [%s] \n",nomFichier.c_str());
- return (0);
- }
-
- fwrite (PixelData,lgrTotale, 1, fp1);
- fclose (fp1);
- return(1);
+int gdcmFile::WriteRawData (string fileName) {
+ FILE * fp1;
+ fp1 = fopen(fileName.c_str(),"wb");
+ if (fp1 == NULL) {
+ printf("Echec ouverture (ecriture) Fichier [%s] \n",fileName.c_str());
+ return (0);
+ }
+ fwrite (PixelData,lgrTotale, 1, fp1);
+ fclose (fp1);
+ return(1);
}
-
-
/////////////////////////////////////////////////////////////////
/**
* \ingroup gdcmFile
* \brief Ecrit sur disque UNE image Dicom
* Aucun test n'est fait sur l'"Endiannerie" du processeur.
* Ca fonctionnera correctement (?) sur processeur Intel
- * (Equivalent a IdDcmWrite) FIXME JPR
- *
- * @param nomFichier TODO JPR
+ * (Equivalent a IdDcmWrite)
*
- * @return TODO JPR
+ * @param fileName
+ * @return int acts as a boolean
*/
-int gdcmFile::WriteDcmImplVR (string nomFichier) {
- return WriteBase(nomFichier, ImplicitVR);
+int gdcmFile::WriteDcmImplVR (string fileName) {
+ return WriteBase(fileName, ImplicitVR);
}
/////////////////////////////////////////////////////////////////
/**
* \ingroup gdcmFile
- *
- * @param nomFichier TODO JPR
- *
- * @return TODO JPR
+ * \brief
+ * @param fileName
+ * @return int acts as a boolean
*/
-int gdcmFile::WriteDcmImplVR (const char* nomFichier) {
- return WriteDcmImplVR (string (nomFichier));
+int gdcmFile::WriteDcmImplVR (const char* fileName) {
+ return WriteDcmImplVR (string (fileName));
}
/////////////////////////////////////////////////////////////////
/**
* \ingroup gdcmFile
- *
- * @param nomFichier TODO JPR
- *
- * @return TODO JPR
+ * \brief
+ * @param fileName
+ * @return int acts as a boolean
*/
-int gdcmFile::WriteDcmExplVR (string nomFichier) {
- return WriteBase(nomFichier, ExplicitVR);
+int gdcmFile::WriteDcmExplVR (string fileName) {
+ return WriteBase(fileName, ExplicitVR);
}
/////////////////////////////////////////////////////////////////
* Ca fonctionnera correctement (?) sur processeur Intel
* (Equivalent a IdDcmWrite)
*
- * @param nomFichier TODO JPR
- *
- * @return TODO JPR
+ * @param fileName
+ * @return int acts as a boolean
*/
-int gdcmFile::WriteAcr (string nomFichier) {
- return WriteBase(nomFichier, ACR);
+int gdcmFile::WriteAcr (string fileName) {
+ return WriteBase(fileName, ACR);
}
/////////////////////////////////////////////////////////////////
/**
* \ingroup gdcmFile
*
- * @param FileName TODO JPR
- * @param type TODO JPR
+ * @param FileName
+ * @param type
*
- * @return TODO JPR
+ * @return int acts as a boolean
*/
int gdcmFile::WriteBase (string FileName, FileType type) {
if ( (type == ImplicitVR) || (type == ExplicitVR) ) {
char * filePreamble;
- // Ecriture Dicom File Preamble
+ // writing Dicom File Preamble
filePreamble=(char*)calloc(128,1);
fwrite(filePreamble,128,1,fp1);
fwrite("DICM",4,1,fp1);
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff