* @return
*/
-gdcmFile::gdcmFile(gdcmHeader *header)
-{
+gdcmFile::gdcmFile(gdcmHeader *header) {
Header=header;
SelfHeader=false;
* This avoid a double parsing of public part of the header when
* one sets an a posteriori shadow dictionary (efficiency can be
* seen as a side effect).
- *
* @param filename file to be opened for parsing
- *
* @return
*/
-gdcmFile::gdcmFile(std::string & filename)
-{
+gdcmFile::gdcmFile(std::string & filename) {
Header=new gdcmHeader(filename.c_str());
SelfHeader=true;
SetPixelDataSizeFromHeader();
}
-gdcmFile::gdcmFile(const char * filename)
-{
+gdcmFile::gdcmFile(const char * filename) {
Header=new gdcmHeader(filename);
SelfHeader=true;
/**
* \ingroup gdcmFile
- * \brief Destructor dedicated to writing a new DICOMV3 part10 compliant
- * file (see SetFileName, SetDcmTag and Write)
- * Opens (in read only and when possible) an existing file and checks
- * for DICOM compliance. Returns NULL on failure.
+ * \brief canonical destructor
* \Note If the gdcmHeader is created by the gdcmFile, it is destroyed
* by the gdcmFile
- * *
*/
-gdcmFile::~gdcmFile(void)
-{
+gdcmFile::~gdcmFile(void) {
if(SelfHeader)
delete Header;
Header=NULL;
* \brief
* @return
*/
-gdcmHeader *gdcmFile::GetHeader(void)
-{
+gdcmHeader *gdcmFile::GetHeader(void) {
return(Header);
}
/**
* \ingroup gdcmFile
- * \brief calcule la longueur (in bytes) A ALLOUER pour recevoir les
- * 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
+ * \brief computes the length (in bytes) to ALLOCATE to receive the
+ * image(s) pixels (multiframes taken into account)
+ * \warning : it is NOT the group 7FE0 length
+ * (no interest for compressed images).
+ * @return length to allocate
*/
void gdcmFile::SetPixelDataSizeFromHeader(void) {
// see PS 3.3-2003 : C.7.6.3.2.1
int nb;
std::string str_nb;
- str_nb=Header->GetPubEntryByNumber(0x0028,0x0100);
+ str_nb=Header->GetEntryByNumber(0x0028,0x0100);
if (str_nb == GDCM_UNFOUND ) {
nb = 16;
} else {
lgrTotale = lgrTotaleRaw = Header->GetXSize() * Header->GetYSize()
* Header->GetZSize() * (nb/8)* Header->GetSamplesPerPixel();
std::string str_PhotometricInterpretation =
- Header->GetPubEntryByNumber(0x0028,0x0004);
+ Header->GetEntryByNumber(0x0028,0x0004);
/*if ( str_PhotometricInterpretation == "PALETTE COLOR " )*/
// pb when undealt Segmented Palette Color
* \ the pixel data represented in this file, when user DOESN'T want
* \ to get RGB pixels image when it's stored as a PALETTE COLOR image
* \ - the (vtk) user is supposed to know how deal with LUTs -
- * \ warning to be used with GetImagePixelsRaw()
+ * \warning to be used with GetImagePixelsRaw()
* @return The size of pixel data in bytes.
*/
size_t gdcmFile::GetImageDataSizeRaw(void) {
* \brief Allocates necessary memory, copies the pixel data
* (image[s]/volume[s]) to newly allocated zone.
* Transforms YBR pixels into RGB pixels if any
- Transforms 3 planes R, G, B into a single RGB Plane
- Transforms single Grey plane + 3 Palettes into a RGB Plane
+ * Transforms 3 planes R, G, B into a single RGB Plane
+ * Transforms single Grey plane + 3 Palettes into a RGB Plane
* @return Pointer to newly allocated pixel data.
* \ NULL if alloc fails
*/
// CreateOrReplaceIfExist ?
std::string spp = "3"; // Samples Per Pixel
- Header->SetPubEntryByNumber(spp,0x0028,0x0002);
+ Header->SetEntryByNumber(spp,0x0028,0x0002);
std::string rgb= "RGB "; // Photometric Interpretation
- Header->SetPubEntryByNumber(rgb,0x0028,0x0004);
+ Header->SetEntryByNumber(rgb,0x0028,0x0004);
std::string planConfig = "0"; // Planar Configuration
- Header->SetPubEntryByNumber(planConfig,0x0028,0x0006);
+ Header->SetEntryByNumber(planConfig,0x0028,0x0006);
} else {
// need to make RGB Pixels (?)
// from grey Pixels (?!)
// and Gray Lut (!?!)
// or Segmented xxx Palette Color Lookup Table Data and so on
-
- // Well . I'll wait till I find such an image
-
- // Oops! I get one (gdcm-US-ALOKA-16.dcm)
- // No idea how to manage it
- // It seems that *no Dicom Viewer* has any idea :-(
- // Segmented xxx Palette Color are *more* than 65535 long ?!?
+
+ // Oops! I get one (gdcm-US-ALOKA-16.dcm)
+ // No idea how to manage such an image
+ // It seems that *no Dicom Viewer* has any idea :-(
+ // Segmented xxx Palette Color are *more* than 65535 long ?!?
std::string rgb= "MONOCHROME1 "; // Photometric Interpretation
- Header->SetPubEntryByNumber(rgb,0x0028,0x0004);
-
- }
-
+ Header->SetEntryByNumber(rgb,0x0028,0x0004);
+ }
// TODO : Drop Palette Color out of the Header?
return lgrTotale;
}
* \brief Allocates necessary memory, copies the pixel data
* (image[s]/volume[s]) to newly allocated zone.
* Transforms YBR pixels into RGB pixels if any
- Transforms 3 planes R, G, B into a single RGB Plane
- DOES NOT transform Grey plane + 3 Palettes into a RGB Plane
+ * Transforms 3 planes R, G, B into a single RGB Plane
+ * DOES NOT transform Grey plane + 3 Palettes into a RGB Plane
* @return Pointer to newly allocated pixel data.
* \ NULL if alloc fails
*/
(void)ReadPixelData(destination);
- // Nombre de Bits Alloues pour le stockage d'un Pixel
- str_nb = Header->GetPubEntryByNumber(0x0028,0x0100);
+ // Number of Bits Allocated for storing a Pixel
+ str_nb = Header->GetEntryByNumber(0x0028,0x0100);
if (str_nb == GDCM_UNFOUND ) {
nb = 16;
} else {
nb = atoi(str_nb.c_str() );
- }
-
- // Nombre de Bits Utilises
- str_nbu=Header->GetPubEntryByNumber(0x0028,0x0101);
+ }
+ // Number of Bits actually used
+ str_nbu=Header->GetEntryByNumber(0x0028,0x0101);
if (str_nbu == GDCM_UNFOUND ) {
nbu = nb;
} else {
nbu = atoi(str_nbu.c_str() );
- }
-
- // Position du Bit de Poids Fort
- str_highBit=Header->GetPubEntryByNumber(0x0028,0x0102);
+ }
+ // High Bit Position
+ str_highBit=Header->GetEntryByNumber(0x0028,0x0102);
if (str_highBit == GDCM_UNFOUND ) {
highBit = nb - 1;
} else {
// Pixel sign
// 0 = Unsigned
// 1 = Signed
- str_signe=Header->GetPubEntryByNumber(0x0028,0x0103);
+ str_signe=Header->GetEntryByNumber(0x0028,0x0103);
if (str_signe == GDCM_UNFOUND ) {
signe = 0; // default is unsigned
} else {
signe = atoi(str_signe.c_str() );
}
- // re arange bytes inside the integer
+ // re arange bytes inside the integer (processor endianity)
if (nb != 8)
SwapZone(destination, Header->GetSwapCode(), lgrTotale, nb);
return (size_t)0;
}
}
-
+// DO NOT remove this code commented out.
+// Nobody knows what's expecting you ...
// Just to 'see' what was actually read on disk :-(
-// Some troubles expected
// FILE * f2;
// f2 = fopen("SpuriousFile.raw","wb");
// fwrite(destination,lgrTotale,1,f2);
// -------------------
std::string str_PhotometricInterpretation =
- Header->GetPubEntryByNumber(0x0028,0x0004);
+ Header->GetEntryByNumber(0x0028,0x0004);
if ( (str_PhotometricInterpretation == "MONOCHROME1 ")
|| (str_PhotometricInterpretation == "MONOCHROME2 ") ) {
// Warning : YBR_FULL_422 acts as RGB
// : we need to make RGB Pixels from Planes Y,cB,cR
- // see http://lestourtereaux.free.fr/papers/data/yuvrgb.pdf
- // for code optimisation
// to see the tricks about YBR_FULL, YBR_FULL_422,
- // YBR_PARTIAL_422, YBR_ICT, YBR_RCT have a look at :
+ // 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
//
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;
*(x++) = *(a++);
*(x++) = *(b++);
*(x++) = *(c++);
- }
-
+ }
memmove(destination,newDest,lgrTotale);
free(newDest);
- }
-
+ }
break;
- }
-
+ }
case 2:
// Palettes were found
// Let the user deal with them !
// CreateOrReplaceIfExist ?
std::string spp = "3"; // Samples Per Pixel
- Header->SetPubEntryByNumber(spp,0x0028,0x0002);
+ Header->SetEntryByNumber(spp,0x0028,0x0002);
std::string rgb="RGB "; // Photometric Interpretation
- Header->SetPubEntryByNumber(rgb,0x0028,0x0004);
+ Header->SetEntryByNumber(rgb,0x0028,0x0004);
std::string planConfig = "0"; // Planar Configuration
- Header->SetPubEntryByNumber(planConfig,0x0028,0x0006);
+ Header->SetEntryByNumber(planConfig,0x0028,0x0006);
// TODO : Drop Palette Color out of the Header?
return lgrTotale;
* @param inData
* @param ExpectedSize
*
- * @return integer acts as a boolean
+ * @return boolean
*/
bool gdcmFile::SetImageData(void * inData, size_t ExpectedSize) {
Header->SetImageDataSize(ExpectedSize);
* Ca sera à l'utilisateur d'appeler son Reader correctement
* (Equivalent a IdImaWriteRawFile)
*
- * @param fileName
- * @return
+ * @param fileName name of the file to be created
+ * (any already existing file is over written)
+ * @return false if write fails
*/
bool gdcmFile::WriteRawData (std::string fileName) {
* Ca fonctionnera correctement (?) sur processeur Intel
* (Equivalent a IdDcmWrite)
*
- * @param fileName
- * @return int acts as a boolean
+ * @param fileName name of the file to be created
+ * (any already existing file is overwritten)
+ * @return false if write fails
*/
bool gdcmFile::WriteDcmImplVR (std::string fileName) {
/**
* \ingroup gdcmFile
* \brief
- * @param fileName
- * @return int acts as a boolean
+ * @param fileName name of the file to be created
+ * (any already existing file is overwritten)
+ * @return false if write fails
*/
bool gdcmFile::WriteDcmImplVR (const char* fileName) {
/**
* \ingroup gdcmFile
* \brief
- * @param fileName
- * @return int acts as a boolean
+ * @param fileName name of the file to be created
+ * (any already existing file is overwritten)
+ * @return false if write fails
*/
bool gdcmFile::WriteDcmExplVR (std::string fileName) {
* \brief Ecrit au format ACR-NEMA sur disque l'entete et les pixels
* (a l'attention des logiciels cliniques
* qui ne prennent en entrée QUE des images ACR ...
- * \warning si un header DICOM est fourni en entree,
- * les groupes < 0x0008 et les groupes impairs sont ignores)
- * \warning Aucun test n'est fait sur l'"Endiannerie" du processeur.
+ * \warning if a DICOM_V3 header is supplied,
+ * groups < 0x0008 and shadow groups are ignored)
+ * \warning NO TEST is performed on processor "Endiannity".
* Ca fonctionnera correctement (?) sur processeur Intel
* (Equivalent a IdDcmWrite)
*
- * @param fileName
- * @return int acts as a boolean
+ * @param fileName name of the file to be created
+ * (any already existing file is overwritten)
+ * @return false if write fails
*/
bool gdcmFile::WriteAcr (std::string fileName) {
/**
* \ingroup gdcmFile
*
- * @param FileName
- * @param type
- *
- * @return int acts as a boolean
+* @param fileName name of the file to be created
+ * (any already existing file is overwritten)
+ * @param type file type (ExplicitVR, ImplicitVR, ...)
+ * @return false if write fails
*/
-bool gdcmFile::WriteBase (std::string FileName, FileType type) {
+bool gdcmFile::WriteBase (std::string fileName, FileType type) {
FILE * fp1;
- fp1 = fopen(FileName.c_str(),"wb");
+ fp1 = fopen(fileName.c_str(),"wb");
if (fp1 == NULL) {
- printf("Echec ouverture (ecriture) Fichier [%s] \n",FileName.c_str());
+ printf("Echec ouverture (ecriture) Fichier [%s] \n",fileName.c_str());
return (false);
}
std::string rows, columns;
if ( Header->GetFileType() == ACR_LIBIDO){
- rows = Header->GetPubEntryByNumber(0x0028, 0x0010);
- columns = Header->GetPubEntryByNumber(0x0028, 0x0011);
- Header->SetPubEntryByNumber(columns, 0x0028, 0x0010);
- Header->SetPubEntryByNumber(rows , 0x0028, 0x0011);
+ rows = Header->GetEntryByNumber(0x0028, 0x0010);
+ columns = Header->GetEntryByNumber(0x0028, 0x0011);
+ Header->SetEntryByNumber(columns, 0x0028, 0x0010);
+ Header->SetEntryByNumber(rows , 0x0028, 0x0011);
}
// ----------------- End of Special Patch ----------------
// just after writting
if (Header->GetFileType() == ACR_LIBIDO){
- Header->SetPubEntryByNumber(rows , 0x0028, 0x0010);
- Header->SetPubEntryByNumber(columns, 0x0028, 0x0011);
+ Header->SetEntryByNumber(rows , 0x0028, 0x0010);
+ Header->SetEntryByNumber(columns, 0x0028, 0x0011);
}
// ----------------- End of Special Patch ----------------
break;
default:
- printf("valeur de SWAP (16 bits) not allowed : %d\n", swap);
+ printf("SWAP value (16 bits) not allowed : %d\n", swap);
}
if( nb == 32 )
break;
default:
- printf(" SWAP value (32 bits) not allowed : %d\n", swap);
+ printf("SWAP value (32 bits) not allowed : %d\n", swap);
}
return;
}
fread(&b2,1,1,fp);
//Two steps is necessary to please VC++
*pdestination++ = ((b0 >> 4) << 8) + ((b0 & 0x0f) << 4) + (b1 & 0x0f);
- /* A */ /* B */ /* D */
+ /* A */ /* B */ /* D */
*pdestination++ = ((b2 & 0x0f) << 8) + ((b1 >> 4) << 4) + (b2 >> 4);
- /* F */ /* C */ /* E */
+ /* F */ /* C */ /* E */
// Troubles expected on Big-Endian processors ?
}
// --------------- SingleFrame/Multiframe JPEG Lossless/Lossy/2000
int nb;
- std::string str_nb=Header->GetPubEntryByNumber(0x0028,0x0100);
+ std::string str_nb=Header->GetEntryByNumber(0x0028,0x0100);
if (str_nb == GDCM_UNFOUND ) {
nb = 16;
} else {
int taille = Header->GetXSize() * Header->GetYSize()
* Header->GetSamplesPerPixel();
long fragmentBegining; // for ftell, fseek
-
+
bool jpg2000 = Header->IsJPEG2000();
bool jpgLossless = Header->IsJPEGLossless();
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff