X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.cxx;h=f72941973374dbb427afe0a31c817fa16c12c203;hb=ae10d99619e2d41f885443b28aef2387c2961213;hp=c103e111bfe3711ef8e087351dd9e4e4507d0e1d;hpb=4a0c2407ec81e041c2e43781acec4c78c83fc487;p=gdcm.git diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx index c103e111..f7294197 100644 --- a/src/gdcmFile.cxx +++ b/src/gdcmFile.cxx @@ -2,7 +2,14 @@ #include "gdcmFile.h" #include "gdcmUtil.h" + + +// TODO : remove DEBUG +#define DEBUG 0 + + #include "iddcmjpeg.h" +using namespace std; ///////////////////////////////////////////////////////////////// /** @@ -34,19 +41,16 @@ gdcmFile::gdcmFile(const char * filename) SetPixelDataSizeFromHeader(); } - -///////////////////////////////////////////////////////////////// /** * \ingroup gdcmFile * \brief calcule la longueur (in bytes) A ALLOUER pour recevoir les - * pixels de l'image + * pixels de l'image * ou DES images dans le cas d'un multiframe * ATTENTION : il ne s'agit PAS de la longueur du groupe des Pixels * (dans le cas d'images compressees, elle n'a pas de sens). * * @return longueur a allouer */ - void gdcmFile::SetPixelDataSizeFromHeader(void) { int nb; string str_nb; @@ -58,51 +62,151 @@ void gdcmFile::SetPixelDataSizeFromHeader(void) { nb = atoi(str_nb.c_str() ); if (nb == 12) nb =16; } - lgrTotale = GetXSize() * GetYSize() * GetZSize() * (nb/8); + lgrTotale = GetXSize() * GetYSize() * GetZSize() * (nb/8)* GetSamplesPerPixel();; } +///////////////////////////////////////////////////////////////// /** * \ingroup gdcmFile - * \brief Accessor + * \brief Returns the size (in bytes) of required memory to hold + * the pixel data represented in this file. + * @return The size of pixel data in bytes. */ size_t gdcmFile::GetImageDataSize(void) { return (lgrTotale); } +///////////////////////////////////////////////////////////////// /** * \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; - if ( fseek(fp, GetPixelOffset(), SEEK_SET) == -1 ) { + + printf("GetPixelOffset() %d\n",GetPixelOffset() ); + + if ( fseek(fp, GetPixelOffset(), SEEK_SET) == -1 ) { CloseFile(); return false; - } - if (IsJPEGLossless()) { - destination = _IdDcmJpegRead(fp); - } else { + } + + if ( !IsDicomV3() || + IsImplicitVRLittleEndianTransferSyntax() || + IsExplicitVRLittleEndianTransferSyntax() || + IsExplicitVRBigEndianTransferSyntax() || + IsDeflatedExplicitVRLittleEndianTransferSyntax() ) { + size_t ItemRead = fread(destination, lgrTotale, 1, fp); if ( ItemRead != 1 ) { CloseFile(); return false; + } else { + CloseFile(); + return true; } - } - CloseFile(); - 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; + } + + 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 * dataJpg = jpg->DataImg; + int taille = GetXSize() * GetYSize() * GetZSize() * GetSamplesPerPixel(); + + switch (nBytes) { + case 1: + { + unsigned short *dest = (unsigned short *)destination; + for (int i=0; i + // 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; + } + + int res = gdcm_read_JPEG_file (destination); + if (DEBUG) + printf ("res : %d\n",res); + return res; } -///////////////////////////////////////////////////////////////// /** * \ingroup gdcmFile * \brief Allocates necessary memory, copies the pixel data - * (image[s]/volume[s]) to newly allocated zone and return a - * pointer to it: + * (image[s]/volume[s]) to newly allocated zone. + * @return Pointer to newly allocated pixel data. */ void * gdcmFile::GetImageData (void) { PixelData = (void *) malloc(lgrTotale); @@ -110,16 +214,17 @@ void * gdcmFile::GetImageData (void) { return(PixelData); } -///////////////////////////////////////////////////////////////// /** - * \ingroup gdcmFile - * \brief amene en mémoire dans une zone précisee par l'utilisateur - * les Pixels d'une image - * - * @param destination - * @param MaxSize - * - * @return The number of bytes actually copied. + * \ingroup gdcmFile + * \brief Copies at most MaxSize bytes of pixel data to caller's + * memory space. + * @param destination Address (in caller's memory space) at which the + * pixel data should be copied + * @param MaxSize Maximum number of bytes to be copied. When MaxSize + * is not sufficient to hold the pixel data the copy is not + * executed (i.e. no partial copy). + * @return On success, the number of bytes actually copied. Zero on + * failure e.g. MaxSize is lower than necessary. */ size_t gdcmFile::GetImageDataIntoVector (void* destination, size_t MaxSize) { @@ -195,6 +300,43 @@ size_t gdcmFile::GetImageDataIntoVector (void* destination, size_t MaxSize) { return (size_t)0; } } + + // --- + string str_PlanarConfiguration = GetPubElValByNumber(0x0028,0x0006); + int PlanarConfiguration; + if (str_PlanarConfiguration == "gdcm::Unfound" ) { + PlanarConfiguration = 0; + } else { + PlanarConfiguration = atoi(str_PlanarConfiguration.c_str() ); + } + // --- + + // TODO : replace by + // if (GetPlanarConfiguration() == 1) { + // after unfreeze + + if (PlanarConfiguration == 1) { // need to make RGB Pixels + 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 i=0;i>8) - | ((((unsigned short int*)im)[i])<<8); - break; + case 21: + case 3412: + case 2143: + case 4321: + + for(i=0;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) non autorisee : %d\n", swap); + } if( nb == 32 ) - - switch (swap) { - case 0: - case 1234: - break; - - case 4321: - for(i=0;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>16; - fort= (fort>>8) | (fort<<8); - faible=(faible>>8) | (faible<<8); - s32=fort; - ((unsigned long int*)im)[i]=(s32<<16)|faible; - } - break; + switch (swap) { + case 0: + case 1234: + break; + + case 4321: + for(i=0;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>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>16; - s32=faible; - ((unsigned long int*)im)[i]=(s32<<16)|fort; - } - break; + case 3412: + for(i=0;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("valeur de SWAP (32 bits) non autorisee : %d\n", swap); + } return; } @@ -279,8 +419,9 @@ return; * \ingroup gdcmFile * \brief TODO JPR * \warning doit-etre etre publique ? FIXME JPR + * TODO : y a-t-il un inconvenient à fusioner ces 2 fonctions * - * @param Data TODO JPR + * @param inData TODO JPR * @param ExpectedSize TODO JPR * * @return TODO JPR @@ -299,6 +440,7 @@ int gdcmFile::SetImageData(void * inData, size_t ExpectedSize) { * \brief TODO JPR * \ * \warning WARNING doit-etre etre publique ? FIXME JPR + * TODO : y aurait il un inconvenient à fusionner ces 2 fonctions * * @param ImageDataSize TODO JPR * @@ -306,20 +448,20 @@ int gdcmFile::SetImageData(void * inData, size_t ExpectedSize) { void gdcmFile::SetImageDataSize(size_t ImageDataSize) { - string content1; - string content2; - char car[20]; + string content1; + char car[20]; - // suppose que le ElValue (0x7fe0, 0x0010) existe ... + // suppose que le ElValue (0x7fe0, 0x0010) existe ... - sprintf(car,"%d",ImageDataSize); - content2=car; - SetPubElValByNumber(content2, 0x7fe0, 0x0010); - - ImageDataSize+=8; - sprintf(car,"%d",ImageDataSize); - content1=car; - SetPubElValByNumber(content1, 0x7fe0, 0x0000); + sprintf(car,"%d",ImageDataSize); + + gdcmElValue*a = GetElValueByNumber(0x7fe0, 0x0010); + a->SetLength(ImageDataSize); + + ImageDataSize+=8; + sprintf(car,"%d",ImageDataSize); + content1=car; + SetPubElValByNumber(content1, 0x7fe0, 0x0000); } @@ -338,16 +480,16 @@ void gdcmFile::SetImageDataSize(size_t ImageDataSize) { 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); - } + 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); + fwrite (PixelData,lgrTotale, 1, fp1); + fclose (fp1); + return(1); } @@ -369,6 +511,15 @@ int gdcmFile::WriteDcmImplVR (string nomFichier) { return WriteBase(nomFichier, ImplicitVR); } +///////////////////////////////////////////////////////////////// +/** + * \ingroup gdcmFile + * + * @param nomFichier TODO JPR + * + * @return TODO JPR + */ + int gdcmFile::WriteDcmImplVR (const char* nomFichier) { return WriteDcmImplVR (string (nomFichier)); } @@ -407,12 +558,21 @@ int gdcmFile::WriteAcr (string nomFichier) { return WriteBase(nomFichier, ACR); } -int gdcmFile::WriteBase (string nomFichier, FileType type) { +///////////////////////////////////////////////////////////////// +/** + * \ingroup gdcmFile + * + * @param FileName TODO JPR + * @param type TODO JPR + * + * @return TODO JPR + */ +int gdcmFile::WriteBase (string FileName, FileType type) { FILE * fp1; - fp1 = fopen(nomFichier.c_str(),"wb"); + fp1 = fopen(FileName.c_str(),"wb"); if (fp1 == NULL) { - printf("Echec ouverture (ecriture) Fichier [%s] \n",nomFichier.c_str()); + printf("Echec ouverture (ecriture) Fichier [%s] \n",FileName.c_str()); return (0); }