Program: gdcm
Module: $RCSfile: gdcmFile.cxx,v $
Language: C++
- Date: $Date: 2004/06/22 14:14:01 $
- Version: $Revision: 1.106 $
+ Date: $Date: 2004/06/23 09:30:22 $
+ Version: $Revision: 1.108 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
* \note If the gdcmHeader is created by the gdcmFile, it is destroyed
* by the gdcmFile
*/
-gdcmFile::~gdcmFile(void) {
+gdcmFile::~gdcmFile() {
if(SelfHeader)
delete Header;
Header=NULL;
* (no interest for compressed images).
* @return length to allocate
*/
-void gdcmFile::SetPixelDataSizeFromHeader(void) {
+void gdcmFile::SetPixelDataSizeFromHeader() {
// see PS 3.3-2003 : C.7.6.3.2.1
//
// MONOCHROME1
* the pixel data represented in this file.
* @return The size of pixel data in bytes.
*/
-size_t gdcmFile::GetImageDataSize(void) {
- return (lgrTotale);
+size_t gdcmFile::GetImageDataSize() {
+ return lgrTotale;
}
/**
* \warning to be used with GetImagePixelsRaw()
* @return The size of pixel data in bytes.
*/
-size_t gdcmFile::GetImageDataSizeRaw(void) {
- return (lgrTotaleRaw);
+size_t gdcmFile::GetImageDataSizeRaw() {
+ return lgrTotaleRaw;
}
/**
* @return Pointer to newly allocated pixel data.
* NULL if alloc fails
*/
-void * gdcmFile::GetImageData (void) {
- PixelData = new char[lgrTotale];
+void * gdcmFile::GetImageData () {
+ PixelData = new unsigned char[lgrTotale]; //consistant with GetImageDataIntoVector
if (PixelData) {
GetImageDataIntoVector(PixelData, lgrTotale);
GetHeader()->SetEntryVoidAreaByNumber(PixelData,
}
PixelRead=0; // no PixelRaw
- return(PixelData);
+ return PixelData;
}
/**
// from Lut R + Lut G + Lut B
unsigned char *newDest = new unsigned char[lgrTotale];
unsigned char *a = (unsigned char *)destination;
- unsigned char *lutRGBA = Header->GetLUTRGBA();
+ unsigned char *lutRGBA = Header->GetLUTRGBA();
+
if (lutRGBA) {
int l = lgrTotaleRaw;
memmove(newDest, destination, l);// move Gray pixels to temp area
} else {
// need to make RGB Pixels (?)
- // from grey Pixels (?!)
- // and Gray Lut (!?!)
+ // from grey Pixels (?!)
+ // and Gray Lut (!?!)
// or Segmented xxx Palette Color Lookup Table Data and so on
// Oops! I get one (gdcm-US-ALOKA-16.dcm)
* @return Pointer to newly allocated pixel data.
* \ NULL if alloc fails
*/
-void * gdcmFile::GetImageDataRaw (void) {
+void * gdcmFile::GetImageDataRaw () {
if (Header->HasLUT())
/// \todo Let gdcmHeadar user a chance to get the right value
/// Create a member lgrTotaleRaw ???
lgrTotale /= 3;
- PixelData = new char[lgrTotale];
+ PixelData = new unsigned char[lgrTotale];
if (PixelData) {
GetImageDataIntoVectorRaw(PixelData, lgrTotale);
GetHeader()->GetNumPixel());
}
PixelRead=1; // PixelRaw
- return(PixelData);
+
+ return PixelData;
}
/**
return (size_t)0;
}
- (void)ReadPixelData(destination);
+ ReadPixelData(destination);
// Number of Bits Allocated for storing a Pixel
str_nb = Header->GetEntryByNumber(0x0028,0x0100);
deb ++;
}
} else {
- dbg.Verbose(0, "gdcmFile::GetImageDataIntoVector: wierd image");
- return (size_t)0;
+ dbg.Verbose(0, "gdcmFile::GetImageDataIntoVector: weird image");
+ return 0;
}
}
// DO NOT remove this commented out code .
PixelData = inData;
lgrTotale = ExpectedSize;
PixelRead = 1;
- return(true);
+
+ return true;
}
/**
* @return false if write fails
*/
-bool gdcmFile::WriteRawData (std::string fileName) {
+bool gdcmFile::WriteRawData (std::string const & fileName) {
FILE *fp1;
fp1 = fopen(fileName.c_str(),"wb");
if (fp1 == NULL) {
printf("Fail to open (write) file [%s] \n",fileName.c_str());
- return (false);
+ return false;
}
fwrite (PixelData,lgrTotale, 1, fp1);
fclose (fp1);
- return(true);
+
+ return true;
}
/**
* @return false if write fails
*/
-bool gdcmFile::WriteDcmImplVR (std::string fileName) {
+bool gdcmFile::WriteDcmImplVR (std::string const & fileName) {
return WriteBase(fileName, gdcmImplicitVR);
}
-/**
- * \ingroup gdcmFile
- * \brief Writes on disk A SINGLE Dicom file,
- * using the Implicit Value Representation convention
- * NO test is performed on processor "Endiannity". * @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) {
- return WriteDcmImplVR (std::string (fileName));
-}
-
/**
* \ingroup gdcmFile
* \brief Writes on disk A SINGLE Dicom file,
* @return false if write fails
*/
-bool gdcmFile::WriteDcmExplVR (std::string fileName) {
+bool gdcmFile::WriteDcmExplVR (std::string const & fileName) {
return WriteBase(fileName, gdcmExplicitVR);
}
* @return false if write fails
*/
-bool gdcmFile::WriteAcr (std::string fileName) {
+bool gdcmFile::WriteAcr (std::string const & fileName) {
return WriteBase(fileName, gdcmACR);
}
* @param type file type (ExplicitVR, ImplicitVR, ...)
* @return false if write fails
*/
-bool gdcmFile::WriteBase (std::string fileName, FileType type) {
+bool gdcmFile::WriteBase (std::string const & fileName, FileType type) {
FILE *fp1;
// fwrite(PixelData, lgrTotale, 1, fp1); // should be useless, now
fclose (fp1);
- return(true);
+
+ return true;
}
//-----------------------------------------------------------------------------
* @param nb Pixels Bit number
*/
void gdcmFile::SwapZone(void *im, int swap, int lgr, int nb) {
-guint32 s32;
-guint16 fort,faible;
-int i;
+ guint32 s32;
+ guint16 fort,faible;
+ int i;
-if(nb == 16)
- switch(swap) {
+ if(nb == 16)
+ switch(swap) {
case 0:
case 12:
case 1234:
printf("SWAP value (16 bits) not allowed : %d\n", swap);
}
-if( nb == 32 )
- switch (swap) {
+ if( nb == 32 )
+ switch (swap) {
case 0:
case 1234:
break;
break;
default:
- printf("SWAP value (32 bits) not allowed : %d\n", swap);
+ std::cout << "SWAP value (32 bits) not allowed : " << swap << std::endl;
}
-return;
}
/**
}
Header->CloseFile();
- return(true);
+ return true;
}
// ---------------------- Uncompressed File
bool jpg2000 = Header->IsJPEG2000();
bool jpgLossless = Header->IsJPEGLossless();
-
+
bool res = true;
guint16 ItemTagGr,ItemTagEl;
int ln;
} // ------------------------------------- endif (JPEG2000)
else if (jpgLossless) { // JPEG LossLess : call to xmedcom JPEG
-
JPEGLosslessDecodeImage (fp, // Reading Fragment pixels
(unsigned short *)destination,
Header->GetPixelSize() * 8 * Header->GetSamplesPerPixel(),
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff