Project

General

Profile

Patch #522 ยป 3.6.1_20121102-Coercion.patch

Michael Onken, 2013-05-13 18:22

View differences:

dcmjp2k-3.6.1_20121102.patched/dcmnet/include/dcmtk/dcmnet/dimse.h 2013-04-26 09:45:35.735919150 +0200
#define STATUS_STORE_Refused_SOPClassNotSupported /* high byte */ 0xa800
#define STATUS_STORE_Error_DataSetDoesNotMatchSOPClass /* high byte */ 0xa900
#define STATUS_STORE_Error_CannotUnderstand /* high nibble */ 0xc000
#define STATUS_STORE_Warning_CoersionOfDataElements 0xb000
#define STATUS_STORE_Warning_CoercionOfDataElements 0xb000
#define STATUS_STORE_Warning_DataSetDoesNotMatchSOPClass 0xb007
#define STATUS_STORE_Warning_ElementsDiscarded 0xb006
dcmjp2k-3.6.1_20121102.patched/dcmnet/libsrc/dimdump.cc 2013-04-26 09:45:35.728919070 +0200
{
dumpStream << ": Error: Cannot understand";
}
else if (status == STATUS_STORE_Warning_CoersionOfDataElements)
else if (status == STATUS_STORE_Warning_CoercionOfDataElements)
{
dumpStream << ": Warning: Coersion of data elements";
dumpStream << ": Warning: Coercion of data elements";
}
else if (status == STATUS_STORE_Warning_DataSetDoesNotMatchSOPClass)
{
dcmjp2k-3.6.1_20121102.patched/dcmnet/libsrc/diutil.cc 2013-04-26 09:45:35.730919093 +0200
case STATUS_Success:
s = "Success";
break;
case STATUS_STORE_Warning_CoersionOfDataElements:
s = "Warning: CoersionOfDataElements";
case STATUS_STORE_Warning_CoercionOfDataElements:
s = "Warning: CoercionOfDataElements";
break;
case STATUS_STORE_Warning_DataSetDoesNotMatchSOPClass:
s = "Warning: DataSetDoesNotMatchSOPClass";
dcmjp2k-3.6.1_20121102.patched/dcmnet/libsrc/dstorscu.cc 2013-04-26 09:45:35.733919126 +0200
{
++numError;
}
else if ((rspStatus == STATUS_STORE_Warning_CoersionOfDataElements) ||
else if ((rspStatus == STATUS_STORE_Warning_CoercionOfDataElements) ||
(rspStatus == STATUS_STORE_Warning_DataSetDoesNotMatchSOPClass) ||
(rspStatus == STATUS_STORE_Warning_ElementsDiscarded) ||
DICOM_WARNING_STATUS(rspStatus) /* not really needed but ... */)
    (1-1/1)