- _Swap (_Pixels, _sw, _lgrTotale, nb);
- }
-
- // On remet les Bits des Octets dans le bon ordre si besoin est
- //
- // ATTENTION : Jamais confronté a des pixels stockes sur 32 bits
- // avec moins de 32 bits utilises
- // et dont le bit de poids fort ne serait pas la ou on l'attend ...
- // --> ne marchera pas dans ce cas
- if (nbu!=nb){
- mask = mask >> (nb-nbu);
- int l=(int)_lgrTotale/(nb/8);
- unsigned short *deb = (unsigned short *)_Pixels;
- for(int i=0;i<l;i++) {
- *deb = (*deb >> (nbu-highBit-1)) & mask;
- deb ++;
- }
- }
-
- printf ("on est sorti\n");
-
- // On l'affecte à un champ du dcmFile
-
- Pixels = _Pixels;
- lgrTotale = _lgrTotale;
-
- // et on le retourne
- // ca fait double emploi, il faudra nettoyer ça
-
- return (_Pixels);
-}
+// FILE * f2;
+// f2 = fopen("SpuriousFile.RAW","wb");
+// fwrite(destination,lgrTotale,1,f2);
+// fclose(f2);
+
+ // Deal with the color
+ // -------------------
+
+ std::string str_PhotometricInterpretation =
+ Header->GetEntryByNumber(0x0028,0x0004);
+
+ if ( (str_PhotometricInterpretation == "MONOCHROME1 ")
+ || (str_PhotometricInterpretation == "MONOCHROME2 ") ) {
+ return lgrTotale;
+ }
+
+ // Planar configuration = 0 : Pixels are already RGB
+ // Planar configuration = 1 : 3 planes : R, G, B
+ // Planar configuration = 2 : 1 gray Plane + 3 LUT
+
+ // Well ... supposed to be !
+ // See US-PAL-8-10x-echo.dcm: PlanarConfiguration=0,
+ // PhotometricInterpretation=PALETTE COLOR
+ // and heuristic has to be found :-(
+
+ int planConf=Header->GetPlanarConfiguration(); // 0028,0006
+
+ // Whatever Planar Configuration is,
+ // "PALETTE COLOR " implies that we deal with the palette.
+ if (str_PhotometricInterpretation == "PALETTE COLOR ")
+ planConf=2;
+
+ switch (planConf) {
+ case 0:
+ // Pixels are already RGB
+ break;
+
+ case 1:
+
+ {
+ if (str_PhotometricInterpretation == "YBR_FULL") {
+
+ // Warning : YBR_FULL_422 acts as RGB
+ // : we need to make RGB Pixels from Planes Y,cB,cR
+
+ // to see the tricks about YBR_FULL, YBR_FULL_422,
+ // YBR_PARTIAL_422, YBR_ICT, YBR_RCT have a look at :
+ // ftp://medical.nema.org/medical/dicom/final/sup61_ft.pdf
+ // and be *very* affraid
+ //
+ int l = Header->GetXSize()*Header->GetYSize();
+ int nbFrames = Header->GetZSize();
+
+ unsigned char * newDest = new (unsigned char)[lgrTotale];
+ unsigned char *x = newDest;
+ unsigned char * a = (unsigned char *)destination;
+ unsigned char * b = a + l;
+ unsigned char * c = b + l;
+ double R,G,B;
+
+ /// \todo : Replace by the 'well known' integer computation
+ /// counterpart
+ /// see http://lestourtereaux.free.fr/papers/data/yuvrgb.pdf
+ /// for code optimisation
+
+ for (int i=0;i<nbFrames;i++) {
+ for (int j=0;j<l; j++) {
+ R= 1.164 *(*a-16) + 1.596 *(*c -128) + 0.5;
+ G= 1.164 *(*a-16) - 0.813 *(*c -128) - 0.392 *(*b -128) + 0.5;
+ B= 1.164 *(*a-16) + 2.017 *(*b -128) + 0.5;
+
+ if (R<0.0) R=0.0;
+ if (G<0.0) G=0.0;
+ if (B<0.0) B=0.0;
+ if (R>255.0) R=255.0;
+ if (G>255.0) G=255.0;
+ if (B>255.0) B=255.0;
+
+ *(x++) = (unsigned char)R;
+ *(x++) = (unsigned char)G;
+ *(x++) = (unsigned char)B;
+ a++; b++; c++;
+ }
+ }
+ memmove(destination,newDest,lgrTotale);
+ delete[] newDest;
+
+ } else {
+
+ // need to make RGB Pixels from R,G,B Planes
+ // (all the Frames at a time)
+
+ int l = Header->GetXSize()*Header->GetYSize()*Header->GetZSize();
+
+ char * newDest = new char[lgrTotale];
+ char * x = newDest;
+ char * a = (char *)destination;
+ char * b = a + l;
+ char * c = b + l;