[med-svn] r2840 - in trunk/packages/dicomscope: . trunk/debian trunk/debian/patches
malat-guest at alioth.debian.org
malat-guest at alioth.debian.org
Tue Dec 23 13:32:29 UTC 2008
Author: malat-guest
Date: 2008-12-23 13:32:28 +0000 (Tue, 23 Dec 2008)
New Revision: 2840
Added:
trunk/packages/dicomscope/tags/
trunk/packages/dicomscope/trunk/debian/compat
trunk/packages/dicomscope/trunk/debian/patches/
trunk/packages/dicomscope/trunk/debian/patches/dcmtk_350_354_changes.patch
trunk/packages/dicomscope/trunk/debian/patches/series
Modified:
trunk/packages/dicomscope/trunk/debian/
Log:
adding patch
Property changes on: trunk/packages/dicomscope/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: trunk/packages/dicomscope/trunk/debian/compat
===================================================================
--- trunk/packages/dicomscope/trunk/debian/compat (rev 0)
+++ trunk/packages/dicomscope/trunk/debian/compat 2008-12-23 13:32:28 UTC (rev 2840)
@@ -0,0 +1 @@
+4
Property changes on: trunk/packages/dicomscope/trunk/debian/compat
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: trunk/packages/dicomscope/trunk/debian/patches/dcmtk_350_354_changes.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/dcmtk_350_354_changes.patch (rev 0)
+++ trunk/packages/dicomscope/trunk/debian/patches/dcmtk_350_354_changes.patch 2008-12-23 13:32:28 UTC (rev 2840)
@@ -0,0 +1,2474 @@
+diff -x bin -N -u -r dsgui351/CMakeLists.txt /tmp/dicomscope/dsgui351/CMakeLists.txt
+--- dsgui351/CMakeLists.txt 2008-12-23 12:11:08.041265000 +0100
++++ /tmp/dicomscope/dsgui351/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
+@@ -1,4 +0,0 @@
+-PROJECT(DICOMScope)
+-
+-INCLUDE_DIRECTORIES(interface/include)
+-SUBDIRS(interface/libsrc)
+diff -x bin -N -u -r dsgui351/interface/libsrc/CMakeLists.txt /tmp/dicomscope/dsgui351/interface/libsrc/CMakeLists.txt
+--- dsgui351/interface/libsrc/CMakeLists.txt 2008-12-23 13:55:46.532824000 +0100
++++ /tmp/dicomscope/dsgui351/interface/libsrc/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
+@@ -1,50 +0,0 @@
+-SET(dsgui_SRCS
+-DSRCodeValue.cpp
+-DSRCompositeValue.cpp
+-DSRDocument.cpp
+-DSRDocumentTree.cpp
+-DSRImageValue.cpp
+-DSRNumericValue.cpp
+-DSRSCoordValue.cpp
+-DSRTCoordValue.cpp
+-DSRWaveformValue.cpp
+-DVInterface.cpp
+-DVPresentationState.cpp
+-DVPSCurve.cpp
+-DVPSGraphicObject.cpp
+-DVPSStoredPrint.cpp
+-DVPSTextObject.cpp
+-)
+-
+-FIND_PACKAGE(Java REQUIRED) # javac, jar
+-FIND_PACKAGE(JNI REQUIRED)
+-INCLUDE_DIRECTORIES(
+- #${JNI_INCLUDE_PATH} # cmake bug #
+- ${JAVA_INCLUDE_PATH}
+- ${JAVA_INCLUDE_PATH2}
+- ${JAVA_AWT_INCLUDE_PATH}
+- )
+-
+-FIND_PACKAGE(DCMTK REQUIRED)
+-# /usr/include/dcmtk/dcmpstat/dviface.h
+-FIND_PATH( DCMTK_dcmpstat_INCLUDE_DIR dviface.h
+- ${DCMTK_DIR}/dcmpstat/include
+- ${DCMTK_DIR}/include/dcmpstat
+-)
+-# /usr/include/dcmtk/dcmsr/dsrdoc.h
+-FIND_PATH( DCMTK_dcmsr_INCLUDE_DIR dsrdoc.h
+- ${DCMTK_DIR}/dcmsr/include
+- ${DCMTK_DIR}/include/dcmsr
+-)
+-
+-# MESSAGE(${DCMTK_INCLUDE_DIR})
+-INCLUDE_DIRECTORIES(
+- ${DCMTK_INCLUDE_DIR}
+- ${DCMTK_dcmpstat_INCLUDE_DIR}
+- ${DCMTK_dcmsr_INCLUDE_DIR}
+-)
+-
+-ADD_DEFINITIONS(-DHAVE_CONFIG_H -DNDEBUG -DHAVE_STRSTREAM_H)
+-
+-#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+-ADD_LIBRARY(jInterface SHARED ${dsgui_SRCS})
+Binary files dsgui351/interface/libsrc/.CMakeLists.txt.swp and /tmp/dicomscope/dsgui351/interface/libsrc/.CMakeLists.txt.swp differ
+diff -x bin -N -u -r dsgui351/interface/libsrc/DSRCodeValue.cpp /tmp/dicomscope/dsgui351/interface/libsrc/DSRCodeValue.cpp
+--- dsgui351/interface/libsrc/DSRCodeValue.cpp 2008-12-23 12:46:01.513221000 +0100
++++ /tmp/dicomscope/dsgui351/interface/libsrc/DSRCodeValue.cpp 2000-12-06 16:41:34.000000000 +0100
+@@ -116,7 +116,7 @@
+ {
+ DSRCodedEntryValue *cod = getAddressOfDSRCodedEntryValue (env, obj);
+
+- return (jboolean) false; /*cod->isPrivateDcmtkCodingScheme();*/
++ return (jboolean) cod->isPrivateDcmtkCodingScheme();
+ }
+
+
+@@ -229,7 +229,7 @@
+ }
+ }
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+Binary files dsgui351/interface/libsrc/.DSRCodeValue.cpp.swp and /tmp/dicomscope/dsgui351/interface/libsrc/.DSRCodeValue.cpp.swp differ
+diff -x bin -N -u -r dsgui351/interface/libsrc/DSRCompositeValue.cpp /tmp/dicomscope/dsgui351/interface/libsrc/DSRCompositeValue.cpp
+--- dsgui351/interface/libsrc/DSRCompositeValue.cpp 2008-12-23 12:46:19.114065000 +0100
++++ /tmp/dicomscope/dsgui351/interface/libsrc/DSRCompositeValue.cpp 2001-02-16 16:59:56.000000000 +0100
+@@ -147,7 +147,7 @@
+ env->ReleaseStringUTFChars (sopClassUID, string1);
+ env->ReleaseStringUTFChars (sopInstanceUID, string2);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+diff -x bin -N -u -r dsgui351/interface/libsrc/DSRDocument.cpp /tmp/dicomscope/dsgui351/interface/libsrc/DSRDocument.cpp
+--- dsgui351/interface/libsrc/DSRDocument.cpp 2008-12-23 14:00:57.891356000 +0100
++++ /tmp/dicomscope/dsgui351/interface/libsrc/DSRDocument.cpp 2001-05-22 12:35:00.000000000 +0200
+@@ -43,9 +43,7 @@
+ #include <strstrea.h> /* for ostrstream */
+ #endif
+ #ifdef HAVE_STRSTREAM_H
+-//#include <strstream.h> /* for ostrstream */
+-#include <strstream> /* for ostrstream */
+-using namespace std;
++#include <strstream.h> /* for ostrstream */
+ #endif
+
+
+@@ -114,7 +112,7 @@
+
+ /* create local string stream */
+ ostrstream stream;
+- E_Condition res = doc->renderHTML(stream, flags | /*DSRTypes::HF_version32Compatibility |*/ DSRTypes::HF_renderFullData);
++ E_Condition res = doc->renderHTML(stream, flags | DSRTypes::HF_version32Compatibility | DSRTypes::HF_renderFullData);
+
+ if (res == EC_Normal)
+ {
+@@ -132,7 +130,7 @@
+ delete[] string;
+ }
+ }
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -190,7 +188,7 @@
+ {
+ DSRDocument *doc = getAddressOfDSRDocument (env, obj);
+
+- return (jint) doc->setSpecificCharacterSetType((DSRTypes::E_CharacterSet)characterSet).code();
++ return (jint) doc->setSpecificCharacterSetType((DSRTypes::E_CharacterSet)characterSet);
+ }
+
+
+@@ -274,7 +272,7 @@
+ env->SetObjectField (obsName, onValue, env->NewStringUTF (onStr.c_str()));
+ env->SetObjectField (obsOrganization, ooValue, env->NewStringUTF (ooStr.c_str()));
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -308,7 +306,7 @@
+ env->SetObjectField (obsCM, cmValue, env->NewStringUTF (code.getCodeMeaning().c_str()));
+ env->SetObjectField (obsOrganization, ooValue, env->NewStringUTF (ooStr.c_str()));
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -322,7 +320,7 @@
+ {
+ DSRDocument *doc = getAddressOfDSRDocument (env, obj);
+
+- return (jint)0/* doc->getNumberOfPredecessorDocuments()*/;
++ return (jint) doc->getNumberOfPredecessorDocuments();
+ }
+
+
+@@ -337,7 +335,7 @@
+ DSRDocument *doc = getAddressOfDSRDocument (env, obj);
+
+ OFString scStr, siStr;
+- E_Condition res = 0/*doc->getPredecessorDocument((size_t)idx, scStr, siStr)*/;
++ E_Condition res = doc->getPredecessorDocument((size_t)idx, scStr, siStr);
+
+ jfieldID scValue = env->GetFieldID (env->GetObjectClass(sopClassUID), "value", "Ljava/lang/String;");
+ jfieldID siValue = env->GetFieldID (env->GetObjectClass(sopInstanceUID), "value", "Ljava/lang/String;");
+@@ -345,7 +343,7 @@
+ env->SetObjectField (sopClassUID, scValue, env->NewStringUTF (scStr.c_str()));
+ env->SetObjectField (sopInstanceUID, siValue, env->NewStringUTF (siStr.c_str()));
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -790,7 +788,7 @@
+
+ env->ReleaseStringUTFChars (value, str);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -822,7 +820,7 @@
+ }
+ }
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -854,7 +852,7 @@
+ }
+ }
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -874,7 +872,7 @@
+
+ env->ReleaseStringUTFChars (value, str);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -894,7 +892,7 @@
+
+ env->ReleaseStringUTFChars (value, str);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -926,7 +924,7 @@
+ }
+ }
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -958,7 +956,7 @@
+ }
+ }
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -990,7 +988,7 @@
+ }
+ }
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1022,7 +1020,7 @@
+ }
+ }
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1054,7 +1052,7 @@
+ }
+ }
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1086,7 +1084,7 @@
+ }
+ }
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1106,7 +1104,7 @@
+
+ env->ReleaseStringUTFChars (value, str);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1126,7 +1124,7 @@
+
+ env->ReleaseStringUTFChars (value, str);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1146,7 +1144,7 @@
+
+ env->ReleaseStringUTFChars (value, str);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1194,7 +1192,7 @@
+
+ env->ReleaseStringUTFChars (studyUID, str);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1224,7 +1222,7 @@
+
+ E_Condition res = doc->createNewDocument();
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1240,7 +1238,7 @@
+
+ E_Condition res = doc->createNewDocument((DSRTypes::E_DocumentType)type);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1256,7 +1254,7 @@
+
+ E_Condition res = doc->createRevisedVersion();
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1272,7 +1270,7 @@
+
+ E_Condition res = doc->completeDocument();
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1304,7 +1302,7 @@
+ }
+ }
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1341,7 +1339,7 @@
+ }
+ }
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1394,7 +1392,7 @@
+ }
+ }
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+diff -x bin -N -u -r dsgui351/interface/libsrc/DSRDocumentTree.cpp /tmp/dicomscope/dsgui351/interface/libsrc/DSRDocumentTree.cpp
+--- dsgui351/interface/libsrc/DSRDocumentTree.cpp 2008-12-23 14:01:26.476717000 +0100
++++ /tmp/dicomscope/dsgui351/interface/libsrc/DSRDocumentTree.cpp 2001-01-25 15:54:42.000000000 +0100
+@@ -391,7 +391,7 @@
+ }
+ }
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -531,7 +531,7 @@
+ {
+ DSRDocumentTree *tree = getAddressOfDSRDocumentTree (env, obj);
+
+- return (jint) tree->getCurrentContentItem().setContinuityOfContent((DSRTypes::E_ContinuityOfContent)flag).code();
++ return (jint) tree->getCurrentContentItem().setContinuityOfContent((DSRTypes::E_ContinuityOfContent)flag);
+ }
+
+
+@@ -584,7 +584,7 @@
+
+ env->ReleaseStringUTFChars (value, str);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+diff -x bin -N -u -r dsgui351/interface/libsrc/DSRImageValue.cpp /tmp/dicomscope/dsgui351/interface/libsrc/DSRImageValue.cpp
+--- dsgui351/interface/libsrc/DSRImageValue.cpp 2008-12-23 14:01:59.829134000 +0100
++++ /tmp/dicomscope/dsgui351/interface/libsrc/DSRImageValue.cpp 2001-02-16 16:58:52.000000000 +0100
+@@ -147,7 +147,7 @@
+ env->ReleaseStringUTFChars (sopClassUID, string1);
+ env->ReleaseStringUTFChars (sopInstanceUID, string2);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -234,7 +234,7 @@
+ env->ReleaseStringUTFChars (sopClassUID, string1);
+ env->ReleaseStringUTFChars (sopInstanceUID, string2);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -282,7 +282,7 @@
+
+ env->SetIntField (frameNumber, env->GetFieldID (env->GetObjectClass (frameNumber), "value", "I"), fnValue);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -310,7 +310,7 @@
+ {
+ DSRImageReferenceValue *ref = getAddressOfDSRImageReferenceValue (env, obj);
+
+- return (jint) ref->getFrameList().removeItem((size_t)idx).code();
++ return (jint) ref->getFrameList().removeItem((size_t)idx);
+ }
+
+
+diff -x bin -N -u -r dsgui351/interface/libsrc/DSRNumericValue.cpp /tmp/dicomscope/dsgui351/interface/libsrc/DSRNumericValue.cpp
+--- dsgui351/interface/libsrc/DSRNumericValue.cpp 2008-12-23 14:02:14.230292000 +0100
++++ /tmp/dicomscope/dsgui351/interface/libsrc/DSRNumericValue.cpp 2000-11-23 17:57:28.000000000 +0100
+@@ -165,7 +165,7 @@
+
+ env->ReleaseStringUTFChars (numericValue, string);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -212,7 +212,7 @@
+ }
+ }
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+diff -x bin -N -u -r dsgui351/interface/libsrc/DSRSCoordValue.cpp /tmp/dicomscope/dsgui351/interface/libsrc/DSRSCoordValue.cpp
+--- dsgui351/interface/libsrc/DSRSCoordValue.cpp 2008-12-23 14:02:50.550467000 +0100
++++ /tmp/dicomscope/dsgui351/interface/libsrc/DSRSCoordValue.cpp 2000-10-23 17:22:04.000000000 +0200
+@@ -88,7 +88,7 @@
+ {
+ DSRSpatialCoordinatesValue *sco = getAddressOfDSRSpatialCoordinatesValue (env, obj);
+
+- return (jint) sco->setGraphicType((DSRTypes::E_GraphicType)graphicType).code();
++ return (jint) sco->setGraphicType((DSRTypes::E_GraphicType)graphicType);
+ }
+
+
+@@ -137,7 +137,7 @@
+ env->SetFloatField (column, env->GetFieldID (env->GetObjectClass (column), "value", "F"), columnValue);
+ env->SetFloatField (row, env->GetFieldID (env->GetObjectClass (row), "value", "F"), rowValue);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -165,7 +165,7 @@
+ {
+ DSRSpatialCoordinatesValue *sco = getAddressOfDSRSpatialCoordinatesValue (env, obj);
+
+- return (jint) sco->getGraphicDataList().removeItem((size_t)idx).code();
++ return (jint) sco->getGraphicDataList().removeItem((size_t)idx);
+ }
+
+
+diff -x bin -N -u -r dsgui351/interface/libsrc/DSRTCoordValue.cpp /tmp/dicomscope/dsgui351/interface/libsrc/DSRTCoordValue.cpp
+--- dsgui351/interface/libsrc/DSRTCoordValue.cpp 2008-12-23 14:03:02.022825000 +0100
++++ /tmp/dicomscope/dsgui351/interface/libsrc/DSRTCoordValue.cpp 2000-10-27 10:42:52.000000000 +0200
+@@ -88,7 +88,7 @@
+ {
+ DSRTemporalCoordinatesValue *tco = getAddressOfDSRTemporalCoordinatesValue (env, obj);
+
+- return (jint) tco->setTemporalRangeType((DSRTypes::E_TemporalRangeType)temporalRangeType).code();
++ return (jint) tco->setTemporalRangeType((DSRTypes::E_TemporalRangeType)temporalRangeType);
+ }
+
+
+diff -x bin -N -u -r dsgui351/interface/libsrc/DSRWaveformValue.cpp /tmp/dicomscope/dsgui351/interface/libsrc/DSRWaveformValue.cpp
+--- dsgui351/interface/libsrc/DSRWaveformValue.cpp 2008-12-23 14:03:26.182329000 +0100
++++ /tmp/dicomscope/dsgui351/interface/libsrc/DSRWaveformValue.cpp 2001-02-16 17:00:24.000000000 +0100
+@@ -147,7 +147,7 @@
+ env->ReleaseStringUTFChars (sopClassUID, string1);
+ env->ReleaseStringUTFChars (sopInstanceUID, string2);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -196,7 +196,7 @@
+ env->SetIntField (multiplexGroupNumber, env->GetFieldID (env->GetObjectClass (multiplexGroupNumber), "value", "I"), mgnValue);
+ env->SetIntField (channelNumber, env->GetFieldID (env->GetObjectClass (channelNumber), "value", "I"), cnValue);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -224,7 +224,7 @@
+ {
+ DSRWaveformReferenceValue *ref = getAddressOfDSRWaveformReferenceValue (env, obj);
+
+- return (jint) ref->getChannelList().removeItem((size_t)idx).code();
++ return (jint) ref->getChannelList().removeItem((size_t)idx);
+ }
+
+
+diff -x bin -N -u -r dsgui351/interface/libsrc/DVInterface.cpp /tmp/dicomscope/dsgui351/interface/libsrc/DVInterface.cpp
+--- dsgui351/interface/libsrc/DVInterface.cpp 2008-12-23 14:09:32.873638000 +0100
++++ /tmp/dicomscope/dsgui351/interface/libsrc/DVInterface.cpp 2001-01-29 18:26:32.000000000 +0100
+@@ -121,7 +121,7 @@
+ env->ReleaseStringUTFChars (seriesUID, ser);
+ env->ReleaseStringUTFChars (instanceUID, ins);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -141,7 +141,7 @@
+
+ env->ReleaseStringUTFChars (filename, fn);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -157,7 +157,7 @@
+
+ E_Condition res = dvi->loadReferencedImage (idx, changeStatus == JNI_TRUE ? OFTrue : OFFalse);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -181,7 +181,7 @@
+ env->ReleaseStringUTFChars (seriesUID, ser);
+ env->ReleaseStringUTFChars (instanceUID, ins);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -201,7 +201,7 @@
+
+ env->ReleaseStringUTFChars (pstName, psn);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -223,7 +223,7 @@
+ env->ReleaseStringUTFChars (pstName, psn);
+ env->ReleaseStringUTFChars (imgName, imn);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -247,7 +247,7 @@
+ env->ReleaseStringUTFChars (seriesUID, ser);
+ env->ReleaseStringUTFChars (instanceUID, ins);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -267,7 +267,7 @@
+
+ env->ReleaseStringUTFChars (filename, fn);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -287,7 +287,7 @@
+
+ env->ReleaseStringUTFChars (reportID, id);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -303,7 +303,7 @@
+
+ E_Condition res = dvi->savePState(replaceSOPInstanceUID == JNI_TRUE ? OFTrue : OFFalse);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -325,7 +325,7 @@
+
+ env->ReleaseStringUTFChars (filename, fn);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -346,7 +346,7 @@
+
+ env->ReleaseStringUTFChars (filename, fn);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -362,7 +362,7 @@
+
+ E_Condition res = dvi->saveStructuredReport();
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -383,7 +383,7 @@
+
+ env->ReleaseStringUTFChars (filename, fn);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -407,7 +407,7 @@
+ env->ReleaseStringUTFChars (seriesUID, ser);
+ env->ReleaseStringUTFChars (instanceUID, ins);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -487,7 +487,7 @@
+
+ E_Condition res = dvi->resetPresentationState();
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -503,7 +503,7 @@
+
+ E_Condition res = dvi->saveCurrentPStateForReset();
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -519,7 +519,7 @@
+
+ E_Condition res = dvi->releaseDatabase();
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -576,7 +576,7 @@
+
+ E_Condition res = dvi->selectStudy(idx);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -596,7 +596,7 @@
+
+ env->ReleaseStringUTFChars (studyUID, stu);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -901,7 +901,7 @@
+
+ E_Condition res = dvi->selectSeries(idx);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -921,7 +921,7 @@
+
+ env->ReleaseStringUTFChars (seriesUID, ser);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1154,7 +1154,7 @@
+
+ E_Condition res = dvi->selectInstance(idx);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1174,7 +1174,7 @@
+
+ env->ReleaseStringUTFChars (instanceUID, ins);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1196,7 +1196,7 @@
+ env->ReleaseStringUTFChars (instanceUID, ins);
+ env->ReleaseStringUTFChars (sopClassUID, sop);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1220,7 +1220,7 @@
+ env->ReleaseStringUTFChars (seriesUID, ser);
+ env->ReleaseStringUTFChars (instanceUID, ins);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1345,7 +1345,7 @@
+ env->ReleaseStringUTFChars (seriesUID, ser);
+ env->ReleaseStringUTFChars (instanceUID, ins);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1369,7 +1369,7 @@
+ env->ReleaseStringUTFChars (seriesUID, ser);
+ env->ReleaseStringUTFChars (instanceUID, ins);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1391,7 +1391,7 @@
+ env->ReleaseStringUTFChars (studyUID, stu);
+ env->ReleaseStringUTFChars (seriesUID, ser);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1411,7 +1411,7 @@
+
+ env->ReleaseStringUTFChars (studyUID, stu);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1427,7 +1427,7 @@
+
+ E_Condition res = dvi->startReceiver();
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1443,7 +1443,7 @@
+
+ E_Condition res = dvi->terminateReceiver();
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1459,7 +1459,7 @@
+
+ E_Condition res = dvi->startQueryRetrieveServer();
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1475,7 +1475,7 @@
+
+ E_Condition res = dvi->terminateQueryRetrieveServer();
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1514,7 +1514,7 @@
+ env->ReleaseStringUTFChars (studyUID, stu);
+ env->ReleaseStringUTFChars (targetID, tid);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1538,7 +1538,7 @@
+ env->ReleaseStringUTFChars (studyUID, stu);
+ env->ReleaseStringUTFChars (seriesUID, ser);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1564,7 +1564,7 @@
+ env->ReleaseStringUTFChars (seriesUID, ser);
+ env->ReleaseStringUTFChars (instanceUID, ins);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1584,7 +1584,7 @@
+
+ env->ReleaseStringUTFChars (filename, fn);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1608,7 +1608,7 @@
+ env->ReleaseStringUTFChars (seriesUID, ser);
+ env->ReleaseStringUTFChars (instanceUID, ins);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1628,7 +1628,7 @@
+
+ env->ReleaseStringUTFChars (filename, fn);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1652,7 +1652,7 @@
+ env->ReleaseStringUTFChars (seriesUID, ser);
+ env->ReleaseStringUTFChars (instanceUID, ins);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1678,7 +1678,7 @@
+ env->ReleaseStringUTFChars (filename, fname);
+ env->ReleaseByteArrayElements (pixelData, (jbyte *) array, JNI_ABORT);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1708,7 +1708,7 @@
+ env->ReleaseStringUTFChars (instanceUID, iUID);
+ env->ReleaseByteArrayElements (pixelData, (jbyte *) array, JNI_ABORT);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1730,7 +1730,7 @@
+
+ env->ReleaseByteArrayElements (pixelData, (jbyte *) array, JNI_ABORT);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1761,7 +1761,7 @@
+ env->ReleaseStringUTFChars (instanceUID, ui);
+ env->ReleaseShortArrayElements (pixelData, (jshort *) array, 0);
+
+- return res.code();
++ return res;
+ }
+
+
+@@ -1783,7 +1783,7 @@
+
+ env->ReleaseShortArrayElements (pixelData, (jshort *) array, 0);
+
+- return res.code();
++ return res;
+ }
+
+
+@@ -1807,7 +1807,7 @@
+ env->ReleaseStringUTFChars (seriesUID, ser);
+ env->ReleaseStringUTFChars (instanceUID, ins);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1827,7 +1827,7 @@
+
+ env->ReleaseStringUTFChars (filename, fn);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1852,7 +1852,7 @@
+ env->ReleaseStringUTFChars (filename, fn);
+ env->ReleaseStringUTFChars (instanceUID, ui);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1870,7 +1870,7 @@
+
+ E_Condition res = dvi->saveStoredPrint (wrRqImgS);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1902,7 +1902,7 @@
+
+ E_Condition res = dvi->loadPrintPreview(idx, printLUT, changeStatus == JNI_TRUE ? OFTrue : OFFalse);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1964,7 +1964,7 @@
+
+ E_Condition res = dvi->getPrintPreviewWidthHeight (w, h);
+
+- if (res != EC_Normal) return (jint) res.code();
++ if (res != EC_Normal) return (jint) res;
+
+ jclass wIntByRefcls = env->GetObjectClass (width);
+ jclass hIntByRefcls = env->GetObjectClass (height);
+@@ -1975,7 +1975,7 @@
+ env->SetIntField (width, wvalue, (jint) w);
+ env->SetIntField (height, hvalue, (jint) h);
+
+- return (jint) EC_Normal.code();
++ return (jint) EC_Normal;
+ }
+
+
+@@ -1997,7 +1997,7 @@
+
+ env->ReleaseByteArrayElements (bitmap, (jbyte *) array, 0);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -2013,7 +2013,7 @@
+
+ E_Condition res = dvi->disablePState();
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -2029,7 +2029,7 @@
+
+ E_Condition res = dvi->enablePState();
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -2061,7 +2061,7 @@
+
+ E_Condition res = dvi->selectPState(idx, changeStatus == JNI_TRUE ? OFTrue : OFFalse);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -2128,7 +2128,7 @@
+
+ E_Condition res = dvi->setAmbientLightValue(alv);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -2146,7 +2146,7 @@
+
+ E_Condition res = dvi->getAmbientLightValue(_alv);
+
+- if (res != EC_Normal) return (jint) res.code();
++ if (res != EC_Normal) return (jint) res;
+
+ jclass DoubleByRefcls = env->GetObjectClass (alv);
+
+@@ -2154,7 +2154,7 @@
+
+ env->SetDoubleField (alv, value, _alv);
+
+- return (jint) EC_Normal.code();
++ return (jint) EC_Normal;
+ }
+
+
+@@ -2174,7 +2174,7 @@
+
+ env->ReleaseStringUTFChars (targetID, tid);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -2211,7 +2211,7 @@
+
+ env->ReleaseStringUTFChars (value, val);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -2248,7 +2248,7 @@
+
+ env->ReleaseStringUTFChars (value, val);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -2285,7 +2285,7 @@
+
+ env->ReleaseStringUTFChars (value, val);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -2322,7 +2322,7 @@
+
+ env->ReleaseStringUTFChars (value, val);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -2360,7 +2360,7 @@
+
+ env->ReleaseStringUTFChars (value, val);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -2391,7 +2391,7 @@
+ {
+ DVInterface *dvi = getAddressOfDVInterface (env, obj);
+
+- return (jint) dvi->setPrinterNumberOfCopies((long) value).code();
++ return (jint) dvi->setPrinterNumberOfCopies((long) value);
+ }
+
+
+@@ -2439,7 +2439,7 @@
+
+ env->ReleaseStringUTFChars (lutID, lid);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -2476,7 +2476,7 @@
+
+ env->ReleaseStringUTFChars (lutID, lid);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -2507,7 +2507,7 @@
+ {
+ DVInterface *dvi = getAddressOfDVInterface (env, obj);
+
+- return (jint) dvi->spoolPrintJob((deletePrintedImages == JNI_TRUE) ? OFTrue : OFFalse).code();
++ return (jint) dvi->spoolPrintJob((deletePrintedImages == JNI_TRUE) ? OFTrue : OFFalse);
+ }
+
+
+@@ -2521,7 +2521,7 @@
+ {
+ DVInterface *dvi = getAddressOfDVInterface (env, obj);
+
+- return (jint) dvi->startPrintSpooler().code();
++ return (jint) dvi->startPrintSpooler();
+ }
+
+
+@@ -2535,7 +2535,7 @@
+ {
+ DVInterface *dvi = getAddressOfDVInterface (env, obj);
+
+- return (jint) dvi->terminatePrintSpooler().code();
++ return (jint) dvi->terminatePrintSpooler();
+ }
+
+
+@@ -2549,7 +2549,7 @@
+ {
+ DVInterface *dvi = getAddressOfDVInterface (env, obj);
+
+- return (jint) dvi->startPrintServer().code();
++ return (jint) dvi->startPrintServer();
+ }
+
+
+@@ -2563,7 +2563,7 @@
+ {
+ DVInterface *dvi = getAddressOfDVInterface (env, obj);
+
+- return (jint) dvi->terminatePrintServer().code();
++ return (jint) dvi->terminatePrintServer();
+ }
+
+
+@@ -2587,7 +2587,7 @@
+ env->ReleaseStringUTFChars (seriesUID, ser);
+ env->ReleaseStringUTFChars (instanceUID, ins);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -2611,7 +2611,7 @@
+ env->ReleaseStringUTFChars (seriesUID, ser);
+ env->ReleaseStringUTFChars (instanceUID, ins);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -2824,7 +2824,7 @@
+ env->ReleaseStringUTFChars (userID, str1);
+ env->ReleaseStringUTFChars (passwd, str2);
+
+- return (jint) result.code();
++ return (jint) result;
+ }
+
+
+@@ -2860,7 +2860,7 @@
+ env->ReleaseStringUTFChars (module, mod);
+ env->ReleaseStringUTFChars (message, msg);
+
+- return (jint)res.code();
++ return (jint)res;
+ }
+
+
+Binary files dsgui351/interface/libsrc/.DVInterface.cpp.swp and /tmp/dicomscope/dsgui351/interface/libsrc/.DVInterface.cpp.swp differ
+diff -x bin -N -u -r dsgui351/interface/libsrc/DVPresentationState.cpp /tmp/dicomscope/dsgui351/interface/libsrc/DVPresentationState.cpp
+--- dsgui351/interface/libsrc/DVPresentationState.cpp 2008-12-23 14:17:45.488320000 +0100
++++ /tmp/dicomscope/dsgui351/interface/libsrc/DVPresentationState.cpp 2000-11-23 17:45:22.000000000 +0100
+@@ -179,7 +179,7 @@
+ }
+ }
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -229,7 +229,7 @@
+ }
+ }
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -279,7 +279,7 @@
+ }
+ }
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -313,7 +313,7 @@
+
+ env->SetObjectField (pixel, datafid, array);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -342,7 +342,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) ps->setRotation ((DVPSRotationType) rotation).code();
++ return (jint) ps->setRotation ((DVPSRotationType) rotation);
+ }
+
+
+@@ -385,7 +385,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) ps->setFlip (isFlipped == JNI_TRUE ? OFTrue : OFFalse).code();
++ return (jint) ps->setFlip (isFlipped == JNI_TRUE ? OFTrue : OFFalse);
+ }
+
+
+@@ -420,7 +420,7 @@
+ env->ReleaseStringUTFChars (filesetID, fid);
+ env->ReleaseStringUTFChars (filesetUID, fui);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -444,7 +444,7 @@
+ env->ReleaseStringUTFChars (filesetID, fid);
+ env->ReleaseStringUTFChars (filesetUID, fui);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -468,7 +468,7 @@
+ env->ReleaseStringUTFChars (seriesUID, ser);
+ env->ReleaseStringUTFChars (instanceUID, ins);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -482,7 +482,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) ps->removeImageReferenceAttached ().code();
++ return (jint) ps->removeImageReferenceAttached ();
+ }
+
+
+@@ -500,14 +500,14 @@
+
+ E_Condition res = ps->getImageNumberOfFrames (fr);
+
+- if (res != EC_Normal) return (jint) res.code();
++ if (res != EC_Normal) return (jint) res;
+
+ jclass IntByRefcls = env->GetObjectClass (frame);
+ jfieldID value = env->GetFieldID (IntByRefcls, "value", "I");
+
+ env->SetIntField (frame, value, (jint) fr);
+
+- return (jint) EC_Normal.code();
++ return (jint) EC_Normal;
+ }
+
+
+@@ -521,7 +521,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) ps->selectImageFrameNumber (frame).code();
++ return (jint) ps->selectImageFrameNumber (frame);
+ }
+
+
+@@ -634,7 +634,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) ps->setRectShutter (lv, rv, uh, lh).code();
++ return (jint) ps->setRectShutter (lv, rv, uh, lh);
+ }
+
+
+@@ -664,7 +664,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) ps->setCurrentPresentationLUT ((DVPSPresentationLUTType) type).code();
++ return (jint) ps->setCurrentPresentationLUT ((DVPSPresentationLUTType) type);
+ }
+
+
+@@ -756,7 +756,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) ps->setCircularShutter (centerX, centerY, radius).code();
++ return (jint) ps->setCircularShutter (centerX, centerY, radius);
+ }
+
+
+@@ -784,7 +784,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) ps->setPolyShutterOrigin (x, y).code();
++ return (jint) ps->setPolyShutterOrigin (x, y);
+ }
+
+
+@@ -798,7 +798,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) ps->addPolyShutterVertex (x, y).code();
++ return (jint) ps->addPolyShutterVertex (x, y);
+ }
+
+
+@@ -816,7 +816,7 @@
+
+ E_Condition res = ps->getPolyShutterVertex (idx, x, y);
+
+- if (res != EC_Normal) return (jint) res.code();
++ if (res != EC_Normal) return (jint) res;
+
+ jclass pointcls = env->GetObjectClass (pointXY);
+ jfieldID xfid = env->GetFieldID (pointcls, "x", "I");
+@@ -825,7 +825,7 @@
+ env->SetIntField (pointXY, xfid, (jint) x);
+ env->SetIntField (pointXY, yfid, (jint) y);
+
+- return (jint) EC_Normal.code();
++ return (jint) EC_Normal;
+ }
+
+
+@@ -853,7 +853,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) ps->setShutterPresentationValue ((Uint16) pvalue).code();
++ return (jint) ps->setShutterPresentationValue ((Uint16) pvalue);
+ }
+
+
+@@ -981,9 +981,9 @@
+
+ long tx, ty, bx, by;
+
+- E_Condition res = 0/*ps->getDisplayedArea (tx, ty, bx, by)*/;
++ E_Condition res = ps->getDisplayedArea (tx, ty, bx, by);
+
+- if (res != EC_Normal) return (jint) res.code();
++ if (res != EC_Normal) return (jint) res;
+
+ jclass txIntByRefcls = env->GetObjectClass (tlhcX);
+ jclass tyIntByRefcls = env->GetObjectClass (tlhcY);
+@@ -1000,7 +1000,7 @@
+ env->SetIntField (brhcX, bxvalue, (jint) bx);
+ env->SetIntField (brhcY, byvalue, (jint) by);
+
+- return (jint) EC_Normal.code();
++ return (jint) EC_Normal;
+ }
+
+
+@@ -1018,7 +1018,7 @@
+
+ E_Condition res = ps->getDisplayedAreaPresentationPixelSpacing (xx, yy);
+
+- if (res != EC_Normal) return (jint) res.code();
++ if (res != EC_Normal) return (jint) res;
+
+ jclass xDoubleByRefcls = env->GetObjectClass (x);
+ jclass yDoubleByRefcls = env->GetObjectClass (y);
+@@ -1029,7 +1029,7 @@
+ env->SetDoubleField (x, xvalue, xx);
+ env->SetDoubleField (y, yvalue, yy);
+
+- return (jint) EC_Normal.code();
++ return (jint) EC_Normal;
+ }
+
+ /*
+@@ -1046,7 +1046,7 @@
+
+ E_Condition res = ps->getDisplayedAreaPresentationPixelMagnificationRatio (m);
+
+- if (res != EC_Normal) return (jint) res.code();
++ if (res != EC_Normal) return (jint) res;
+
+ jclass mDoubleByRefcls = env->GetObjectClass (magnification);
+
+@@ -1054,7 +1054,7 @@
+
+ env->SetDoubleField (magnification, mvalue, m);
+
+- return (jint) EC_Normal.code();
++ return (jint) EC_Normal;
+ }
+
+
+@@ -1084,8 +1084,8 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint)0/* ps->setDisplayedArea ((DVPSPresentationSizeMode) sizeMode, tlhcX,
+- tlhcY, brhcX, brhcY, magnification, (DVPSObjectApplicability) applicability)*/;
++ return (jint) ps->setDisplayedArea ((DVPSPresentationSizeMode) sizeMode, tlhcX,
++ tlhcY, brhcX, brhcY, magnification, (DVPSObjectApplicability) applicability);
+ }
+
+
+@@ -1135,14 +1135,14 @@
+
+ E_Condition res = ps->getGraphicLayerRecommendedDisplayValueGray (idx, gr);
+
+- if (res != EC_Normal) return (jint) res.code();
++ if (res != EC_Normal) return (jint) res;
+
+ jclass IntByRefcls = env->GetObjectClass (gray);
+ jfieldID value = env->GetFieldID (IntByRefcls, "value", "I");
+
+ env->SetIntField (gray, value, (jint) gr);
+
+- return (jint) EC_Normal.code();
++ return (jint) EC_Normal;
+ }
+
+
+@@ -1160,7 +1160,7 @@
+
+ E_Condition res = ps->getGraphicLayerRecommendedDisplayValueRGB (idx, rr, gg, bb);
+
+- if (res != EC_Normal) return (jint) res.code();
++ if (res != EC_Normal) return (jint) res;
+
+ jclass rIntByRefcls = env->GetObjectClass (r);
+ jclass gIntByRefcls = env->GetObjectClass (g);
+@@ -1174,7 +1174,7 @@
+ env->SetIntField (g, gvalue, (jint) gg);
+ env->SetIntField (b, bvalue, (jint) bb);
+
+- return (jint) EC_Normal.code();
++ return (jint) EC_Normal;
+ }
+
+
+@@ -1188,7 +1188,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) 0/*ps->setGraphicLayerRecommendedDisplayValueGray (idx, (Uint16) gray)*/;
++ return (jint) ps->setGraphicLayerRecommendedDisplayValueGray (idx, (Uint16) gray);
+ }
+
+
+@@ -1202,7 +1202,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) 0/*ps->setGraphicLayerRecommendedDisplayValueRGB (idx, (Uint16) r, (Uint16) g, (Uint16) b)*/;
++ return (jint) ps->setGraphicLayerRecommendedDisplayValueRGB (idx, (Uint16) r, (Uint16) g, (Uint16) b);
+ }
+
+
+@@ -1222,7 +1222,7 @@
+
+ env->ReleaseStringUTFChars (name, nam);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1254,7 +1254,7 @@
+ }
+ }
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1268,7 +1268,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) 0/*ps->toFrontGraphicLayer (idx)*/;
++ return (jint) ps->toFrontGraphicLayer (idx);
+ }
+
+
+@@ -1282,7 +1282,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) 0/*ps->toBackGraphicLayer (idx)*/;
++ return (jint) ps->toBackGraphicLayer (idx);
+ }
+
+
+@@ -1316,7 +1316,7 @@
+ }
+ }
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1330,7 +1330,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) 0/*ps->removeGraphicLayer (idx)*/;
++ return (jint) ps->removeGraphicLayer (idx);
+ }
+
+
+@@ -1400,7 +1400,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) 0/*ps->removeTextObject (layer, idx)*/;
++ return (jint) ps->removeTextObject (layer, idx);
+ }
+
+
+@@ -1414,7 +1414,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) ps->moveTextObject (old_layer, idx, new_layer, (DVPSObjectApplicability) applicability).code();
++ return (jint) ps->moveTextObject (old_layer, idx, new_layer, (DVPSObjectApplicability) applicability);
+ }
+
+
+@@ -1470,7 +1470,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) ps->removeGraphicObject (layer, idx).code();
++ return (jint) ps->removeGraphicObject (layer, idx);
+ }
+
+
+@@ -1484,7 +1484,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) ps->moveGraphicObject (old_layer, idx, new_layer, (DVPSObjectApplicability) applicability).code();
++ return (jint) ps->moveGraphicObject (old_layer, idx, new_layer, (DVPSObjectApplicability) applicability);
+ }
+
+
+@@ -1512,7 +1512,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) ps->setCharset ((DVPScharacterSet) charset).code();
++ return (jint) ps->setCharset ((DVPScharacterSet) charset);
+ }
+
+
+@@ -1614,7 +1614,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) ps->addCurve (layer, curveidxinimage).code();
++ return (jint) ps->addCurve (layer, curveidxinimage);
+ }
+
+
+@@ -1628,7 +1628,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) ps->removeCurve (layer, idx).code();
++ return (jint) ps->removeCurve (layer, idx);
+ }
+
+
+@@ -1642,7 +1642,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) ps->moveCurve (old_layer, idx, new_layer).code();
++ return (jint) ps->moveCurve (old_layer, idx, new_layer);
+ }
+
+
+@@ -1660,7 +1660,7 @@
+
+ E_Condition res = ps->getCurrentWindowWidth (ww);
+
+- if (res != EC_Normal) return (jint) res.code();
++ if (res != EC_Normal) return (jint) res;
+
+ jclass wDoubleByRefcls = env->GetObjectClass (w);
+
+@@ -1668,7 +1668,7 @@
+
+ env->SetDoubleField (w, wvalue, ww);
+
+- return (jint) EC_Normal.code();
++ return (jint) EC_Normal;
+ }
+
+
+@@ -1686,7 +1686,7 @@
+
+ E_Condition res = ps->getCurrentWindowCenter (cc);
+
+- if (res != EC_Normal) return (jint) res.code();
++ if (res != EC_Normal) return (jint) res;
+
+ jclass cDoubleByRefcls = env->GetObjectClass (c);
+
+@@ -1694,7 +1694,7 @@
+
+ env->SetDoubleField (c, cvalue, (jdouble) cc);
+
+- return (jint) EC_Normal.code();
++ return (jint) EC_Normal;
+ }
+
+
+@@ -1818,7 +1818,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) ps->setVOILUTFromImage (idx, (DVPSObjectApplicability) applicability).code();
++ return (jint) ps->setVOILUTFromImage (idx, (DVPSObjectApplicability) applicability);
+ }
+
+
+@@ -1832,7 +1832,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) ps->setVOIWindowFromImage (idx, (DVPSObjectApplicability) applicability).code();
++ return (jint) ps->setVOIWindowFromImage (idx, (DVPSObjectApplicability) applicability);
+ }
+
+
+@@ -1865,7 +1865,7 @@
+ }
+ }
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -1893,7 +1893,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) ps->setGammaVOILUT (gammaValue, (DVPSObjectApplicability) applicability).code();
++ return (jint) ps->setGammaVOILUT (gammaValue, (DVPSObjectApplicability) applicability);
+ }
+
+
+@@ -2009,7 +2009,7 @@
+
+ E_Condition res = ps->getOverlayData (layer, idx, overlayData, width, height, left, top, isROI, foreground, bits);
+
+- if (res != EC_Normal) return res.code(); // Fehler??
++ if (res != EC_Normal) return res; // Fehler??
+
+
+ jfieldID datafid = env->GetFieldID (ovdatcls, "overlayData", "[B");
+@@ -2043,7 +2043,7 @@
+ env->SetObjectField (od, data12fid, array);
+ }
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -2255,7 +2255,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) ps->removeOverlayFromPresentationState (idx).code();
++ return (jint) ps->removeOverlayFromPresentationState (idx);
+ }
+
+
+@@ -2269,7 +2269,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) ps->changeOverlayGroupInPresentationState (idx, (short) newGroup).code();
++ return (jint) ps->changeOverlayGroupInPresentationState (idx, (short) newGroup);
+ }
+
+
+@@ -2297,7 +2297,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) ps->activateOverlayInImage (layer, idx).code();
++ return (jint) ps->activateOverlayInImage (layer, idx);
+ }
+
+
+@@ -2311,7 +2311,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) ps->activateOverlayInPresentationState (layer, idx).code();
++ return (jint) ps->activateOverlayInPresentationState (layer, idx);
+ }
+
+
+@@ -2325,7 +2325,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) ps->activateOverlayAsBitmapShutter (idx).code();
++ return (jint) ps->activateOverlayAsBitmapShutter (idx);
+ }
+
+
+@@ -2339,7 +2339,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) ps->deactivateOverlay (layer, idx).code();
++ return (jint) ps->deactivateOverlay (layer, idx);
+ }
+
+
+@@ -2353,7 +2353,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) ps->moveOverlay (old_layer, idx, new_layer).code();
++ return (jint) ps->moveOverlay (old_layer, idx, new_layer);
+ }
+
+
+@@ -2373,7 +2373,7 @@
+
+ E_Condition res = ps->getImageMinMaxPixelRange (min, max);
+
+- if (res != EC_Normal) return (jint) res.code();
++ if (res != EC_Normal) return (jint) res;
+
+ jclass minDoubleByRefcls = env->GetObjectClass (minValue);
+ jclass maxDoubleByRefcls = env->GetObjectClass (maxValue);
+@@ -2384,7 +2384,7 @@
+ env->SetDoubleField (minValue, minvalue, min);
+ env->SetDoubleField (maxValue, maxvalue, max);
+
+- return (jint) EC_Normal.code();
++ return (jint) EC_Normal;
+ }
+
+
+@@ -2404,7 +2404,7 @@
+
+ E_Condition res = ps->getImageMinMaxPixelValue (min, max);
+
+- if (res != EC_Normal) return (jint) res.code();
++ if (res != EC_Normal) return (jint) res;
+
+ jclass minDoubleByRefcls = env->GetObjectClass (minValue);
+ jclass maxDoubleByRefcls = env->GetObjectClass (maxValue);
+@@ -2415,7 +2415,7 @@
+ env->SetDoubleField (minValue, minvalue, min);
+ env->SetDoubleField (maxValue, maxvalue, max);
+
+- return (jint) EC_Normal.code();
++ return (jint) EC_Normal;
+ }
+
+
+@@ -2433,7 +2433,7 @@
+
+ E_Condition res = ps->getImageWidth (w);
+
+- if (res != EC_Normal) return (jint) res.code();
++ if (res != EC_Normal) return (jint) res;
+
+ jclass wIntByRefcls = env->GetObjectClass (width);
+
+@@ -2441,7 +2441,7 @@
+
+ env->SetIntField (width, wvalue, w);
+
+- return (jint) EC_Normal.code();
++ return (jint) EC_Normal;
+ }
+
+
+@@ -2459,7 +2459,7 @@
+
+ E_Condition res = ps->getImageHeight (h);
+
+- if (res != EC_Normal) return (jint) res.code();
++ if (res != EC_Normal) return (jint) res;
+
+ jclass hIntByRefcls = env->GetObjectClass (height);
+
+@@ -2467,7 +2467,7 @@
+
+ env->SetIntField (height, hvalue, h);
+
+- return (jint) EC_Normal.code();
++ return (jint) EC_Normal;
+ }
+
+
+@@ -2499,7 +2499,7 @@
+
+ E_Condition res = ps->getImageReference (idx, st, se, so, in, fr, ae, fid, fuid);
+
+- if (res != EC_Normal) return res.code();
++ if (res != EC_Normal) return res;
+
+ jclass paramcls = env->GetObjectClass (param);
+ jfieldID stfid = env->GetFieldID (paramcls, "studyUID", "Ljava/lang/String;");
+@@ -2535,7 +2535,7 @@
+ env->SetObjectField (param, fifid, fiobj);
+ env->SetObjectField (param, fufid, fuobj);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -2550,7 +2550,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- return (jint) ps->exchangeGraphicLayers (idx1, idx2).code();
++ return (jint) ps->exchangeGraphicLayers (idx1, idx2);
+ }
+
+
+@@ -2604,7 +2604,7 @@
+
+ env->ReleaseByteArrayElements (pixelData, (jbyte *) array, 0);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -2620,7 +2620,7 @@
+
+ E_Condition res = ps->invertImage();
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -2666,7 +2666,7 @@
+
+ E_Condition res = ps->setMinimumPrintBitmapWidthHeight((unsigned long) width, (unsigned long) height);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -2682,7 +2682,7 @@
+
+ E_Condition res = ps->setMaximumPrintBitmapWidthHeight((unsigned long) width, (unsigned long) height);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -2700,7 +2700,7 @@
+
+ E_Condition res = ps->getPrintBitmapWidthHeight (w, h);
+
+- if (res != EC_Normal) return (jint) res.code();
++ if (res != EC_Normal) return (jint) res;
+
+ jclass widthCls = env->GetObjectClass (width);
+ jclass heightCls = env->GetObjectClass (height);
+@@ -2709,7 +2709,7 @@
+ env->SetIntField (width, wvalue, (jint) w);
+ env->SetIntField (height, hvalue, (jint) h);
+
+- return (jint) EC_Normal.code();
++ return (jint) EC_Normal;
+ }
+
+
+@@ -2727,13 +2727,13 @@
+
+ E_Condition res = ps->getPrintBitmapWidth (w);
+
+- if (res != EC_Normal) return (jint) res.code();
++ if (res != EC_Normal) return (jint) res;
+
+ jclass widthCls = env->GetObjectClass (width);
+ jfieldID wvalue = env->GetFieldID (widthCls, "value", "I");
+ env->SetIntField (width, wvalue, (jint) w);
+
+- return (jint) EC_Normal.code();
++ return (jint) EC_Normal;
+ }
+
+
+@@ -2751,13 +2751,13 @@
+
+ E_Condition res = ps->getPrintBitmapHeight (h);
+
+- if (res != EC_Normal) return (jint) res.code();
++ if (res != EC_Normal) return (jint) res;
+
+ jclass heightCls = env->GetObjectClass (height);
+ jfieldID hvalue = env->GetFieldID (heightCls, "value", "I");
+ env->SetIntField (height, hvalue, (jint) h);
+
+- return (jint) EC_Normal.code();
++ return (jint) EC_Normal;
+ }
+
+
+@@ -2794,7 +2794,7 @@
+ jfieldID value = env->GetFieldID (env->GetObjectClass (requestedImageSize), "value", "Ljava/lang/String;");
+ env->SetObjectField (requestedImageSize, value, env->NewStringUTF (ris.c_str()));
+ }
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -2816,7 +2816,7 @@
+
+ env->ReleaseShortArrayElements (bitmap, (jshort *) array, 0);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -2850,7 +2850,7 @@
+
+ E_Condition res = ps->setDefaultPresentationLUTShape ();
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -2867,7 +2867,7 @@
+ OFBool cm = clipMode == JNI_TRUE ? OFTrue : OFFalse;
+ E_Condition res = ps->createPreviewImage (maxWidth, maxHeight, cm);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -2913,7 +2913,7 @@
+
+ E_Condition res = ps->getPreviewImageWidthHeight (ww, hh);
+
+- if (res != EC_Normal) return (jint) res.code();
++ if (res != EC_Normal) return (jint) res;
+
+ jclass wIntByRefcls = env->GetObjectClass (width);
+ jclass hIntByRefcls = env->GetObjectClass (height);
+@@ -2924,7 +2924,7 @@
+ env->SetIntField (width, wvalue, (jint) ww);
+ env->SetIntField (height, hvalue, (jint) hh);
+
+- return (jint) EC_Normal.code();
++ return (jint) EC_Normal;
+ }
+
+
+@@ -2942,13 +2942,13 @@
+
+ E_Condition res = ps->getPreviewImageWidth (ww);
+
+- if (res != EC_Normal) return (jint) res.code();
++ if (res != EC_Normal) return (jint) res;
+
+ jclass wIntByRefcls = env->GetObjectClass (width);
+ jfieldID wvalue = env->GetFieldID (wIntByRefcls, "value", "I");
+ env->SetIntField (width, wvalue, (jint) ww);
+
+- return (jint) EC_Normal.code();
++ return (jint) EC_Normal;
+ }
+
+
+@@ -2966,13 +2966,13 @@
+
+ E_Condition res = ps->getPreviewImageHeight (hh);
+
+- if (res != EC_Normal) return (jint) res.code();
++ if (res != EC_Normal) return (jint) res;
+
+ jclass hIntByRefcls = env->GetObjectClass (height);
+ jfieldID hvalue = env->GetFieldID (hIntByRefcls, "value", "I");
+ env->SetIntField (height, hvalue, (jint) hh);
+
+- return (jint) EC_Normal.code();
++ return (jint) EC_Normal;
+ }
+
+
+@@ -2994,7 +2994,7 @@
+
+ env->ReleaseByteArrayElements (bitmap, (jbyte *) array, 0);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+diff -x bin -N -u -r dsgui351/interface/libsrc/DVPSCurve.cpp /tmp/dicomscope/dsgui351/interface/libsrc/DVPSCurve.cpp
+--- dsgui351/interface/libsrc/DVPSCurve.cpp 2008-12-23 14:18:01.796119000 +0100
++++ /tmp/dicomscope/dsgui351/interface/libsrc/DVPSCurve.cpp 1999-09-21 18:07:30.000000000 +0200
+@@ -148,7 +148,7 @@
+
+ E_Condition res = cur->getPoint (idx, xx, yy);
+
+- if (res != EC_Normal) return (jint) res.code();
++ if (res != EC_Normal) return (jint) res;
+
+ jclass xDoubleByRefcls = env->GetObjectClass (x);
+ jclass yDoubleByRefcls = env->GetObjectClass (y);
+@@ -159,7 +159,7 @@
+ env->SetDoubleField (x, xvalue, (jdouble) xx);
+ env->SetDoubleField (y, yvalue, (jdouble) yy);
+
+- return (jint) EC_Normal.code();
++ return (jint) EC_Normal;
+ }
+
+
+diff -x bin -N -u -r dsgui351/interface/libsrc/DVPSGraphicObject.cpp /tmp/dicomscope/dsgui351/interface/libsrc/DVPSGraphicObject.cpp
+--- dsgui351/interface/libsrc/DVPSGraphicObject.cpp 2008-12-23 14:18:22.022391000 +0100
++++ /tmp/dicomscope/dsgui351/interface/libsrc/DVPSGraphicObject.cpp 1999-09-21 18:07:30.000000000 +0200
+@@ -131,7 +131,7 @@
+
+ E_Condition res = go->getPoint (idx, xx, yy);
+
+- if (res != EC_Normal) return (jint) res.code();
++ if (res != EC_Normal) return (jint) res;
+
+ jclass xDoubleByRefcls = env->GetObjectClass (x);
+ jclass yDoubleByRefcls = env->GetObjectClass (y);
+@@ -142,7 +142,7 @@
+ env->SetDoubleField (x, xvalue, (jdouble) xx);
+ env->SetDoubleField (y, yvalue, (jdouble) yy);
+
+- return (jint) EC_Normal.code();
++ return (jint) EC_Normal;
+ }
+
+
+@@ -196,7 +196,7 @@
+
+ env->ReleaseFloatArrayElements (data, ddata, 0);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -211,7 +211,7 @@
+ {
+ DVPSGraphicObject *go = getAddressOfDVPSGraphicObject (env, obj);
+
+- return (jint) go->setGraphicType ((DVPSGraphicType) gtype).code();
++ return (jint) go->setGraphicType ((DVPSGraphicType) gtype);
+ }
+
+
+@@ -226,7 +226,7 @@
+ {
+ DVPSGraphicObject *go = getAddressOfDVPSGraphicObject (env, obj);
+
+- return (jint) go->setFilled ((filled != 0) ? OFTrue : OFFalse).code();
++ return (jint) go->setFilled ((filled != 0) ? OFTrue : OFFalse);
+ }
+
+
+diff -x bin -N -u -r dsgui351/interface/libsrc/DVPSStoredPrint.cpp /tmp/dicomscope/dsgui351/interface/libsrc/DVPSStoredPrint.cpp
+--- dsgui351/interface/libsrc/DVPSStoredPrint.cpp 2008-12-23 14:19:20.804343000 +0100
++++ /tmp/dicomscope/dsgui351/interface/libsrc/DVPSStoredPrint.cpp 2000-07-18 13:04:18.000000000 +0200
+@@ -82,7 +82,7 @@
+
+ env->ReleaseStringUTFChars (value, val);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+ /*
+@@ -101,7 +101,7 @@
+
+ env->ReleaseStringUTFChars (value, val);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+ /*
+@@ -120,7 +120,7 @@
+
+ env->ReleaseStringUTFChars (value, val);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+ /*
+@@ -133,7 +133,7 @@
+ {
+ DVPSStoredPrint *sp = getAddressOfDVPSStoredPrint (env, obj);
+
+- return (jint) sp->setImageDisplayFormat((unsigned long)columns, (unsigned long)rows).code();
++ return (jint) sp->setImageDisplayFormat((unsigned long)columns, (unsigned long)rows);
+ }
+
+ /*
+@@ -152,7 +152,7 @@
+
+ env->ReleaseStringUTFChars (value, val);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+ /*
+@@ -171,7 +171,7 @@
+
+ env->ReleaseStringUTFChars (value, val);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+ /*
+@@ -190,7 +190,7 @@
+
+ env->ReleaseStringUTFChars (value, val);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+ /*
+@@ -209,7 +209,7 @@
+
+ env->ReleaseStringUTFChars (value, val);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+ /*
+@@ -228,7 +228,7 @@
+
+ env->ReleaseStringUTFChars (value, val);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+ /*
+@@ -243,7 +243,7 @@
+
+ E_Condition res = sp->setFilmOrientation ((DVPSFilmOrientation) value);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -259,7 +259,7 @@
+
+ E_Condition res = sp->setTrim ((DVPSTrimMode) value);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+ /*
+@@ -274,7 +274,7 @@
+
+ E_Condition res = sp->setRequestedDecimateCropBehaviour ((DVPSDecimateCropBehaviour) value);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+ /*
+@@ -289,7 +289,7 @@
+
+ E_Condition res = sp->newPrinter ();
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+ /*
+@@ -513,7 +513,7 @@
+ {
+ DVPSStoredPrint *sp = getAddressOfDVPSStoredPrint (env, obj);
+
+- return (jint) sp->deleteImage(index).code();
++ return (jint) sp->deleteImage(index);
+ }
+
+ /*
+@@ -526,7 +526,7 @@
+ {
+ DVPSStoredPrint *sp = getAddressOfDVPSStoredPrint (env, obj);
+
+- return (jint) sp->deleteMultipleImages(number).code();
++ return (jint) sp->deleteMultipleImages(number);
+ }
+
+
+@@ -552,7 +552,7 @@
+ env->ReleaseStringUTFChars (requestedimagesize, ri);
+ env->ReleaseStringUTFChars (patientid, pi);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+ /*
+@@ -571,7 +571,7 @@
+
+ env->ReleaseStringUTFChars (uid, val);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -607,7 +607,7 @@
+
+ env->ReleaseStringUTFChars (value, val);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+ /*
+@@ -626,7 +626,7 @@
+
+ env->ReleaseStringUTFChars (value, val);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+ /*
+@@ -645,7 +645,7 @@
+
+ env->ReleaseStringUTFChars (value, val);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -713,7 +713,7 @@
+ {
+ DVPSStoredPrint *sp = getAddressOfDVPSStoredPrint (env, obj);
+
+- return (jint) sp->setDefaultPresentationLUT().code();
++ return (jint) sp->setDefaultPresentationLUT();
+ }
+
+
+@@ -727,7 +727,7 @@
+ {
+ DVPSStoredPrint *sp = getAddressOfDVPSStoredPrint (env, obj);
+
+- return (jint) sp->setPresentationLUTShape ((DVPSPresentationLUTType) type).code();
++ return (jint) sp->setPresentationLUTShape ((DVPSPresentationLUTType) type);
+ }
+
+
+@@ -761,7 +761,7 @@
+
+ env->ReleaseStringUTFChars (value, val);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+ /*
+@@ -780,7 +780,7 @@
+
+ env->ReleaseStringUTFChars (value, val);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+ /*
+@@ -835,7 +835,7 @@
+
+ env->ReleaseStringUTFChars (value, val);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
+@@ -856,7 +856,7 @@
+
+ env->ReleaseStringUTFChars (value, val);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+ /*
+@@ -906,7 +906,7 @@
+ {
+ DVPSStoredPrint *sp = getAddressOfDVPSStoredPrint (env, obj);
+
+- return (jint) sp->setPrintIllumination((short)value).code();
++ return (jint) sp->setPrintIllumination((short)value);
+ }
+
+
+@@ -934,7 +934,7 @@
+ {
+ DVPSStoredPrint *sp = getAddressOfDVPSStoredPrint (env, obj);
+
+- return (jint) sp->setPrintReflectedAmbientLight((short)value).code();
++ return (jint) sp->setPrintReflectedAmbientLight((short)value);
+ }
+
+
+diff -x bin -N -u -r dsgui351/interface/libsrc/DVPSTextObject.cpp /tmp/dicomscope/dsgui351/interface/libsrc/DVPSTextObject.cpp
+--- dsgui351/interface/libsrc/DVPSTextObject.cpp 2008-12-23 14:19:32.635340000 +0100
++++ /tmp/dicomscope/dsgui351/interface/libsrc/DVPSTextObject.cpp 1999-09-21 18:07:30.000000000 +0200
+@@ -127,7 +127,7 @@
+ {
+ DVPSTextObject *to = getAddressOfDVPSTextObject (env, obj);
+
+- return (jint) to->setAnchorPoint (x, y, (DVPSannotationUnit) unit, (isVisible != 0) ? OFTrue : OFFalse).code();
++ return (jint) to->setAnchorPoint (x, y, (DVPSannotationUnit) unit, (isVisible != 0) ? OFTrue : OFFalse);
+ }
+
+
+@@ -142,7 +142,7 @@
+ {
+ DVPSTextObject *to = getAddressOfDVPSTextObject (env, obj);
+
+- return (jint) to->setBoundingBox (TLHC_x, TLHC_y, BRHC_x, BRHC_y, (DVPSannotationUnit) unit, (DVPSTextJustification) justification).code();
++ return (jint) to->setBoundingBox (TLHC_x, TLHC_y, BRHC_x, BRHC_y, (DVPSannotationUnit) unit, (DVPSTextJustification) justification);
+ }
+
+
+@@ -163,7 +163,7 @@
+
+ env->ReleaseStringUTFChars (text, txt);
+
+- return (jint) res.code();
++ return (jint) res;
+ }
+
+
Property changes on: trunk/packages/dicomscope/trunk/debian/patches/dcmtk_350_354_changes.patch
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: trunk/packages/dicomscope/trunk/debian/patches/series
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/series (rev 0)
+++ trunk/packages/dicomscope/trunk/debian/patches/series 2008-12-23 13:32:28 UTC (rev 2840)
@@ -0,0 +1 @@
+dcmtk_350_354_changes.patch
Property changes on: trunk/packages/dicomscope/trunk/debian/patches/series
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
More information about the debian-med-commit
mailing list