** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: ctndicom.cpp,v 1.13 2002/05/08 07:00:07 kevin Exp $
+** $Id: ctndicom.cpp,v 1.14 2002/05/08 08:55:45 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
: m_pFile(NULL), m_strFilename(pszFile), m_bFail(false), m_iContents(DICOM_CONTENTS_INVALID),
m_pImageFile(NULL), m_pProjections(NULL)
{
- unsigned long lOptions = DCM_ORDERLITTLEENDIAN;
+ unsigned long lOptions = DCM_ORDERLITTLEENDIAN | DCM_FORMATCONVERSION;
DCM_Debug (FALSE);
- if (DCM_OpenFile (pszFile, lOptions, &m_pFile) != DCM_NORMAL) {
- m_bFail = true;;
- m_strFailMessage = "Can't open file ";
- m_strFailMessage += m_strFilename;
+
+ CONDITION cond = DCM_OpenFile (pszFile, lOptions, &m_pFile);
+ if (cond != DCM_NORMAL) {
+ m_bFail = true;
+ char textbuf [2048];
+ CONDITION cond2 = COND_TopCondition (&cond, textbuf, sizeof(textbuf));
+ cond2 = DCM_NORMAL; // testing
+ if (cond2 != DCM_NORMAL) {
+ m_strFailMessage = "DCM_OpenFile failure: ";
+ m_strFailMessage += m_strFilename;
+ } else
+ m_strFailMessage = textbuf;
+
return;
}