[med-svn] r2843 - in trunk/packages/dicomscope/trunk/debian: . patches
malat-guest at alioth.debian.org
malat-guest at alioth.debian.org
Tue Dec 23 13:45:27 UTC 2008
Author: malat-guest
Date: 2008-12-23 13:45:27 +0000 (Tue, 23 Dec 2008)
New Revision: 2843
Modified:
trunk/packages/dicomscope/trunk/debian/get-orig-source
trunk/packages/dicomscope/trunk/debian/patches/dcmtk_350_354_changes.patch
trunk/packages/dicomscope/trunk/debian/rules
Log:
fix patch + cmake rules
Modified: trunk/packages/dicomscope/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/dicomscope/trunk/debian/get-orig-source 2008-12-23 13:39:10 UTC (rev 2842)
+++ trunk/packages/dicomscope/trunk/debian/get-orig-source 2008-12-23 13:45:27 UTC (rev 2843)
@@ -3,9 +3,10 @@
set -x
# ftp://dicom.offis.de/pub/dicom/offis/software/dscope/dscope351/dsgui351.zip
URL=ftp://dicom.offis.de/pub/dicom/offis/software/dscope/dscope351/
-NAME=dsgui
+UNAME=dsgui
UVERSION=351
-UPSTREAMDIR="$NAME""$UVERSION"
+UPSTREAMDIR="$UNAME""$UVERSION"
+NAME=dicomscope
VERSION=3.5.1
UPSTREAMZIP="$UPSTREAMDIR".zip
Modified: trunk/packages/dicomscope/trunk/debian/patches/dcmtk_350_354_changes.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/dcmtk_350_354_changes.patch 2008-12-23 13:39:10 UTC (rev 2842)
+++ trunk/packages/dicomscope/trunk/debian/patches/dcmtk_350_354_changes.patch 2008-12-23 13:45:27 UTC (rev 2843)
@@ -1,75 +1,75 @@
-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
+diff -x bin -N -u -r /tmp/dicomscope/dsgui351/CMakeLists.txt dsgui351/CMakeLists.txt
+--- /tmp/dicomscope/dsgui351/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
++++ dsgui351/CMakeLists.txt 2008-12-23 12:11:08.041265000 +0100
+@@ -0,0 +1,4 @@
++PROJECT(DICOMScope)
++
++INCLUDE_DIRECTORIES(interface/include)
++SUBDIRS(interface/libsrc)
+diff -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/CMakeLists.txt dsgui351/interface/libsrc/CMakeLists.txt
+--- /tmp/dicomscope/dsgui351/interface/libsrc/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
++++ dsgui351/interface/libsrc/CMakeLists.txt 2008-12-23 13:55:46.532824000 +0100
+@@ -0,0 +1,50 @@
++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 /tmp/dicomscope/dsgui351/interface/libsrc/.CMakeLists.txt.swp and dsgui351/interface/libsrc/.CMakeLists.txt.swp differ
+diff -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DSRCodeValue.cpp dsgui351/interface/libsrc/DSRCodeValue.cpp
+--- /tmp/dicomscope/dsgui351/interface/libsrc/DSRCodeValue.cpp 2000-12-06 16:41:34.000000000 +0100
++++ dsgui351/interface/libsrc/DSRCodeValue.cpp 2008-12-23 12:46:01.513221000 +0100
@@ -116,7 +116,7 @@
{
DSRCodedEntryValue *cod = getAddressOfDSRCodedEntryValue (env, obj);
-- return (jboolean) false; /*cod->isPrivateDcmtkCodingScheme();*/
-+ return (jboolean) cod->isPrivateDcmtkCodingScheme();
+- return (jboolean) cod->isPrivateDcmtkCodingScheme();
++ return (jboolean) false; /*cod->isPrivateDcmtkCodingScheme();*/
}
@@ -77,317 +77,317 @@
}
}
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
-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
+Binary files /tmp/dicomscope/dsgui351/interface/libsrc/.DSRCodeValue.cpp.swp and dsgui351/interface/libsrc/.DSRCodeValue.cpp.swp differ
+diff -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DSRCompositeValue.cpp dsgui351/interface/libsrc/DSRCompositeValue.cpp
+--- /tmp/dicomscope/dsgui351/interface/libsrc/DSRCompositeValue.cpp 2001-02-16 16:59:56.000000000 +0100
++++ dsgui351/interface/libsrc/DSRCompositeValue.cpp 2008-12-23 12:46:19.114065000 +0100
@@ -147,7 +147,7 @@
env->ReleaseStringUTFChars (sopClassUID, string1);
env->ReleaseStringUTFChars (sopInstanceUID, string2);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
-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 @@
+diff -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DSRDocument.cpp dsgui351/interface/libsrc/DSRDocument.cpp
+--- /tmp/dicomscope/dsgui351/interface/libsrc/DSRDocument.cpp 2001-05-22 12:35:00.000000000 +0200
++++ dsgui351/interface/libsrc/DSRDocument.cpp 2008-12-23 14:00:57.891356000 +0100
+@@ -43,7 +43,9 @@
#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 */
+-#include <strstream.h> /* for ostrstream */
++//#include <strstream.h> /* for ostrstream */
++#include <strstream> /* for ostrstream */
++using namespace std;
#endif
-@@ -114,7 +112,7 @@
+@@ -112,7 +114,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);
+- 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 @@
+@@ -130,7 +132,7 @@
delete[] string;
}
}
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
-@@ -190,7 +188,7 @@
+@@ -188,7 +190,7 @@
{
DSRDocument *doc = getAddressOfDSRDocument (env, obj);
-- return (jint) doc->setSpecificCharacterSetType((DSRTypes::E_CharacterSet)characterSet).code();
-+ return (jint) doc->setSpecificCharacterSetType((DSRTypes::E_CharacterSet)characterSet);
+- return (jint) doc->setSpecificCharacterSetType((DSRTypes::E_CharacterSet)characterSet);
++ return (jint) doc->setSpecificCharacterSetType((DSRTypes::E_CharacterSet)characterSet).code();
}
-@@ -274,7 +272,7 @@
+@@ -272,7 +274,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;
+- return (jint) res;
++ return (jint) res.code();
}
-@@ -308,7 +306,7 @@
+@@ -306,7 +308,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;
+- return (jint) res;
++ return (jint) res.code();
}
-@@ -322,7 +320,7 @@
+@@ -320,7 +322,7 @@
{
DSRDocument *doc = getAddressOfDSRDocument (env, obj);
-- return (jint)0/* doc->getNumberOfPredecessorDocuments()*/;
-+ return (jint) doc->getNumberOfPredecessorDocuments();
+- return (jint) doc->getNumberOfPredecessorDocuments();
++ return (jint)0/* doc->getNumberOfPredecessorDocuments()*/;
}
-@@ -337,7 +335,7 @@
+@@ -335,7 +337,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);
+- E_Condition res = doc->getPredecessorDocument((size_t)idx, scStr, siStr);
++ E_Condition res = 0/*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 @@
+@@ -343,7 +345,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;
+- return (jint) res;
++ return (jint) res.code();
}
-@@ -790,7 +788,7 @@
+@@ -788,7 +790,7 @@
env->ReleaseStringUTFChars (value, str);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
-@@ -822,7 +820,7 @@
+@@ -820,7 +822,7 @@
}
}
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
-@@ -854,7 +852,7 @@
+@@ -852,7 +854,7 @@
}
}
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
-@@ -874,7 +872,7 @@
+@@ -872,7 +874,7 @@
env->ReleaseStringUTFChars (value, str);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
-@@ -894,7 +892,7 @@
+@@ -892,7 +894,7 @@
env->ReleaseStringUTFChars (value, str);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
-@@ -926,7 +924,7 @@
+@@ -924,7 +926,7 @@
}
}
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
-@@ -958,7 +956,7 @@
+@@ -956,7 +958,7 @@
}
}
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
-@@ -990,7 +988,7 @@
+@@ -988,7 +990,7 @@
}
}
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
-@@ -1022,7 +1020,7 @@
+@@ -1020,7 +1022,7 @@
}
}
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
-@@ -1054,7 +1052,7 @@
+@@ -1052,7 +1054,7 @@
}
}
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
-@@ -1086,7 +1084,7 @@
+@@ -1084,7 +1086,7 @@
}
}
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
-@@ -1106,7 +1104,7 @@
+@@ -1104,7 +1106,7 @@
env->ReleaseStringUTFChars (value, str);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
-@@ -1126,7 +1124,7 @@
+@@ -1124,7 +1126,7 @@
env->ReleaseStringUTFChars (value, str);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
-@@ -1146,7 +1144,7 @@
+@@ -1144,7 +1146,7 @@
env->ReleaseStringUTFChars (value, str);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
-@@ -1194,7 +1192,7 @@
+@@ -1192,7 +1194,7 @@
env->ReleaseStringUTFChars (studyUID, str);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
-@@ -1224,7 +1222,7 @@
+@@ -1222,7 +1224,7 @@
E_Condition res = doc->createNewDocument();
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
-@@ -1240,7 +1238,7 @@
+@@ -1238,7 +1240,7 @@
E_Condition res = doc->createNewDocument((DSRTypes::E_DocumentType)type);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
-@@ -1256,7 +1254,7 @@
+@@ -1254,7 +1256,7 @@
E_Condition res = doc->createRevisedVersion();
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
-@@ -1272,7 +1270,7 @@
+@@ -1270,7 +1272,7 @@
E_Condition res = doc->completeDocument();
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
-@@ -1304,7 +1302,7 @@
+@@ -1302,7 +1304,7 @@
}
}
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
-@@ -1341,7 +1339,7 @@
+@@ -1339,7 +1341,7 @@
}
}
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
-@@ -1394,7 +1392,7 @@
+@@ -1392,7 +1394,7 @@
}
}
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
-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
+diff -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DSRDocumentTree.cpp dsgui351/interface/libsrc/DSRDocumentTree.cpp
+--- /tmp/dicomscope/dsgui351/interface/libsrc/DSRDocumentTree.cpp 2001-01-25 15:54:42.000000000 +0100
++++ dsgui351/interface/libsrc/DSRDocumentTree.cpp 2008-12-23 14:01:26.476717000 +0100
@@ -391,7 +391,7 @@
}
}
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -395,8 +395,8 @@
{
DSRDocumentTree *tree = getAddressOfDSRDocumentTree (env, obj);
-- return (jint) tree->getCurrentContentItem().setContinuityOfContent((DSRTypes::E_ContinuityOfContent)flag).code();
-+ return (jint) tree->getCurrentContentItem().setContinuityOfContent((DSRTypes::E_ContinuityOfContent)flag);
+- return (jint) tree->getCurrentContentItem().setContinuityOfContent((DSRTypes::E_ContinuityOfContent)flag);
++ return (jint) tree->getCurrentContentItem().setContinuityOfContent((DSRTypes::E_ContinuityOfContent)flag).code();
}
@@ -404,20 +404,20 @@
env->ReleaseStringUTFChars (value, str);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
-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
+diff -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DSRImageValue.cpp dsgui351/interface/libsrc/DSRImageValue.cpp
+--- /tmp/dicomscope/dsgui351/interface/libsrc/DSRImageValue.cpp 2001-02-16 16:58:52.000000000 +0100
++++ dsgui351/interface/libsrc/DSRImageValue.cpp 2008-12-23 14:01:59.829134000 +0100
@@ -147,7 +147,7 @@
env->ReleaseStringUTFChars (sopClassUID, string1);
env->ReleaseStringUTFChars (sopInstanceUID, string2);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -425,8 +425,8 @@
env->ReleaseStringUTFChars (sopClassUID, string1);
env->ReleaseStringUTFChars (sopInstanceUID, string2);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -434,8 +434,8 @@
env->SetIntField (frameNumber, env->GetFieldID (env->GetObjectClass (frameNumber), "value", "I"), fnValue);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -443,20 +443,20 @@
{
DSRImageReferenceValue *ref = getAddressOfDSRImageReferenceValue (env, obj);
-- return (jint) ref->getFrameList().removeItem((size_t)idx).code();
-+ return (jint) ref->getFrameList().removeItem((size_t)idx);
+- return (jint) ref->getFrameList().removeItem((size_t)idx);
++ return (jint) ref->getFrameList().removeItem((size_t)idx).code();
}
-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
+diff -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DSRNumericValue.cpp dsgui351/interface/libsrc/DSRNumericValue.cpp
+--- /tmp/dicomscope/dsgui351/interface/libsrc/DSRNumericValue.cpp 2000-11-23 17:57:28.000000000 +0100
++++ dsgui351/interface/libsrc/DSRNumericValue.cpp 2008-12-23 14:02:14.230292000 +0100
@@ -165,7 +165,7 @@
env->ReleaseStringUTFChars (numericValue, string);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -464,20 +464,20 @@
}
}
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
-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
+diff -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DSRSCoordValue.cpp dsgui351/interface/libsrc/DSRSCoordValue.cpp
+--- /tmp/dicomscope/dsgui351/interface/libsrc/DSRSCoordValue.cpp 2000-10-23 17:22:04.000000000 +0200
++++ dsgui351/interface/libsrc/DSRSCoordValue.cpp 2008-12-23 14:02:50.550467000 +0100
@@ -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);
+- return (jint) sco->setGraphicType((DSRTypes::E_GraphicType)graphicType);
++ return (jint) sco->setGraphicType((DSRTypes::E_GraphicType)graphicType).code();
}
@@ -485,8 +485,8 @@
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;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -494,32 +494,32 @@
{
DSRSpatialCoordinatesValue *sco = getAddressOfDSRSpatialCoordinatesValue (env, obj);
-- return (jint) sco->getGraphicDataList().removeItem((size_t)idx).code();
-+ return (jint) sco->getGraphicDataList().removeItem((size_t)idx);
+- return (jint) sco->getGraphicDataList().removeItem((size_t)idx);
++ return (jint) sco->getGraphicDataList().removeItem((size_t)idx).code();
}
-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
+diff -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DSRTCoordValue.cpp dsgui351/interface/libsrc/DSRTCoordValue.cpp
+--- /tmp/dicomscope/dsgui351/interface/libsrc/DSRTCoordValue.cpp 2000-10-27 10:42:52.000000000 +0200
++++ dsgui351/interface/libsrc/DSRTCoordValue.cpp 2008-12-23 14:03:02.022825000 +0100
@@ -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);
+- return (jint) tco->setTemporalRangeType((DSRTypes::E_TemporalRangeType)temporalRangeType);
++ return (jint) tco->setTemporalRangeType((DSRTypes::E_TemporalRangeType)temporalRangeType).code();
}
-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
+diff -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DSRWaveformValue.cpp dsgui351/interface/libsrc/DSRWaveformValue.cpp
+--- /tmp/dicomscope/dsgui351/interface/libsrc/DSRWaveformValue.cpp 2001-02-16 17:00:24.000000000 +0100
++++ dsgui351/interface/libsrc/DSRWaveformValue.cpp 2008-12-23 14:03:26.182329000 +0100
@@ -147,7 +147,7 @@
env->ReleaseStringUTFChars (sopClassUID, string1);
env->ReleaseStringUTFChars (sopInstanceUID, string2);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -527,8 +527,8 @@
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;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -536,20 +536,20 @@
{
DSRWaveformReferenceValue *ref = getAddressOfDSRWaveformReferenceValue (env, obj);
-- return (jint) ref->getChannelList().removeItem((size_t)idx).code();
-+ return (jint) ref->getChannelList().removeItem((size_t)idx);
+- return (jint) ref->getChannelList().removeItem((size_t)idx);
++ return (jint) ref->getChannelList().removeItem((size_t)idx).code();
}
-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
+diff -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DVInterface.cpp dsgui351/interface/libsrc/DVInterface.cpp
+--- /tmp/dicomscope/dsgui351/interface/libsrc/DVInterface.cpp 2001-01-29 18:26:32.000000000 +0100
++++ dsgui351/interface/libsrc/DVInterface.cpp 2008-12-23 14:09:32.873638000 +0100
@@ -121,7 +121,7 @@
env->ReleaseStringUTFChars (seriesUID, ser);
env->ReleaseStringUTFChars (instanceUID, ins);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -557,8 +557,8 @@
env->ReleaseStringUTFChars (filename, fn);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -566,8 +566,8 @@
E_Condition res = dvi->loadReferencedImage (idx, changeStatus == JNI_TRUE ? OFTrue : OFFalse);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -575,8 +575,8 @@
env->ReleaseStringUTFChars (seriesUID, ser);
env->ReleaseStringUTFChars (instanceUID, ins);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -584,8 +584,8 @@
env->ReleaseStringUTFChars (pstName, psn);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -593,8 +593,8 @@
env->ReleaseStringUTFChars (pstName, psn);
env->ReleaseStringUTFChars (imgName, imn);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -602,8 +602,8 @@
env->ReleaseStringUTFChars (seriesUID, ser);
env->ReleaseStringUTFChars (instanceUID, ins);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -611,8 +611,8 @@
env->ReleaseStringUTFChars (filename, fn);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -620,8 +620,8 @@
env->ReleaseStringUTFChars (reportID, id);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -629,8 +629,8 @@
E_Condition res = dvi->savePState(replaceSOPInstanceUID == JNI_TRUE ? OFTrue : OFFalse);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -638,8 +638,8 @@
env->ReleaseStringUTFChars (filename, fn);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -647,8 +647,8 @@
env->ReleaseStringUTFChars (filename, fn);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -656,8 +656,8 @@
E_Condition res = dvi->saveStructuredReport();
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -665,8 +665,8 @@
env->ReleaseStringUTFChars (filename, fn);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -674,8 +674,8 @@
env->ReleaseStringUTFChars (seriesUID, ser);
env->ReleaseStringUTFChars (instanceUID, ins);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -683,8 +683,8 @@
E_Condition res = dvi->resetPresentationState();
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -692,8 +692,8 @@
E_Condition res = dvi->saveCurrentPStateForReset();
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -701,8 +701,8 @@
E_Condition res = dvi->releaseDatabase();
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -710,8 +710,8 @@
E_Condition res = dvi->selectStudy(idx);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -719,8 +719,8 @@
env->ReleaseStringUTFChars (studyUID, stu);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -728,8 +728,8 @@
E_Condition res = dvi->selectSeries(idx);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -737,8 +737,8 @@
env->ReleaseStringUTFChars (seriesUID, ser);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -746,8 +746,8 @@
E_Condition res = dvi->selectInstance(idx);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -755,8 +755,8 @@
env->ReleaseStringUTFChars (instanceUID, ins);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -764,8 +764,8 @@
env->ReleaseStringUTFChars (instanceUID, ins);
env->ReleaseStringUTFChars (sopClassUID, sop);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -773,8 +773,8 @@
env->ReleaseStringUTFChars (seriesUID, ser);
env->ReleaseStringUTFChars (instanceUID, ins);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -782,8 +782,8 @@
env->ReleaseStringUTFChars (seriesUID, ser);
env->ReleaseStringUTFChars (instanceUID, ins);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -791,8 +791,8 @@
env->ReleaseStringUTFChars (seriesUID, ser);
env->ReleaseStringUTFChars (instanceUID, ins);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -800,8 +800,8 @@
env->ReleaseStringUTFChars (studyUID, stu);
env->ReleaseStringUTFChars (seriesUID, ser);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -809,8 +809,8 @@
env->ReleaseStringUTFChars (studyUID, stu);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -818,8 +818,8 @@
E_Condition res = dvi->startReceiver();
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -827,8 +827,8 @@
E_Condition res = dvi->terminateReceiver();
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -836,8 +836,8 @@
E_Condition res = dvi->startQueryRetrieveServer();
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -845,8 +845,8 @@
E_Condition res = dvi->terminateQueryRetrieveServer();
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -854,8 +854,8 @@
env->ReleaseStringUTFChars (studyUID, stu);
env->ReleaseStringUTFChars (targetID, tid);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -863,8 +863,8 @@
env->ReleaseStringUTFChars (studyUID, stu);
env->ReleaseStringUTFChars (seriesUID, ser);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -872,8 +872,8 @@
env->ReleaseStringUTFChars (seriesUID, ser);
env->ReleaseStringUTFChars (instanceUID, ins);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -881,8 +881,8 @@
env->ReleaseStringUTFChars (filename, fn);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -890,8 +890,8 @@
env->ReleaseStringUTFChars (seriesUID, ser);
env->ReleaseStringUTFChars (instanceUID, ins);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -899,8 +899,8 @@
env->ReleaseStringUTFChars (filename, fn);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -908,8 +908,8 @@
env->ReleaseStringUTFChars (seriesUID, ser);
env->ReleaseStringUTFChars (instanceUID, ins);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -917,8 +917,8 @@
env->ReleaseStringUTFChars (filename, fname);
env->ReleaseByteArrayElements (pixelData, (jbyte *) array, JNI_ABORT);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -926,8 +926,8 @@
env->ReleaseStringUTFChars (instanceUID, iUID);
env->ReleaseByteArrayElements (pixelData, (jbyte *) array, JNI_ABORT);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -935,8 +935,8 @@
env->ReleaseByteArrayElements (pixelData, (jbyte *) array, JNI_ABORT);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -944,8 +944,8 @@
env->ReleaseStringUTFChars (instanceUID, ui);
env->ReleaseShortArrayElements (pixelData, (jshort *) array, 0);
-- return res.code();
-+ return res;
+- return res;
++ return res.code();
}
@@ -953,8 +953,8 @@
env->ReleaseShortArrayElements (pixelData, (jshort *) array, 0);
-- return res.code();
-+ return res;
+- return res;
++ return res.code();
}
@@ -962,8 +962,8 @@
env->ReleaseStringUTFChars (seriesUID, ser);
env->ReleaseStringUTFChars (instanceUID, ins);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -971,8 +971,8 @@
env->ReleaseStringUTFChars (filename, fn);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -980,8 +980,8 @@
env->ReleaseStringUTFChars (filename, fn);
env->ReleaseStringUTFChars (instanceUID, ui);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -989,8 +989,8 @@
E_Condition res = dvi->saveStoredPrint (wrRqImgS);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -998,8 +998,8 @@
E_Condition res = dvi->loadPrintPreview(idx, printLUT, changeStatus == JNI_TRUE ? OFTrue : OFFalse);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1007,8 +1007,8 @@
E_Condition res = dvi->getPrintPreviewWidthHeight (w, h);
-- if (res != EC_Normal) return (jint) res.code();
-+ if (res != EC_Normal) return (jint) res;
+- if (res != EC_Normal) return (jint) res;
++ if (res != EC_Normal) return (jint) res.code();
jclass wIntByRefcls = env->GetObjectClass (width);
jclass hIntByRefcls = env->GetObjectClass (height);
@@ -1016,8 +1016,8 @@
env->SetIntField (width, wvalue, (jint) w);
env->SetIntField (height, hvalue, (jint) h);
-- return (jint) EC_Normal.code();
-+ return (jint) EC_Normal;
+- return (jint) EC_Normal;
++ return (jint) EC_Normal.code();
}
@@ -1025,8 +1025,8 @@
env->ReleaseByteArrayElements (bitmap, (jbyte *) array, 0);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1034,8 +1034,8 @@
E_Condition res = dvi->disablePState();
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1043,8 +1043,8 @@
E_Condition res = dvi->enablePState();
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1052,8 +1052,8 @@
E_Condition res = dvi->selectPState(idx, changeStatus == JNI_TRUE ? OFTrue : OFFalse);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1061,8 +1061,8 @@
E_Condition res = dvi->setAmbientLightValue(alv);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1070,8 +1070,8 @@
E_Condition res = dvi->getAmbientLightValue(_alv);
-- if (res != EC_Normal) return (jint) res.code();
-+ if (res != EC_Normal) return (jint) res;
+- if (res != EC_Normal) return (jint) res;
++ if (res != EC_Normal) return (jint) res.code();
jclass DoubleByRefcls = env->GetObjectClass (alv);
@@ -1079,8 +1079,8 @@
env->SetDoubleField (alv, value, _alv);
-- return (jint) EC_Normal.code();
-+ return (jint) EC_Normal;
+- return (jint) EC_Normal;
++ return (jint) EC_Normal.code();
}
@@ -1088,8 +1088,8 @@
env->ReleaseStringUTFChars (targetID, tid);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1097,8 +1097,8 @@
env->ReleaseStringUTFChars (value, val);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1106,8 +1106,8 @@
env->ReleaseStringUTFChars (value, val);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1115,8 +1115,8 @@
env->ReleaseStringUTFChars (value, val);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1124,8 +1124,8 @@
env->ReleaseStringUTFChars (value, val);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1133,8 +1133,8 @@
env->ReleaseStringUTFChars (value, val);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1142,8 +1142,8 @@
{
DVInterface *dvi = getAddressOfDVInterface (env, obj);
-- return (jint) dvi->setPrinterNumberOfCopies((long) value).code();
-+ return (jint) dvi->setPrinterNumberOfCopies((long) value);
+- return (jint) dvi->setPrinterNumberOfCopies((long) value);
++ return (jint) dvi->setPrinterNumberOfCopies((long) value).code();
}
@@ -1151,8 +1151,8 @@
env->ReleaseStringUTFChars (lutID, lid);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1160,8 +1160,8 @@
env->ReleaseStringUTFChars (lutID, lid);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1169,8 +1169,8 @@
{
DVInterface *dvi = getAddressOfDVInterface (env, obj);
-- return (jint) dvi->spoolPrintJob((deletePrintedImages == JNI_TRUE) ? OFTrue : OFFalse).code();
-+ return (jint) dvi->spoolPrintJob((deletePrintedImages == JNI_TRUE) ? OFTrue : OFFalse);
+- return (jint) dvi->spoolPrintJob((deletePrintedImages == JNI_TRUE) ? OFTrue : OFFalse);
++ return (jint) dvi->spoolPrintJob((deletePrintedImages == JNI_TRUE) ? OFTrue : OFFalse).code();
}
@@ -1178,8 +1178,8 @@
{
DVInterface *dvi = getAddressOfDVInterface (env, obj);
-- return (jint) dvi->startPrintSpooler().code();
-+ return (jint) dvi->startPrintSpooler();
+- return (jint) dvi->startPrintSpooler();
++ return (jint) dvi->startPrintSpooler().code();
}
@@ -1187,8 +1187,8 @@
{
DVInterface *dvi = getAddressOfDVInterface (env, obj);
-- return (jint) dvi->terminatePrintSpooler().code();
-+ return (jint) dvi->terminatePrintSpooler();
+- return (jint) dvi->terminatePrintSpooler();
++ return (jint) dvi->terminatePrintSpooler().code();
}
@@ -1196,8 +1196,8 @@
{
DVInterface *dvi = getAddressOfDVInterface (env, obj);
-- return (jint) dvi->startPrintServer().code();
-+ return (jint) dvi->startPrintServer();
+- return (jint) dvi->startPrintServer();
++ return (jint) dvi->startPrintServer().code();
}
@@ -1205,8 +1205,8 @@
{
DVInterface *dvi = getAddressOfDVInterface (env, obj);
-- return (jint) dvi->terminatePrintServer().code();
-+ return (jint) dvi->terminatePrintServer();
+- return (jint) dvi->terminatePrintServer();
++ return (jint) dvi->terminatePrintServer().code();
}
@@ -1214,8 +1214,8 @@
env->ReleaseStringUTFChars (seriesUID, ser);
env->ReleaseStringUTFChars (instanceUID, ins);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1223,8 +1223,8 @@
env->ReleaseStringUTFChars (seriesUID, ser);
env->ReleaseStringUTFChars (instanceUID, ins);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1232,8 +1232,8 @@
env->ReleaseStringUTFChars (userID, str1);
env->ReleaseStringUTFChars (passwd, str2);
-- return (jint) result.code();
-+ return (jint) result;
+- return (jint) result;
++ return (jint) result.code();
}
@@ -1241,21 +1241,21 @@
env->ReleaseStringUTFChars (module, mod);
env->ReleaseStringUTFChars (message, msg);
-- return (jint)res.code();
-+ return (jint)res;
+- return (jint)res;
++ return (jint)res.code();
}
-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
+Binary files /tmp/dicomscope/dsgui351/interface/libsrc/.DVInterface.cpp.swp and dsgui351/interface/libsrc/.DVInterface.cpp.swp differ
+diff -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DVPresentationState.cpp dsgui351/interface/libsrc/DVPresentationState.cpp
+--- /tmp/dicomscope/dsgui351/interface/libsrc/DVPresentationState.cpp 2000-11-23 17:45:22.000000000 +0100
++++ dsgui351/interface/libsrc/DVPresentationState.cpp 2008-12-23 14:17:45.488320000 +0100
@@ -179,7 +179,7 @@
}
}
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1263,8 +1263,8 @@
}
}
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1272,8 +1272,8 @@
}
}
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1281,8 +1281,8 @@
env->SetObjectField (pixel, datafid, array);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1290,8 +1290,8 @@
{
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-- return (jint) ps->setRotation ((DVPSRotationType) rotation).code();
-+ return (jint) ps->setRotation ((DVPSRotationType) rotation);
+- return (jint) ps->setRotation ((DVPSRotationType) rotation);
++ return (jint) ps->setRotation ((DVPSRotationType) rotation).code();
}
@@ -1299,8 +1299,8 @@
{
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-- return (jint) ps->setFlip (isFlipped == JNI_TRUE ? OFTrue : OFFalse).code();
-+ return (jint) ps->setFlip (isFlipped == JNI_TRUE ? OFTrue : OFFalse);
+- return (jint) ps->setFlip (isFlipped == JNI_TRUE ? OFTrue : OFFalse);
++ return (jint) ps->setFlip (isFlipped == JNI_TRUE ? OFTrue : OFFalse).code();
}
@@ -1308,8 +1308,8 @@
env->ReleaseStringUTFChars (filesetID, fid);
env->ReleaseStringUTFChars (filesetUID, fui);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1317,8 +1317,8 @@
env->ReleaseStringUTFChars (filesetID, fid);
env->ReleaseStringUTFChars (filesetUID, fui);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1326,8 +1326,8 @@
env->ReleaseStringUTFChars (seriesUID, ser);
env->ReleaseStringUTFChars (instanceUID, ins);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1335,8 +1335,8 @@
{
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-- return (jint) ps->removeImageReferenceAttached ().code();
-+ return (jint) ps->removeImageReferenceAttached ();
+- return (jint) ps->removeImageReferenceAttached ();
++ return (jint) ps->removeImageReferenceAttached ().code();
}
@@ -1344,16 +1344,16 @@
E_Condition res = ps->getImageNumberOfFrames (fr);
-- if (res != EC_Normal) return (jint) res.code();
-+ if (res != EC_Normal) return (jint) res;
+- if (res != EC_Normal) return (jint) res;
++ if (res != EC_Normal) return (jint) res.code();
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;
+- return (jint) EC_Normal;
++ return (jint) EC_Normal.code();
}
@@ -1361,8 +1361,8 @@
{
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-- return (jint) ps->selectImageFrameNumber (frame).code();
-+ return (jint) ps->selectImageFrameNumber (frame);
+- return (jint) ps->selectImageFrameNumber (frame);
++ return (jint) ps->selectImageFrameNumber (frame).code();
}
@@ -1370,8 +1370,8 @@
{
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-- return (jint) ps->setRectShutter (lv, rv, uh, lh).code();
-+ return (jint) ps->setRectShutter (lv, rv, uh, lh);
+- return (jint) ps->setRectShutter (lv, rv, uh, lh);
++ return (jint) ps->setRectShutter (lv, rv, uh, lh).code();
}
@@ -1379,8 +1379,8 @@
{
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-- return (jint) ps->setCurrentPresentationLUT ((DVPSPresentationLUTType) type).code();
-+ return (jint) ps->setCurrentPresentationLUT ((DVPSPresentationLUTType) type);
+- return (jint) ps->setCurrentPresentationLUT ((DVPSPresentationLUTType) type);
++ return (jint) ps->setCurrentPresentationLUT ((DVPSPresentationLUTType) type).code();
}
@@ -1388,8 +1388,8 @@
{
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-- return (jint) ps->setCircularShutter (centerX, centerY, radius).code();
-+ return (jint) ps->setCircularShutter (centerX, centerY, radius);
+- return (jint) ps->setCircularShutter (centerX, centerY, radius);
++ return (jint) ps->setCircularShutter (centerX, centerY, radius).code();
}
@@ -1397,8 +1397,8 @@
{
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-- return (jint) ps->setPolyShutterOrigin (x, y).code();
-+ return (jint) ps->setPolyShutterOrigin (x, y);
+- return (jint) ps->setPolyShutterOrigin (x, y);
++ return (jint) ps->setPolyShutterOrigin (x, y).code();
}
@@ -1406,8 +1406,8 @@
{
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-- return (jint) ps->addPolyShutterVertex (x, y).code();
-+ return (jint) ps->addPolyShutterVertex (x, y);
+- return (jint) ps->addPolyShutterVertex (x, y);
++ return (jint) ps->addPolyShutterVertex (x, y).code();
}
@@ -1415,8 +1415,8 @@
E_Condition res = ps->getPolyShutterVertex (idx, x, y);
-- if (res != EC_Normal) return (jint) res.code();
-+ if (res != EC_Normal) return (jint) res;
+- if (res != EC_Normal) return (jint) res;
++ if (res != EC_Normal) return (jint) res.code();
jclass pointcls = env->GetObjectClass (pointXY);
jfieldID xfid = env->GetFieldID (pointcls, "x", "I");
@@ -1424,8 +1424,8 @@
env->SetIntField (pointXY, xfid, (jint) x);
env->SetIntField (pointXY, yfid, (jint) y);
-- return (jint) EC_Normal.code();
-+ return (jint) EC_Normal;
+- return (jint) EC_Normal;
++ return (jint) EC_Normal.code();
}
@@ -1433,8 +1433,8 @@
{
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-- return (jint) ps->setShutterPresentationValue ((Uint16) pvalue).code();
-+ return (jint) ps->setShutterPresentationValue ((Uint16) pvalue);
+- return (jint) ps->setShutterPresentationValue ((Uint16) pvalue);
++ return (jint) ps->setShutterPresentationValue ((Uint16) pvalue).code();
}
@@ -1442,11 +1442,11 @@
long tx, ty, bx, by;
-- E_Condition res = 0/*ps->getDisplayedArea (tx, ty, bx, by)*/;
-+ E_Condition res = ps->getDisplayedArea (tx, ty, bx, by);
+- E_Condition res = ps->getDisplayedArea (tx, ty, bx, by);
++ E_Condition res = 0/*ps->getDisplayedArea (tx, ty, bx, by)*/;
-- if (res != EC_Normal) return (jint) res.code();
-+ if (res != EC_Normal) return (jint) res;
+- if (res != EC_Normal) return (jint) res;
++ if (res != EC_Normal) return (jint) res.code();
jclass txIntByRefcls = env->GetObjectClass (tlhcX);
jclass tyIntByRefcls = env->GetObjectClass (tlhcY);
@@ -1454,8 +1454,8 @@
env->SetIntField (brhcX, bxvalue, (jint) bx);
env->SetIntField (brhcY, byvalue, (jint) by);
-- return (jint) EC_Normal.code();
-+ return (jint) EC_Normal;
+- return (jint) EC_Normal;
++ return (jint) EC_Normal.code();
}
@@ -1463,8 +1463,8 @@
E_Condition res = ps->getDisplayedAreaPresentationPixelSpacing (xx, yy);
-- if (res != EC_Normal) return (jint) res.code();
-+ if (res != EC_Normal) return (jint) res;
+- if (res != EC_Normal) return (jint) res;
++ if (res != EC_Normal) return (jint) res.code();
jclass xDoubleByRefcls = env->GetObjectClass (x);
jclass yDoubleByRefcls = env->GetObjectClass (y);
@@ -1472,8 +1472,8 @@
env->SetDoubleField (x, xvalue, xx);
env->SetDoubleField (y, yvalue, yy);
-- return (jint) EC_Normal.code();
-+ return (jint) EC_Normal;
+- return (jint) EC_Normal;
++ return (jint) EC_Normal.code();
}
/*
@@ -1481,8 +1481,8 @@
E_Condition res = ps->getDisplayedAreaPresentationPixelMagnificationRatio (m);
-- if (res != EC_Normal) return (jint) res.code();
-+ if (res != EC_Normal) return (jint) res;
+- if (res != EC_Normal) return (jint) res;
++ if (res != EC_Normal) return (jint) res.code();
jclass mDoubleByRefcls = env->GetObjectClass (magnification);
@@ -1490,8 +1490,8 @@
env->SetDoubleField (magnification, mvalue, m);
-- return (jint) EC_Normal.code();
-+ return (jint) EC_Normal;
+- return (jint) EC_Normal;
++ return (jint) EC_Normal.code();
}
@@ -1499,10 +1499,10 @@
{
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);
+- return (jint) ps->setDisplayedArea ((DVPSPresentationSizeMode) sizeMode, tlhcX,
+- tlhcY, brhcX, brhcY, magnification, (DVPSObjectApplicability) applicability);
++ return (jint)0/* ps->setDisplayedArea ((DVPSPresentationSizeMode) sizeMode, tlhcX,
++ tlhcY, brhcX, brhcY, magnification, (DVPSObjectApplicability) applicability)*/;
}
@@ -1510,16 +1510,16 @@
E_Condition res = ps->getGraphicLayerRecommendedDisplayValueGray (idx, gr);
-- if (res != EC_Normal) return (jint) res.code();
-+ if (res != EC_Normal) return (jint) res;
+- if (res != EC_Normal) return (jint) res;
++ if (res != EC_Normal) return (jint) res.code();
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;
+- return (jint) EC_Normal;
++ return (jint) EC_Normal.code();
}
@@ -1527,8 +1527,8 @@
E_Condition res = ps->getGraphicLayerRecommendedDisplayValueRGB (idx, rr, gg, bb);
-- if (res != EC_Normal) return (jint) res.code();
-+ if (res != EC_Normal) return (jint) res;
+- if (res != EC_Normal) return (jint) res;
++ if (res != EC_Normal) return (jint) res.code();
jclass rIntByRefcls = env->GetObjectClass (r);
jclass gIntByRefcls = env->GetObjectClass (g);
@@ -1536,8 +1536,8 @@
env->SetIntField (g, gvalue, (jint) gg);
env->SetIntField (b, bvalue, (jint) bb);
-- return (jint) EC_Normal.code();
-+ return (jint) EC_Normal;
+- return (jint) EC_Normal;
++ return (jint) EC_Normal.code();
}
@@ -1545,8 +1545,8 @@
{
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-- return (jint) 0/*ps->setGraphicLayerRecommendedDisplayValueGray (idx, (Uint16) gray)*/;
-+ return (jint) ps->setGraphicLayerRecommendedDisplayValueGray (idx, (Uint16) gray);
+- return (jint) ps->setGraphicLayerRecommendedDisplayValueGray (idx, (Uint16) gray);
++ return (jint) 0/*ps->setGraphicLayerRecommendedDisplayValueGray (idx, (Uint16) gray)*/;
}
@@ -1554,8 +1554,8 @@
{
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);
+- return (jint) ps->setGraphicLayerRecommendedDisplayValueRGB (idx, (Uint16) r, (Uint16) g, (Uint16) b);
++ return (jint) 0/*ps->setGraphicLayerRecommendedDisplayValueRGB (idx, (Uint16) r, (Uint16) g, (Uint16) b)*/;
}
@@ -1563,8 +1563,8 @@
env->ReleaseStringUTFChars (name, nam);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1572,8 +1572,8 @@
}
}
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1581,8 +1581,8 @@
{
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-- return (jint) 0/*ps->toFrontGraphicLayer (idx)*/;
-+ return (jint) ps->toFrontGraphicLayer (idx);
+- return (jint) ps->toFrontGraphicLayer (idx);
++ return (jint) 0/*ps->toFrontGraphicLayer (idx)*/;
}
@@ -1590,8 +1590,8 @@
{
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-- return (jint) 0/*ps->toBackGraphicLayer (idx)*/;
-+ return (jint) ps->toBackGraphicLayer (idx);
+- return (jint) ps->toBackGraphicLayer (idx);
++ return (jint) 0/*ps->toBackGraphicLayer (idx)*/;
}
@@ -1599,8 +1599,8 @@
}
}
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1608,8 +1608,8 @@
{
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-- return (jint) 0/*ps->removeGraphicLayer (idx)*/;
-+ return (jint) ps->removeGraphicLayer (idx);
+- return (jint) ps->removeGraphicLayer (idx);
++ return (jint) 0/*ps->removeGraphicLayer (idx)*/;
}
@@ -1617,8 +1617,8 @@
{
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-- return (jint) 0/*ps->removeTextObject (layer, idx)*/;
-+ return (jint) ps->removeTextObject (layer, idx);
+- return (jint) ps->removeTextObject (layer, idx);
++ return (jint) 0/*ps->removeTextObject (layer, idx)*/;
}
@@ -1626,8 +1626,8 @@
{
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);
+- return (jint) ps->moveTextObject (old_layer, idx, new_layer, (DVPSObjectApplicability) applicability);
++ return (jint) ps->moveTextObject (old_layer, idx, new_layer, (DVPSObjectApplicability) applicability).code();
}
@@ -1635,8 +1635,8 @@
{
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-- return (jint) ps->removeGraphicObject (layer, idx).code();
-+ return (jint) ps->removeGraphicObject (layer, idx);
+- return (jint) ps->removeGraphicObject (layer, idx);
++ return (jint) ps->removeGraphicObject (layer, idx).code();
}
@@ -1644,8 +1644,8 @@
{
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);
+- return (jint) ps->moveGraphicObject (old_layer, idx, new_layer, (DVPSObjectApplicability) applicability);
++ return (jint) ps->moveGraphicObject (old_layer, idx, new_layer, (DVPSObjectApplicability) applicability).code();
}
@@ -1653,8 +1653,8 @@
{
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-- return (jint) ps->setCharset ((DVPScharacterSet) charset).code();
-+ return (jint) ps->setCharset ((DVPScharacterSet) charset);
+- return (jint) ps->setCharset ((DVPScharacterSet) charset);
++ return (jint) ps->setCharset ((DVPScharacterSet) charset).code();
}
@@ -1662,8 +1662,8 @@
{
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-- return (jint) ps->addCurve (layer, curveidxinimage).code();
-+ return (jint) ps->addCurve (layer, curveidxinimage);
+- return (jint) ps->addCurve (layer, curveidxinimage);
++ return (jint) ps->addCurve (layer, curveidxinimage).code();
}
@@ -1671,8 +1671,8 @@
{
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-- return (jint) ps->removeCurve (layer, idx).code();
-+ return (jint) ps->removeCurve (layer, idx);
+- return (jint) ps->removeCurve (layer, idx);
++ return (jint) ps->removeCurve (layer, idx).code();
}
@@ -1680,8 +1680,8 @@
{
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-- return (jint) ps->moveCurve (old_layer, idx, new_layer).code();
-+ return (jint) ps->moveCurve (old_layer, idx, new_layer);
+- return (jint) ps->moveCurve (old_layer, idx, new_layer);
++ return (jint) ps->moveCurve (old_layer, idx, new_layer).code();
}
@@ -1689,8 +1689,8 @@
E_Condition res = ps->getCurrentWindowWidth (ww);
-- if (res != EC_Normal) return (jint) res.code();
-+ if (res != EC_Normal) return (jint) res;
+- if (res != EC_Normal) return (jint) res;
++ if (res != EC_Normal) return (jint) res.code();
jclass wDoubleByRefcls = env->GetObjectClass (w);
@@ -1698,8 +1698,8 @@
env->SetDoubleField (w, wvalue, ww);
-- return (jint) EC_Normal.code();
-+ return (jint) EC_Normal;
+- return (jint) EC_Normal;
++ return (jint) EC_Normal.code();
}
@@ -1707,8 +1707,8 @@
E_Condition res = ps->getCurrentWindowCenter (cc);
-- if (res != EC_Normal) return (jint) res.code();
-+ if (res != EC_Normal) return (jint) res;
+- if (res != EC_Normal) return (jint) res;
++ if (res != EC_Normal) return (jint) res.code();
jclass cDoubleByRefcls = env->GetObjectClass (c);
@@ -1716,8 +1716,8 @@
env->SetDoubleField (c, cvalue, (jdouble) cc);
-- return (jint) EC_Normal.code();
-+ return (jint) EC_Normal;
+- return (jint) EC_Normal;
++ return (jint) EC_Normal.code();
}
@@ -1725,8 +1725,8 @@
{
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-- return (jint) ps->setVOILUTFromImage (idx, (DVPSObjectApplicability) applicability).code();
-+ return (jint) ps->setVOILUTFromImage (idx, (DVPSObjectApplicability) applicability);
+- return (jint) ps->setVOILUTFromImage (idx, (DVPSObjectApplicability) applicability);
++ return (jint) ps->setVOILUTFromImage (idx, (DVPSObjectApplicability) applicability).code();
}
@@ -1734,8 +1734,8 @@
{
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-- return (jint) ps->setVOIWindowFromImage (idx, (DVPSObjectApplicability) applicability).code();
-+ return (jint) ps->setVOIWindowFromImage (idx, (DVPSObjectApplicability) applicability);
+- return (jint) ps->setVOIWindowFromImage (idx, (DVPSObjectApplicability) applicability);
++ return (jint) ps->setVOIWindowFromImage (idx, (DVPSObjectApplicability) applicability).code();
}
@@ -1743,8 +1743,8 @@
}
}
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1752,8 +1752,8 @@
{
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-- return (jint) ps->setGammaVOILUT (gammaValue, (DVPSObjectApplicability) applicability).code();
-+ return (jint) ps->setGammaVOILUT (gammaValue, (DVPSObjectApplicability) applicability);
+- return (jint) ps->setGammaVOILUT (gammaValue, (DVPSObjectApplicability) applicability);
++ return (jint) ps->setGammaVOILUT (gammaValue, (DVPSObjectApplicability) applicability).code();
}
@@ -1761,8 +1761,8 @@
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??
+- if (res != EC_Normal) return res; // Fehler??
++ if (res != EC_Normal) return res.code(); // Fehler??
jfieldID datafid = env->GetFieldID (ovdatcls, "overlayData", "[B");
@@ -1770,8 +1770,8 @@
env->SetObjectField (od, data12fid, array);
}
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1779,8 +1779,8 @@
{
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-- return (jint) ps->removeOverlayFromPresentationState (idx).code();
-+ return (jint) ps->removeOverlayFromPresentationState (idx);
+- return (jint) ps->removeOverlayFromPresentationState (idx);
++ return (jint) ps->removeOverlayFromPresentationState (idx).code();
}
@@ -1788,8 +1788,8 @@
{
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-- return (jint) ps->changeOverlayGroupInPresentationState (idx, (short) newGroup).code();
-+ return (jint) ps->changeOverlayGroupInPresentationState (idx, (short) newGroup);
+- return (jint) ps->changeOverlayGroupInPresentationState (idx, (short) newGroup);
++ return (jint) ps->changeOverlayGroupInPresentationState (idx, (short) newGroup).code();
}
@@ -1797,8 +1797,8 @@
{
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-- return (jint) ps->activateOverlayInImage (layer, idx).code();
-+ return (jint) ps->activateOverlayInImage (layer, idx);
+- return (jint) ps->activateOverlayInImage (layer, idx);
++ return (jint) ps->activateOverlayInImage (layer, idx).code();
}
@@ -1806,8 +1806,8 @@
{
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-- return (jint) ps->activateOverlayInPresentationState (layer, idx).code();
-+ return (jint) ps->activateOverlayInPresentationState (layer, idx);
+- return (jint) ps->activateOverlayInPresentationState (layer, idx);
++ return (jint) ps->activateOverlayInPresentationState (layer, idx).code();
}
@@ -1815,8 +1815,8 @@
{
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-- return (jint) ps->activateOverlayAsBitmapShutter (idx).code();
-+ return (jint) ps->activateOverlayAsBitmapShutter (idx);
+- return (jint) ps->activateOverlayAsBitmapShutter (idx);
++ return (jint) ps->activateOverlayAsBitmapShutter (idx).code();
}
@@ -1824,8 +1824,8 @@
{
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-- return (jint) ps->deactivateOverlay (layer, idx).code();
-+ return (jint) ps->deactivateOverlay (layer, idx);
+- return (jint) ps->deactivateOverlay (layer, idx);
++ return (jint) ps->deactivateOverlay (layer, idx).code();
}
@@ -1833,8 +1833,8 @@
{
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-- return (jint) ps->moveOverlay (old_layer, idx, new_layer).code();
-+ return (jint) ps->moveOverlay (old_layer, idx, new_layer);
+- return (jint) ps->moveOverlay (old_layer, idx, new_layer);
++ return (jint) ps->moveOverlay (old_layer, idx, new_layer).code();
}
@@ -1842,8 +1842,8 @@
E_Condition res = ps->getImageMinMaxPixelRange (min, max);
-- if (res != EC_Normal) return (jint) res.code();
-+ if (res != EC_Normal) return (jint) res;
+- if (res != EC_Normal) return (jint) res;
++ if (res != EC_Normal) return (jint) res.code();
jclass minDoubleByRefcls = env->GetObjectClass (minValue);
jclass maxDoubleByRefcls = env->GetObjectClass (maxValue);
@@ -1851,8 +1851,8 @@
env->SetDoubleField (minValue, minvalue, min);
env->SetDoubleField (maxValue, maxvalue, max);
-- return (jint) EC_Normal.code();
-+ return (jint) EC_Normal;
+- return (jint) EC_Normal;
++ return (jint) EC_Normal.code();
}
@@ -1860,8 +1860,8 @@
E_Condition res = ps->getImageMinMaxPixelValue (min, max);
-- if (res != EC_Normal) return (jint) res.code();
-+ if (res != EC_Normal) return (jint) res;
+- if (res != EC_Normal) return (jint) res;
++ if (res != EC_Normal) return (jint) res.code();
jclass minDoubleByRefcls = env->GetObjectClass (minValue);
jclass maxDoubleByRefcls = env->GetObjectClass (maxValue);
@@ -1869,8 +1869,8 @@
env->SetDoubleField (minValue, minvalue, min);
env->SetDoubleField (maxValue, maxvalue, max);
-- return (jint) EC_Normal.code();
-+ return (jint) EC_Normal;
+- return (jint) EC_Normal;
++ return (jint) EC_Normal.code();
}
@@ -1878,8 +1878,8 @@
E_Condition res = ps->getImageWidth (w);
-- if (res != EC_Normal) return (jint) res.code();
-+ if (res != EC_Normal) return (jint) res;
+- if (res != EC_Normal) return (jint) res;
++ if (res != EC_Normal) return (jint) res.code();
jclass wIntByRefcls = env->GetObjectClass (width);
@@ -1887,8 +1887,8 @@
env->SetIntField (width, wvalue, w);
-- return (jint) EC_Normal.code();
-+ return (jint) EC_Normal;
+- return (jint) EC_Normal;
++ return (jint) EC_Normal.code();
}
@@ -1896,8 +1896,8 @@
E_Condition res = ps->getImageHeight (h);
-- if (res != EC_Normal) return (jint) res.code();
-+ if (res != EC_Normal) return (jint) res;
+- if (res != EC_Normal) return (jint) res;
++ if (res != EC_Normal) return (jint) res.code();
jclass hIntByRefcls = env->GetObjectClass (height);
@@ -1905,8 +1905,8 @@
env->SetIntField (height, hvalue, h);
-- return (jint) EC_Normal.code();
-+ return (jint) EC_Normal;
+- return (jint) EC_Normal;
++ return (jint) EC_Normal.code();
}
@@ -1914,8 +1914,8 @@
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;
+- if (res != EC_Normal) return res;
++ if (res != EC_Normal) return res.code();
jclass paramcls = env->GetObjectClass (param);
jfieldID stfid = env->GetFieldID (paramcls, "studyUID", "Ljava/lang/String;");
@@ -1923,8 +1923,8 @@
env->SetObjectField (param, fifid, fiobj);
env->SetObjectField (param, fufid, fuobj);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1932,8 +1932,8 @@
{
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-- return (jint) ps->exchangeGraphicLayers (idx1, idx2).code();
-+ return (jint) ps->exchangeGraphicLayers (idx1, idx2);
+- return (jint) ps->exchangeGraphicLayers (idx1, idx2);
++ return (jint) ps->exchangeGraphicLayers (idx1, idx2).code();
}
@@ -1941,8 +1941,8 @@
env->ReleaseByteArrayElements (pixelData, (jbyte *) array, 0);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1950,8 +1950,8 @@
E_Condition res = ps->invertImage();
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1959,8 +1959,8 @@
E_Condition res = ps->setMinimumPrintBitmapWidthHeight((unsigned long) width, (unsigned long) height);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1968,8 +1968,8 @@
E_Condition res = ps->setMaximumPrintBitmapWidthHeight((unsigned long) width, (unsigned long) height);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -1977,8 +1977,8 @@
E_Condition res = ps->getPrintBitmapWidthHeight (w, h);
-- if (res != EC_Normal) return (jint) res.code();
-+ if (res != EC_Normal) return (jint) res;
+- if (res != EC_Normal) return (jint) res;
++ if (res != EC_Normal) return (jint) res.code();
jclass widthCls = env->GetObjectClass (width);
jclass heightCls = env->GetObjectClass (height);
@@ -1986,8 +1986,8 @@
env->SetIntField (width, wvalue, (jint) w);
env->SetIntField (height, hvalue, (jint) h);
-- return (jint) EC_Normal.code();
-+ return (jint) EC_Normal;
+- return (jint) EC_Normal;
++ return (jint) EC_Normal.code();
}
@@ -1995,15 +1995,15 @@
E_Condition res = ps->getPrintBitmapWidth (w);
-- if (res != EC_Normal) return (jint) res.code();
-+ if (res != EC_Normal) return (jint) res;
+- if (res != EC_Normal) return (jint) res;
++ if (res != EC_Normal) return (jint) res.code();
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;
+- return (jint) EC_Normal;
++ return (jint) EC_Normal.code();
}
@@ -2011,15 +2011,15 @@
E_Condition res = ps->getPrintBitmapHeight (h);
-- if (res != EC_Normal) return (jint) res.code();
-+ if (res != EC_Normal) return (jint) res;
+- if (res != EC_Normal) return (jint) res;
++ if (res != EC_Normal) return (jint) res.code();
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;
+- return (jint) EC_Normal;
++ return (jint) EC_Normal.code();
}
@@ -2027,8 +2027,8 @@
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;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -2036,8 +2036,8 @@
env->ReleaseShortArrayElements (bitmap, (jshort *) array, 0);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -2045,8 +2045,8 @@
E_Condition res = ps->setDefaultPresentationLUTShape ();
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -2054,8 +2054,8 @@
OFBool cm = clipMode == JNI_TRUE ? OFTrue : OFFalse;
E_Condition res = ps->createPreviewImage (maxWidth, maxHeight, cm);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -2063,8 +2063,8 @@
E_Condition res = ps->getPreviewImageWidthHeight (ww, hh);
-- if (res != EC_Normal) return (jint) res.code();
-+ if (res != EC_Normal) return (jint) res;
+- if (res != EC_Normal) return (jint) res;
++ if (res != EC_Normal) return (jint) res.code();
jclass wIntByRefcls = env->GetObjectClass (width);
jclass hIntByRefcls = env->GetObjectClass (height);
@@ -2072,8 +2072,8 @@
env->SetIntField (width, wvalue, (jint) ww);
env->SetIntField (height, hvalue, (jint) hh);
-- return (jint) EC_Normal.code();
-+ return (jint) EC_Normal;
+- return (jint) EC_Normal;
++ return (jint) EC_Normal.code();
}
@@ -2081,15 +2081,15 @@
E_Condition res = ps->getPreviewImageWidth (ww);
-- if (res != EC_Normal) return (jint) res.code();
-+ if (res != EC_Normal) return (jint) res;
+- if (res != EC_Normal) return (jint) res;
++ if (res != EC_Normal) return (jint) res.code();
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;
+- return (jint) EC_Normal;
++ return (jint) EC_Normal.code();
}
@@ -2097,15 +2097,15 @@
E_Condition res = ps->getPreviewImageHeight (hh);
-- if (res != EC_Normal) return (jint) res.code();
-+ if (res != EC_Normal) return (jint) res;
+- if (res != EC_Normal) return (jint) res;
++ if (res != EC_Normal) return (jint) res.code();
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;
+- return (jint) EC_Normal;
++ return (jint) EC_Normal.code();
}
@@ -2113,20 +2113,20 @@
env->ReleaseByteArrayElements (bitmap, (jbyte *) array, 0);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
-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
+diff -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DVPSCurve.cpp dsgui351/interface/libsrc/DVPSCurve.cpp
+--- /tmp/dicomscope/dsgui351/interface/libsrc/DVPSCurve.cpp 1999-09-21 18:07:30.000000000 +0200
++++ dsgui351/interface/libsrc/DVPSCurve.cpp 2008-12-23 14:18:01.796119000 +0100
@@ -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;
+- if (res != EC_Normal) return (jint) res;
++ if (res != EC_Normal) return (jint) res.code();
jclass xDoubleByRefcls = env->GetObjectClass (x);
jclass yDoubleByRefcls = env->GetObjectClass (y);
@@ -2134,20 +2134,20 @@
env->SetDoubleField (x, xvalue, (jdouble) xx);
env->SetDoubleField (y, yvalue, (jdouble) yy);
-- return (jint) EC_Normal.code();
-+ return (jint) EC_Normal;
+- return (jint) EC_Normal;
++ return (jint) EC_Normal.code();
}
-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
+diff -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DVPSGraphicObject.cpp dsgui351/interface/libsrc/DVPSGraphicObject.cpp
+--- /tmp/dicomscope/dsgui351/interface/libsrc/DVPSGraphicObject.cpp 1999-09-21 18:07:30.000000000 +0200
++++ dsgui351/interface/libsrc/DVPSGraphicObject.cpp 2008-12-23 14:18:22.022391000 +0100
@@ -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;
+- if (res != EC_Normal) return (jint) res;
++ if (res != EC_Normal) return (jint) res.code();
jclass xDoubleByRefcls = env->GetObjectClass (x);
jclass yDoubleByRefcls = env->GetObjectClass (y);
@@ -2155,8 +2155,8 @@
env->SetDoubleField (x, xvalue, (jdouble) xx);
env->SetDoubleField (y, yvalue, (jdouble) yy);
-- return (jint) EC_Normal.code();
-+ return (jint) EC_Normal;
+- return (jint) EC_Normal;
++ return (jint) EC_Normal.code();
}
@@ -2164,8 +2164,8 @@
env->ReleaseFloatArrayElements (data, ddata, 0);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -2173,8 +2173,8 @@
{
DVPSGraphicObject *go = getAddressOfDVPSGraphicObject (env, obj);
-- return (jint) go->setGraphicType ((DVPSGraphicType) gtype).code();
-+ return (jint) go->setGraphicType ((DVPSGraphicType) gtype);
+- return (jint) go->setGraphicType ((DVPSGraphicType) gtype);
++ return (jint) go->setGraphicType ((DVPSGraphicType) gtype).code();
}
@@ -2182,20 +2182,20 @@
{
DVPSGraphicObject *go = getAddressOfDVPSGraphicObject (env, obj);
-- return (jint) go->setFilled ((filled != 0) ? OFTrue : OFFalse).code();
-+ return (jint) go->setFilled ((filled != 0) ? OFTrue : OFFalse);
+- return (jint) go->setFilled ((filled != 0) ? OFTrue : OFFalse);
++ return (jint) go->setFilled ((filled != 0) ? OFTrue : OFFalse).code();
}
-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
+diff -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DVPSStoredPrint.cpp dsgui351/interface/libsrc/DVPSStoredPrint.cpp
+--- /tmp/dicomscope/dsgui351/interface/libsrc/DVPSStoredPrint.cpp 2000-07-18 13:04:18.000000000 +0200
++++ dsgui351/interface/libsrc/DVPSStoredPrint.cpp 2008-12-23 14:19:20.804343000 +0100
@@ -82,7 +82,7 @@
env->ReleaseStringUTFChars (value, val);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
/*
@@ -2203,8 +2203,8 @@
env->ReleaseStringUTFChars (value, val);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
/*
@@ -2212,8 +2212,8 @@
env->ReleaseStringUTFChars (value, val);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
/*
@@ -2221,8 +2221,8 @@
{
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);
+- return (jint) sp->setImageDisplayFormat((unsigned long)columns, (unsigned long)rows);
++ return (jint) sp->setImageDisplayFormat((unsigned long)columns, (unsigned long)rows).code();
}
/*
@@ -2230,8 +2230,8 @@
env->ReleaseStringUTFChars (value, val);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
/*
@@ -2239,8 +2239,8 @@
env->ReleaseStringUTFChars (value, val);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
/*
@@ -2248,8 +2248,8 @@
env->ReleaseStringUTFChars (value, val);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
/*
@@ -2257,8 +2257,8 @@
env->ReleaseStringUTFChars (value, val);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
/*
@@ -2266,8 +2266,8 @@
env->ReleaseStringUTFChars (value, val);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
/*
@@ -2275,8 +2275,8 @@
E_Condition res = sp->setFilmOrientation ((DVPSFilmOrientation) value);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -2284,8 +2284,8 @@
E_Condition res = sp->setTrim ((DVPSTrimMode) value);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
/*
@@ -2293,8 +2293,8 @@
E_Condition res = sp->setRequestedDecimateCropBehaviour ((DVPSDecimateCropBehaviour) value);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
/*
@@ -2302,8 +2302,8 @@
E_Condition res = sp->newPrinter ();
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
/*
@@ -2311,8 +2311,8 @@
{
DVPSStoredPrint *sp = getAddressOfDVPSStoredPrint (env, obj);
-- return (jint) sp->deleteImage(index).code();
-+ return (jint) sp->deleteImage(index);
+- return (jint) sp->deleteImage(index);
++ return (jint) sp->deleteImage(index).code();
}
/*
@@ -2320,8 +2320,8 @@
{
DVPSStoredPrint *sp = getAddressOfDVPSStoredPrint (env, obj);
-- return (jint) sp->deleteMultipleImages(number).code();
-+ return (jint) sp->deleteMultipleImages(number);
+- return (jint) sp->deleteMultipleImages(number);
++ return (jint) sp->deleteMultipleImages(number).code();
}
@@ -2329,8 +2329,8 @@
env->ReleaseStringUTFChars (requestedimagesize, ri);
env->ReleaseStringUTFChars (patientid, pi);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
/*
@@ -2338,8 +2338,8 @@
env->ReleaseStringUTFChars (uid, val);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -2347,8 +2347,8 @@
env->ReleaseStringUTFChars (value, val);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
/*
@@ -2356,8 +2356,8 @@
env->ReleaseStringUTFChars (value, val);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
/*
@@ -2365,8 +2365,8 @@
env->ReleaseStringUTFChars (value, val);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -2374,8 +2374,8 @@
{
DVPSStoredPrint *sp = getAddressOfDVPSStoredPrint (env, obj);
-- return (jint) sp->setDefaultPresentationLUT().code();
-+ return (jint) sp->setDefaultPresentationLUT();
+- return (jint) sp->setDefaultPresentationLUT();
++ return (jint) sp->setDefaultPresentationLUT().code();
}
@@ -2383,8 +2383,8 @@
{
DVPSStoredPrint *sp = getAddressOfDVPSStoredPrint (env, obj);
-- return (jint) sp->setPresentationLUTShape ((DVPSPresentationLUTType) type).code();
-+ return (jint) sp->setPresentationLUTShape ((DVPSPresentationLUTType) type);
+- return (jint) sp->setPresentationLUTShape ((DVPSPresentationLUTType) type);
++ return (jint) sp->setPresentationLUTShape ((DVPSPresentationLUTType) type).code();
}
@@ -2392,8 +2392,8 @@
env->ReleaseStringUTFChars (value, val);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
/*
@@ -2401,8 +2401,8 @@
env->ReleaseStringUTFChars (value, val);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
/*
@@ -2410,8 +2410,8 @@
env->ReleaseStringUTFChars (value, val);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
@@ -2419,8 +2419,8 @@
env->ReleaseStringUTFChars (value, val);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
/*
@@ -2428,8 +2428,8 @@
{
DVPSStoredPrint *sp = getAddressOfDVPSStoredPrint (env, obj);
-- return (jint) sp->setPrintIllumination((short)value).code();
-+ return (jint) sp->setPrintIllumination((short)value);
+- return (jint) sp->setPrintIllumination((short)value);
++ return (jint) sp->setPrintIllumination((short)value).code();
}
@@ -2437,20 +2437,20 @@
{
DVPSStoredPrint *sp = getAddressOfDVPSStoredPrint (env, obj);
-- return (jint) sp->setPrintReflectedAmbientLight((short)value).code();
-+ return (jint) sp->setPrintReflectedAmbientLight((short)value);
+- return (jint) sp->setPrintReflectedAmbientLight((short)value);
++ return (jint) sp->setPrintReflectedAmbientLight((short)value).code();
}
-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
+diff -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DVPSTextObject.cpp dsgui351/interface/libsrc/DVPSTextObject.cpp
+--- /tmp/dicomscope/dsgui351/interface/libsrc/DVPSTextObject.cpp 1999-09-21 18:07:30.000000000 +0200
++++ dsgui351/interface/libsrc/DVPSTextObject.cpp 2008-12-23 14:19:32.635340000 +0100
@@ -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);
+- return (jint) to->setAnchorPoint (x, y, (DVPSannotationUnit) unit, (isVisible != 0) ? OFTrue : OFFalse);
++ return (jint) to->setAnchorPoint (x, y, (DVPSannotationUnit) unit, (isVisible != 0) ? OFTrue : OFFalse).code();
}
@@ -2458,8 +2458,8 @@
{
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);
+- return (jint) to->setBoundingBox (TLHC_x, TLHC_y, BRHC_x, BRHC_y, (DVPSannotationUnit) unit, (DVPSTextJustification) justification);
++ return (jint) to->setBoundingBox (TLHC_x, TLHC_y, BRHC_x, BRHC_y, (DVPSannotationUnit) unit, (DVPSTextJustification) justification).code();
}
@@ -2467,8 +2467,8 @@
env->ReleaseStringUTFChars (text, txt);
-- return (jint) res.code();
-+ return (jint) res;
+- return (jint) res;
++ return (jint) res.code();
}
Modified: trunk/packages/dicomscope/trunk/debian/rules
===================================================================
--- trunk/packages/dicomscope/trunk/debian/rules 2008-12-23 13:39:10 UTC (rev 2842)
+++ trunk/packages/dicomscope/trunk/debian/rules 2008-12-23 13:45:27 UTC (rev 2843)
@@ -40,8 +40,12 @@
-DCMAKE_SKIP_RPATH:BOOL=ON \
-DCMAKE_VERBOSE_MAKEFILE:BOOL=$(DH_VERBOSE) \
-DCMAKE_BUILD_TYPE:STRING=Release \
- -DPVRG_NAMESPACE:STRING="toto" \
- -DBUILD_SHARED_LIBS:BOOL=ON
+ -DDCMTK_config_INCLUDE_DIR:PATH=/usr/include/dcmtk/config
+ -DDCMTK_dcmdata_INCLUDE_DIR:PATH=/usr/include/dcmtk/dcmdata
+ -DDCMTK_dcmimgle_INCLUDE_DIR:PATH=/usr/include/dcmtk/dcmimgle
+ -DDCMTK_dcmpstat_INCLUDE_DIR:PATH=/usr/include/dcmtk/dcmpstat
+ -DDCMTK_dcmsr_INCLUDE_DIR:PATH=/usr/include/dcmtk/dcmsr
+ -DDCMTK_ofstd_INCLUDE_DIR:PATH=/usr/include/dcmtk/ofstd
touch configure-stamp
@@ -82,7 +86,7 @@
binary-arch: build install
dh_testdir
dh_testroot
- dh_installchangelogs CHANGES
+ dh_installchangelogs
dh_installdocs
dh_installexamples
dh_install --sourcedir=$(TARGET) --fail-missing
More information about the debian-med-commit
mailing list