X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.cxx;h=f72941973374dbb427afe0a31c817fa16c12c203;hb=ae10d99619e2d41f885443b28aef2387c2961213;hp=b47418923c9edb0a8c2d5f781172085faff5477e;hpb=7589d23967892c94462e22a49ec50fcd225c5c38;p=gdcm.git diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx index b4741892..f7294197 100644 --- a/src/gdcmFile.cxx +++ b/src/gdcmFile.cxx @@ -82,7 +82,7 @@ size_t gdcmFile::GetImageDataSize(void) { * \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) { @@ -114,7 +114,7 @@ bool gdcmFile::ReadPixelData(void* destination) { // ------------------------------- Position on begining of Jpeg Pixels - int ln; + int ln; fseek(fp,4,SEEK_CUR); fread(&ln,4,1,fp); if(GetSwapCode()) @@ -127,29 +127,18 @@ bool gdcmFile::ReadPixelData(void* destination) { if(GetSwapCode()) ln=SwapLong(ln); if (DEBUG) - printf ("ln image comprimée %d\n",ln); - + printf ("ln image comprimée %d\n",ln); // ------------------------------- JPEG LossLess : call to Jpeg Libido if (IsJPEGLossless()) { - ClbJpeg* jpg = _IdDcmJpegRead(fp); + 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 (?) - + int nb; string str_nb=gdcmHeader::GetPubElValByNumber(0x0028,0x0100); if (str_nb == "gdcm::Unfound" ) { @@ -162,14 +151,11 @@ bool gdcmFile::ReadPixelData(void* destination) { int * dataJpg = jpg->DataImg; int taille = GetXSize() * GetYSize() * GetZSize() * GetSamplesPerPixel(); - switch (nBytes) { - + switch (nBytes) { case 1: { unsigned short *dest = (unsigned short *)destination; for (int i=0; i255) printf("data %d\n",*(dataJpg +i) ); *((unsigned char *)dest+i) = *(dataJpg +i); } } @@ -178,21 +164,14 @@ bool gdcmFile::ReadPixelData(void* destination) { 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 // 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); @@ -220,7 +200,6 @@ bool gdcmFile::ReadPixelData(void* destination) { if (DEBUG) printf ("res : %d\n",res); return res; - } /** @@ -321,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; - 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 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; } @@ -416,8 +430,6 @@ int gdcmFile::SetImageData(void * inData, size_t ExpectedSize) { SetImageDataSize(ExpectedSize); PixelData = inData; lgrTotale = ExpectedSize; - - return(1); } @@ -436,20 +448,20 @@ int gdcmFile::SetImageData(void * inData, size_t ExpectedSize) { void gdcmFile::SetImageDataSize(size_t ImageDataSize) { - string content1; - 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); + 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); } @@ -468,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); }