[med-svn] r20462 - trunk/packages/dicomscope/trunk/debian/patches
Gert Wollny
gert-guest at moszumanska.debian.org
Mon Nov 9 21:52:13 UTC 2015
Author: gert-guest
Date: 2015-11-09 21:52:12 +0000 (Mon, 09 Nov 2015)
New Revision: 20462
Added:
trunk/packages/dicomscope/trunk/debian/patches/correct_status_returns.patch
Log:
Correct the build regarding new layout of OFConditionConst
Added: trunk/packages/dicomscope/trunk/debian/patches/correct_status_returns.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/correct_status_returns.patch (rev 0)
+++ trunk/packages/dicomscope/trunk/debian/patches/correct_status_returns.patch 2015-11-09 21:52:12 UTC (rev 20462)
@@ -0,0 +1,284 @@
+diff -ru src/dicomscope-3.6.0/interface/libsrc/DVInterface.cpp build-area/dicomscope-3.6.0/interface/libsrc/DVInterface.cpp
+--- src/dicomscope-3.6.0/interface/libsrc/DVInterface.cpp 2015-11-03 12:18:18.000000000 +0100
++++ build-area/dicomscope-3.6.0/interface/libsrc/DVInterface.cpp 2015-11-09 22:47:10.896690624 +0100
+@@ -1967,7 +1967,7 @@
+ env->SetIntField (width, wvalue, (jint) w);
+ env->SetIntField (height, hvalue, (jint) h);
+
+- return (jint) EC_Normal.status();
++ return (jint) EC_Normal.theStatus;
+ }
+
+
+@@ -2144,7 +2144,7 @@
+
+ env->SetDoubleField (alv, value, _alv);
+
+- return (jint) EC_Normal.status();
++ return (jint) EC_Normal.theStatus;
+ }
+
+
+@@ -2828,7 +2828,7 @@
+ {
+ DVInterface *dvi = getAddressOfDVInterface (env, obj);
+
+- dvi->setLogFilter ((DVPSLogMessageLevel)level);
++// dvi->setLogFilter ((DVPSLogMessageLevel)level);
+ }
+
+
+@@ -2845,7 +2845,7 @@
+ char *mod = (char*) env->GetStringUTFChars (module, 0);
+ char *msg = (char*) env->GetStringUTFChars (message, 0);
+
+- OFCondition res = dvi->writeLogMessage ((DVPSLogMessageLevel)level, mod, msg);
++ OFCondition res = EC_Normal; //dvi->writeLogMessage ((DVPSLogMessageLevel)level, mod, msg);
+
+ env->ReleaseStringUTFChars (module, mod);
+ env->ReleaseStringUTFChars (message, msg);
+diff -ru src/dicomscope-3.6.0/interface/libsrc/DVPresentationState.cpp build-area/dicomscope-3.6.0/interface/libsrc/DVPresentationState.cpp
+--- src/dicomscope-3.6.0/interface/libsrc/DVPresentationState.cpp 2015-11-03 12:18:18.000000000 +0100
++++ build-area/dicomscope-3.6.0/interface/libsrc/DVPresentationState.cpp 2015-11-09 22:46:52.924825976 +0100
+@@ -507,7 +507,7 @@
+
+ env->SetIntField (frame, value, (jint) fr);
+
+- return (jint) EC_Normal.status();
++ return (jint) EC_Normal.theStatus;
+ }
+
+
+@@ -825,7 +825,7 @@
+ env->SetIntField (pointXY, xfid, (jint) x);
+ env->SetIntField (pointXY, yfid, (jint) y);
+
+- return (jint) EC_Normal.status();
++ return (jint) EC_Normal.theStatus;
+ }
+
+
+@@ -979,7 +979,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- long tx, ty, bx, by;
++ Sint32 tx, ty, bx, by;
+
+ OFCondition res = ps->getStandardDisplayedArea (tx, ty, bx, by);
+
+@@ -1000,7 +1000,7 @@
+ env->SetIntField (brhcX, bxvalue, (jint) bx);
+ env->SetIntField (brhcY, byvalue, (jint) by);
+
+- return (jint) EC_Normal.status();
++ return (jint) EC_Normal.theStatus;
+ }
+
+
+@@ -1014,7 +1014,7 @@
+ {
+ DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
+
+- long tx, ty, bx, by;
++ Sint32 tx, ty, bx, by;
+
+ OFCondition res = ps->getImageRelativeDisplayedArea (tx, ty, bx, by);
+
+@@ -1035,7 +1035,7 @@
+ env->SetIntField (brhcX, bxvalue, (jint) bx);
+ env->SetIntField (brhcY, byvalue, (jint) by);
+
+- return (jint) EC_Normal.status();
++ return (jint) EC_Normal.theStatus;
+ }
+
+
+@@ -1064,7 +1064,7 @@
+ env->SetDoubleField (x, xvalue, xx);
+ env->SetDoubleField (y, yvalue, yy);
+
+- return (jint) EC_Normal.status();
++ return (jint) EC_Normal.theStatus;
+ }
+
+ /*
+@@ -1089,7 +1089,7 @@
+
+ env->SetDoubleField (magnification, mvalue, m);
+
+- return (jint) EC_Normal.status();
++ return (jint) EC_Normal.theStatus;
+ }
+
+
+@@ -1193,7 +1193,7 @@
+
+ env->SetIntField (gray, value, (jint) gr);
+
+- return (jint) EC_Normal.status();
++ return (jint) EC_Normal.theStatus;
+ }
+
+
+@@ -1225,7 +1225,7 @@
+ env->SetIntField (g, gvalue, (jint) gg);
+ env->SetIntField (b, bvalue, (jint) bb);
+
+- return (jint) EC_Normal.status();
++ return (jint) EC_Normal.theStatus;
+ }
+
+
+@@ -1719,7 +1719,7 @@
+
+ env->SetDoubleField (w, wvalue, ww);
+
+- return (jint) EC_Normal.status();
++ return (jint) EC_Normal.theStatus;
+ }
+
+
+@@ -1745,7 +1745,7 @@
+
+ env->SetDoubleField (c, cvalue, (jdouble) cc);
+
+- return (jint) EC_Normal.status();
++ return (jint) EC_Normal.theStatus;
+ }
+
+
+@@ -2435,7 +2435,7 @@
+ env->SetDoubleField (minValue, minvalue, min);
+ env->SetDoubleField (maxValue, maxvalue, max);
+
+- return (jint) EC_Normal.status();
++ return (jint) EC_Normal.theStatus;
+ }
+
+
+@@ -2466,7 +2466,7 @@
+ env->SetDoubleField (minValue, minvalue, min);
+ env->SetDoubleField (maxValue, maxvalue, max);
+
+- return (jint) EC_Normal.status();
++ return (jint) EC_Normal.theStatus;
+ }
+
+
+@@ -2492,7 +2492,7 @@
+
+ env->SetIntField (width, wvalue, w);
+
+- return (jint) EC_Normal.status();
++ return (jint) EC_Normal.theStatus;
+ }
+
+
+@@ -2518,7 +2518,7 @@
+
+ env->SetIntField (height, hvalue, h);
+
+- return (jint) EC_Normal.status();
++ return (jint) EC_Normal.theStatus;
+ }
+
+
+@@ -2759,7 +2759,7 @@
+ env->SetIntField (width, wvalue, (jint) w);
+ env->SetIntField (height, hvalue, (jint) h);
+
+- return (jint) EC_Normal.status();
++ return (jint) EC_Normal.theStatus;
+ }
+
+
+@@ -2783,7 +2783,7 @@
+ jfieldID wvalue = env->GetFieldID (widthCls, "value", "I");
+ env->SetIntField (width, wvalue, (jint) w);
+
+- return (jint) EC_Normal.status();
++ return (jint) EC_Normal.theStatus;
+ }
+
+
+@@ -2807,7 +2807,7 @@
+ jfieldID hvalue = env->GetFieldID (heightCls, "value", "I");
+ env->SetIntField (height, hvalue, (jint) h);
+
+- return (jint) EC_Normal.status();
++ return (jint) EC_Normal.theStatus;
+ }
+
+
+@@ -2974,7 +2974,7 @@
+ env->SetIntField (width, wvalue, (jint) ww);
+ env->SetIntField (height, hvalue, (jint) hh);
+
+- return (jint) EC_Normal.status();
++ return (jint) EC_Normal.theStatus;
+ }
+
+
+@@ -2998,7 +2998,7 @@
+ jfieldID wvalue = env->GetFieldID (wIntByRefcls, "value", "I");
+ env->SetIntField (width, wvalue, (jint) ww);
+
+- return (jint) EC_Normal.status();
++ return (jint) EC_Normal.theStatus;
+ }
+
+
+@@ -3022,7 +3022,7 @@
+ jfieldID hvalue = env->GetFieldID (hIntByRefcls, "value", "I");
+ env->SetIntField (height, hvalue, (jint) hh);
+
+- return (jint) EC_Normal.status();
++ return (jint) EC_Normal.theStatus;
+ }
+
+
+diff -ru src/dicomscope-3.6.0/interface/libsrc/DVPSCurve.cpp build-area/dicomscope-3.6.0/interface/libsrc/DVPSCurve.cpp
+--- src/dicomscope-3.6.0/interface/libsrc/DVPSCurve.cpp 2015-11-03 12:18:18.000000000 +0100
++++ build-area/dicomscope-3.6.0/interface/libsrc/DVPSCurve.cpp 2015-11-09 22:48:14.520208100 +0100
+@@ -151,7 +151,7 @@
+
+ double xx, yy;
+
+- E_Condition res = cur->getPoint (idx, xx, yy);
++ OFCondition res = cur->getPoint (idx, xx, yy);
+
+ if (res != EC_Normal) return (jint) res.status();
+
+@@ -164,7 +164,7 @@
+ env->SetDoubleField (x, xvalue, (jdouble) xx);
+ env->SetDoubleField (y, yvalue, (jdouble) yy);
+
+- return (jint) EC_Normal.status();
++ return (jint) EC_Normal.theStatus;
+ }
+
+
+Nur in build-area/dicomscope-3.6.0/interface/libsrc/: DVPSCurve.cpp~.
+diff -ru src/dicomscope-3.6.0/interface/libsrc/DVPSGraphicObject.cpp build-area/dicomscope-3.6.0/interface/libsrc/DVPSGraphicObject.cpp
+--- src/dicomscope-3.6.0/interface/libsrc/DVPSGraphicObject.cpp 2015-11-03 12:18:18.000000000 +0100
++++ build-area/dicomscope-3.6.0/interface/libsrc/DVPSGraphicObject.cpp 2015-11-09 22:48:55.423895333 +0100
+@@ -135,7 +135,7 @@
+
+ Float32 xx, yy;
+
+- E_Condition res = go->getPoint (idx, xx, yy);
++ OFCondition res = go->getPoint (idx, xx, yy);
+
+ if (res != EC_Normal) return (jint) res.status();
+
+@@ -148,7 +148,7 @@
+ env->SetDoubleField (x, xvalue, (jdouble) xx);
+ env->SetDoubleField (y, yvalue, (jdouble) yy);
+
+- return (jint) EC_Normal.status();
++ return (jint) EC_Normal.theStatus;
+ }
+
+
+
More information about the debian-med-commit
mailing list