** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: ctndicom.cpp,v 1.14 2002/05/08 08:55:45 kevin Exp $
+** $Id: ctndicom.cpp,v 1.15 2002/06/27 01:48:26 kevin Exp $
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License (version 2) as
DicomImporter::DicomImporter (const char* const pszFile)
- : m_pFile(NULL), m_strFilename(pszFile), m_bFail(false), m_iContents(DICOM_CONTENTS_INVALID),
- m_pImageFile(NULL), m_pProjections(NULL)
+ : m_strFilename(pszFile), m_bFail(false), m_iContents(DICOM_CONTENTS_INVALID),
+ m_pImageFile(NULL), m_pProjections(NULL), m_pFile(NULL)
{
unsigned long lOptions = DCM_ORDERLITTLEENDIAN | DCM_FORMATCONVERSION;
DCM_Debug (FALSE);
unsigned short iNRows, iNCols, iBitsAllocated, iBitsStored, iHighBit, iPixRep;
DCM_ELEMENT aElemRequired[] = {
- {DCM_IMGROWS, DCM_US, "", 1, sizeof(iNRows), reinterpret_cast<char*>(&iNRows)},
- {DCM_IMGCOLUMNS, DCM_US, "", 1, sizeof(iNCols), reinterpret_cast<char*>(&iNCols)},
- {DCM_IMGBITSALLOCATED, DCM_US, "", 1, sizeof(iBitsAllocated), reinterpret_cast<char*>(&iBitsAllocated)},
- {DCM_IMGBITSSTORED, DCM_US, "", 1, sizeof(iBitsStored), reinterpret_cast<char*>(&iBitsStored)},
- {DCM_IMGHIGHBIT, DCM_US, "", 1, sizeof(iHighBit), reinterpret_cast<char*>(&iHighBit)},
- {DCM_IMGPIXELREPRESENTATION, DCM_US, "", 1, sizeof(iPixRep), reinterpret_cast<char*>(&iPixRep)}
+ {DCM_IMGROWS, DCM_US, "", 1, sizeof(iNRows), reinterpret_cast<char*>(&iNRows),},
+ {DCM_IMGCOLUMNS, DCM_US, "", 1, sizeof(iNCols), reinterpret_cast<char*>(&iNCols),},
+ {DCM_IMGBITSALLOCATED, DCM_US, "", 1, sizeof(iBitsAllocated), reinterpret_cast<char*>(&iBitsAllocated),},
+ {DCM_IMGBITSSTORED, DCM_US, "", 1, sizeof(iBitsStored), reinterpret_cast<char*>(&iBitsStored),},
+ {DCM_IMGHIGHBIT, DCM_US, "", 1, sizeof(iHighBit), reinterpret_cast<char*>(&iHighBit),},
+ {DCM_IMGPIXELREPRESENTATION, DCM_US, "", 1, sizeof(iPixRep), reinterpret_cast<char*>(&iPixRep),},
};
int nElemRequired = sizeof (aElemRequired) / sizeof(DCM_ELEMENT);
loadImage (iNRows, iNCols, iBitsAllocated, iBitsStored, iHighBit, iPixRep);
return;
}
- unsigned long lRtnLength;
+ U32 lRtnLength;
DCM_TAG somatomTag = DCM_MAKETAG(TAG_GROUP_SOMATOM, TAG_MEMBER_SOMATOM_DATA);
if (DCM_GetElementSize (&m_pFile, somatomTag, &lRtnLength) == DCM_NORMAL)
loadProjections();
DicomImporter::loadImage(unsigned short iNRows, unsigned short iNCols, unsigned short iBitsAllocated,
unsigned short iBitsStored, unsigned short iHighBit, unsigned short iPixRep)
{
- unsigned long lRtnLength;
+ U32 lRtnLength;
unsigned short iSamplesPerPixel, iPlanarConfig;
DCM_ELEMENT elemPlanarConfig = {DCM_IMGPLANARCONFIGURATION, DCM_US, "", 1, sizeof(iPlanarConfig),
return;
}
if ((lCheckLengthInBytes < lRealLength) && (cond != DCM_GETINCOMPLETE)) {
- m_bFail;
+ m_bFail = true;
m_strFailMessage = "Should have gooten incomplete message reading pixel data";
delete pRawPixels;
return;
void
DicomImporter::loadProjections()
{
- unsigned long lRtnLength;
+ U32 lRtnLength;
void* ctx = NULL;
unsigned short iNViews, iNDets;