[med-svn] r5887 - in trunk/packages/dicomscope/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-02-04 11:12:26 +0000 (Fri, 04 Feb 2011)
New Revision: 5887

Added:
   trunk/packages/dicomscope/trunk/debian/patches/dicom_2009.patch
Modified:
   trunk/packages/dicomscope/trunk/debian/patches/series
   trunk/packages/dicomscope/trunk/debian/rules
Log:
Some progress on support dcmtk 3.6.0

Added: trunk/packages/dicomscope/trunk/debian/patches/dicom_2009.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/dicom_2009.patch	                        (rev 0)
+++ trunk/packages/dicomscope/trunk/debian/patches/dicom_2009.patch	2011-02-04 11:12:26 UTC (rev 5887)
@@ -0,0 +1,79 @@
+This patch is due to the following change:
+
+http://git.dcmtk.org/web?p=dcmtk.git;a=commitdiff;h=de4ba95922ebce6c30a21ee73f6790cb0aa31912#patch20
+Index: dicomscope-3.6.0/interface/libsrc/DSRDocument.cpp
+===================================================================
+--- dicomscope-3.6.0.orig/interface/libsrc/DSRDocument.cpp	2011-02-04 12:10:23.000000000 +0100
++++ dicomscope-3.6.0/interface/libsrc/DSRDocument.cpp	2011-02-04 12:10:55.000000000 +0100
+@@ -442,7 +442,7 @@
+ {
+     DSRDocument *doc = getAddressOfDSRDocument (env, obj);
+ 
+-    const char *string = doc->getPatientsName();
++    const char *string = doc->getPatientName();
+ 
+     if (string == NULL) return NULL;
+     return env->NewStringUTF (string);
+@@ -459,7 +459,7 @@
+ {
+     DSRDocument *doc = getAddressOfDSRDocument (env, obj);
+ 
+-    const char *string = doc->getPatientsBirthDate();
++    const char *string = doc->getPatientBirthDate();
+ 
+     if (string == NULL) return NULL;
+     return env->NewStringUTF (string);
+@@ -476,7 +476,7 @@
+ {
+     DSRDocument *doc = getAddressOfDSRDocument (env, obj);
+ 
+-    const char *string = doc->getPatientsSex();
++    const char *string = doc->getPatientSex();
+ 
+     if (string == NULL) return NULL;
+     return env->NewStringUTF (string);
+@@ -493,7 +493,7 @@
+ {
+     DSRDocument *doc = getAddressOfDSRDocument (env, obj);
+ 
+-    const char *string = doc->getReferringPhysiciansName();
++    const char *string = doc->getReferringPhysicianName();
+ 
+     if (string == NULL) return NULL;
+     return env->NewStringUTF (string);
+@@ -812,7 +812,7 @@
+         {
+             jbyte *string = env->GetByteArrayElements(array, 0);
+ 
+-            res = doc->setPatientsName(OFString((char *)string, env->GetArrayLength(array)));
++            res = doc->setPatientName(OFString((char *)string, env->GetArrayLength(array)));
+ 
+             env->ReleaseByteArrayElements(array, string, 0);
+         }
+@@ -834,7 +834,7 @@
+ 
+     char *str = (value) ? (char *) env->GetStringUTFChars (value, 0) : NULL;
+ 
+-    OFCondition res = doc->setPatientsBirthDate(str);
++    OFCondition res = doc->setPatientBirthDate(str);
+ 
+     env->ReleaseStringUTFChars (value, str);
+ 
+@@ -854,7 +854,7 @@
+ 
+     char *str = (value) ? (char *) env->GetStringUTFChars (value, 0) : NULL;
+ 
+-    OFCondition res = doc->setPatientsSex(str);
++    OFCondition res = doc->setPatientSex(str);
+ 
+     env->ReleaseStringUTFChars (value, str);
+ 
+@@ -884,7 +884,7 @@
+         {
+             jbyte *string = env->GetByteArrayElements(array, 0);
+ 
+-            res = doc->setReferringPhysiciansName(OFString((char *)string, env->GetArrayLength(array)));
++            res = doc->setReferringPhysicianName(OFString((char *)string, env->GetArrayLength(array)));
+ 
+             env->ReleaseByteArrayElements(array, string, 0);
+         }

Modified: trunk/packages/dicomscope/trunk/debian/patches/series
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/series	2011-02-04 11:03:40 UTC (rev 5886)
+++ trunk/packages/dicomscope/trunk/debian/patches/series	2011-02-04 11:12:26 UTC (rev 5887)
@@ -5,3 +5,4 @@
 maincontext.java.patch
 dicomscope.patch
 DSRDocument.cpp.patch
+dicom_2009.patch

Modified: trunk/packages/dicomscope/trunk/debian/rules
===================================================================
--- trunk/packages/dicomscope/trunk/debian/rules	2011-02-04 11:03:40 UTC (rev 5886)
+++ trunk/packages/dicomscope/trunk/debian/rules	2011-02-04 11:12:26 UTC (rev 5887)
@@ -141,11 +141,11 @@
 	# Need tofrodos in order to prepare the patch, since quilt
 	# does not support mixture of dos/unix EOL
 	find $(DEBIAN_SRC_DIR) -name *.java -exec dos2unix {} \;
-	#find $(DEBIAN_SRC_DIR) -name *.java -exec ./iconv-inplace.sh {} \;
+	find $(DEBIAN_SRC_DIR) -name *.java -exec ./debian/iconv-inplace.sh {} \;
 	find $(DEBIAN_SRC_DIR) -name *.html -exec dos2unix {} \;
 	find $(DEBIAN_SRC_DIR) -name *.h -exec dos2unix {} \;
 	find $(DEBIAN_SRC_DIR) -name *.cpp -exec dos2unix {} \;
-	#find $(DEBIAN_SRC_DIR) -name *.txt -exec dos2unix {} \;
+	find $(DEBIAN_SRC_DIR) -name *.txt -exec dos2unix {} \;
 	find $(DEBIAN_SRC_DIR) -name *.MF -exec dos2unix {} \;
 	GZIP=-9 tar czf $(DEBIAN_SRC_TAR) $(DEBIAN_SRC_DIR)
 	rm -rf $(DEBIAN_SRC_DIR)