[med-svn] [Git][med-team/aeskulap][master] 3 commits: d/p/dcmtk: Add patch to build with dcmtk 3.6.4

[Gert Wollny]

Gert Wollny pushed to branch master at Debian Med / aeskulap


Commits:
e9357bf6 by Gert Wollny at 2019-01-13T11:44:19Z
d/p/dcmtk: Add patch to build with dcmtk 3.6.4

- - - - -
c7c80fa0 by Gert Wollny at 2019-01-13T11:44:56Z
Update for upload

- - - - -
2ebd5d57 by Gert Wollny at 2019-01-13T11:47:58Z
switch back to unreleased

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/dcmtk_364.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+aeskulap (0.2.2-beta2+git20180219.8787e95-2) UNRELEASED; urgency=medium
+
+  * d/p/dcmtk: Add patch to build with dcmtk 3.6.4
+
+ -- Gert Wollny <gewo at debian.org>  Sun, 13 Jan 2019 12:44:37 +0100
+
 aeskulap (0.2.2-beta2+git20180219.8787e95-1) unstable; urgency=medium
 
   * Revert 8e93d35c8b780fa600a69cacd579a7cb663e3ee8 to bundle


=====================================
debian/patches/dcmtk_364.patch
=====================================
@@ -0,0 +1,43 @@
+Description: Fix build with dcmtk 3.6.4
+Author: Gert Wollny <gewo at debian.org>
+diff -ru aeskulap/imagepool/poolassociation.cpp aeskulap-0.2.2b1+git20161206/imagepool/poolassociation.cpp
+--- aeskulap/imagepool/poolassociation.cpp	2018-01-07 14:16:32.988580277 +0100
++++ aeskulap-0.2.2b1+git20161206/imagepool/poolassociation.cpp	2019-01-13 12:19:45.407822113 +0100
+@@ -111,7 +111,7 @@
+ 	T_DIMSE_C_StoreRSP rsp;
+ 
+ 	// check if we SOPClass and SOPInstance in dataset
+-	if (!DU_findSOPClassAndInstanceInDataSet(dataset, sopClass, sopInstance))
++	if (!DU_findSOPClassAndInstanceInDataSet(dataset, sopClass, strlen(sopClass), sopInstance, strlen(sopInstance)))
+ 	{
+ 		return DIMSE_BADDATA;
+ 	}
+diff -ru aeskulap/imagepool/poolfindassociation.cpp aeskulap-0.2.2b1+git20161206/imagepool/poolfindassociation.cpp
+--- aeskulap/imagepool/poolfindassociation.cpp	2018-01-07 14:16:32.988580277 +0100
++++ aeskulap-0.2.2b1+git20161206/imagepool/poolfindassociation.cpp	2019-01-13 12:21:01.563821184 +0100
+@@ -56,8 +56,10 @@
+ 	req.DataSetType = DIMSE_DATASET_PRESENT;
+ 	req.Priority = DIMSE_PRIORITY_LOW;
+ 	strcpy(req.AffectedSOPClassUID, m_abstractSyntax);
+-
+-	cond = DIMSE_findUser(assoc, presId, &req, query, 
++	int response_count = 0;
++	
++	cond = DIMSE_findUser(assoc, presId, &req, query,
++			      response_count,
+ 			findCallback, (void*)this, 
+ 			(m_timeout == 0) ? DIMSE_BLOCKING : DIMSE_NONBLOCKING,
+ 			m_timeout, 
+diff -ru aeskulap/imagepool/poolmoveassociation.cpp aeskulap-0.2.2b1+git20161206/imagepool/poolmoveassociation.cpp
+--- aeskulap/imagepool/poolmoveassociation.cpp	2019-01-13 12:23:36.991819287 +0100
++++ aeskulap-0.2.2b1+git20161206/imagepool/poolmoveassociation.cpp	2019-01-13 12:22:00.551820464 +0100
+@@ -306,7 +306,8 @@
+ 		*/
+ 		if (rsp->DimseStatus == STATUS_Success) {
+ 			/* which SOP class and SOP instance ? */
+-			if (! DU_findSOPClassAndInstanceInDataSet(cbdata->dataset, sopClass, sopInstance)) {
++		  if (! DU_findSOPClassAndInstanceInDataSet(cbdata->dataset, sopClass,strlen(sopClass),
++							    sopInstance, strlen(sopInstance))) {
+ 				rsp->DimseStatus = STATUS_STORE_Error_CannotUnderstand;
+ 			}
+ 			else if (strcmp(sopClass, req->AffectedSOPClassUID) != 0) {


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ newDicomElement.patch
 GSettings-configuratio-storage.patch
 remove-appdata.patch
 ignore_gconf_schemas.patch
+dcmtk_364.patch



View it on GitLab: https://salsa.debian.org/med-team/aeskulap/compare/1320d5882080f9c487c3369dd682dfbbd62456c3...2ebd5d57c651b9bc69f352fbde06066b6a2c9152

-- 
View it on GitLab: https://salsa.debian.org/med-team/aeskulap/compare/1320d5882080f9c487c3369dd682dfbbd62456c3...2ebd5d57c651b9bc69f352fbde06066b6a2c9152
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190113/5c0a05d1/attachment-0001.html>