[med-svn] r20455 - trunk/packages/dicomscope/trunk/debian/patches

[Gert Wollny]

Author: gert-guest
Date: 2015-11-09 20:36:38 +0000 (Mon, 09 Nov 2015)
New Revision: 20455

Added:
   trunk/packages/dicomscope/trunk/debian/patches/DSRDocument.cpp-dicom361.patch
Modified:
   trunk/packages/dicomscope/trunk/debian/patches/series
Log:
Add patch to use new dcmtk interface

Added: trunk/packages/dicomscope/trunk/debian/patches/DSRDocument.cpp-dicom361.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/DSRDocument.cpp-dicom361.patch	                        (rev 0)
+++ trunk/packages/dicomscope/trunk/debian/patches/DSRDocument.cpp-dicom361.patch	2015-11-09 20:36:38 UTC (rev 20455)
@@ -0,0 +1,22 @@
+Description: Use new dcmtk 3.6.1 interface for getAccessionNumber()
+Author: Gert Wollny <gw.fossdev at gmail.com>
+Forwarded: no
+
+diff -ru dicomscope-3.6.0/interface/libsrc/DSRDocument.cpp dicomscope-3.6.0.new/interface/libsrc/DSRDocument.cpp
+--- dicomscope-3.6.0/interface/libsrc/DSRDocument.cpp	2015-11-03 12:18:18.000000000 +0100
++++ dicomscope-3.6.0.new/interface/libsrc/DSRDocument.cpp	2015-11-03 12:22:21.783004384 +0100
+@@ -731,8 +731,11 @@
+ {
+     DSRDocument *doc = getAddressOfDSRDocument (env, obj);
+ 
+-    const char *string = doc->getAccessionNumber();
+-
++    OFString ofstring; 
++    OFCondition res = doc->getAccessionNumber(ofstring, 0);
++    if (res.bad()) return NULL;
++    
++    const char *string = ofstring-c_str(); 
+     if (string == NULL) return NULL;
+     return env->NewStringUTF (string);
+ }
+Nur in dicomscope-3.6.0.new/interface/libsrc: DSRDocument.cpp~.

Modified: trunk/packages/dicomscope/trunk/debian/patches/series
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/series	2015-11-09 19:51:01 UTC (rev 20454)
+++ trunk/packages/dicomscope/trunk/debian/patches/series	2015-11-09 20:36:38 UTC (rev 20455)
@@ -6,3 +6,4 @@
 dicom_2009.patch
 log4cplus.patch
 cmakelists.txt.patch
+DSRDocument.cpp-dicom361.patch