Author: malat-guest
Date: 2008-12-29 15:11:08 +0000 (Mon, 29 Dec 2008)
New Revision: 2876
Modified:
trunk/packages/dicomscope/trunk/debian/patches/dcmtk_350_354_changes.patch
Log:
revert some changes
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-29 14:31:30 UTC (rev 2875)
+++ trunk/packages/dicomscope/trunk/debian/patches/dcmtk_350_354_changes.patch
2008-12-29 15:11:08 UTC (rev 2876)
@@ -130,7 +130,7 @@
#endif
#ifdef HAVE_STRSTREAM_H
-#include <strstream.h> /* for ostrstream */
-+//#include <strstream.h> /* for ostrstream */
++#include "dsrtypes.h"
+#include <strstream> /* for ostrstream */
+using namespace std;
#endif
@@ -141,7 +141,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_HTML32Compatibility | DSRTypes::HF_renderFullData);
if (res == EC_Normal)
{
@@ -186,7 +186,7 @@
DSRDocument *doc = getAddressOfDSRDocument (env, obj);
- return (jint) doc->getNumberOfPredecessorDocuments();
-+ return (jint)0/* doc->getNumberOfPredecessorDocuments()*/;
++ return (jint) doc->getPredecessorDocuments().getNumberOfInstances();
}
@@ -195,7 +195,7 @@
OFString scStr, siStr;
- E_Condition res = doc->getPredecessorDocument((size_t)idx, scStr, siStr);
-+ E_Condition res = 0/*doc->getPredecessorDocument((size_t)idx, scStr,
siStr)*/;
++ E_Condition res = EC_Normal; /*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;");
@@ -1469,7 +1469,7 @@
long tx, ty, bx, by;
- E_Condition res = ps->getDisplayedArea (tx, ty, bx, by);
-+ E_Condition res = 0/*ps->getDisplayedArea (tx, ty, bx, by)*/;
++ E_Condition res = EC_Normal;/*ps->getDisplayedArea (tx, ty, bx, by);*/
- if (res != EC_Normal) return (jint) res;
+ if (res != EC_Normal) return (jint) res.code();
@@ -1527,8 +1527,8 @@
- 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)*/;
++ return (jint) EC_Normal.code(); /*ps->setDisplayedArea
((DVPSPresentationSizeMode) sizeMode, tlhcX,
++ tlhcY, brhcX, brhcY, magnification,
(DVPSObjectApplicability) applicability).code();*/
}
@@ -1572,7 +1572,7 @@
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
- return (jint) ps->setGraphicLayerRecommendedDisplayValueGray (idx,
(Uint16) gray);
-+ return (jint) 0/*ps->setGraphicLayerRecommendedDisplayValueGray (idx,
(Uint16) gray)*/;
++ return (jint) ps->setGraphicLayerRecommendedDisplayValueGray (idx,
(Uint16) gray).code();
}
@@ -1581,7 +1581,7 @@
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
- return (jint) ps->setGraphicLayerRecommendedDisplayValueRGB (idx,
(Uint16) r, (Uint16) g, (Uint16) b);
-+ return (jint) 0/*ps->setGraphicLayerRecommendedDisplayValueRGB (idx,
(Uint16) r, (Uint16) g, (Uint16) b)*/;
++ return (jint) ps->setGraphicLayerRecommendedDisplayValueRGB (idx,
(Uint16) r, (Uint16) g, (Uint16) b).code();
}
@@ -1608,7 +1608,7 @@
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
- return (jint) ps->toFrontGraphicLayer (idx);
-+ return (jint) 0/*ps->toFrontGraphicLayer (idx)*/;
++ return (jint) ps->toFrontGraphicLayer (idx).code();
}
@@ -1617,7 +1617,7 @@
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
- return (jint) ps->toBackGraphicLayer (idx);
-+ return (jint) 0/*ps->toBackGraphicLayer (idx)*/;
++ return (jint) ps->toBackGraphicLayer (idx).code();
}
@@ -1635,7 +1635,7 @@
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
- return (jint) ps->removeGraphicLayer (idx);
-+ return (jint) 0/*ps->removeGraphicLayer (idx)*/;
++ return (jint) ps->removeGraphicLayer (idx).code();
}
@@ -1644,7 +1644,7 @@
DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
- return (jint) ps->removeTextObject (layer, idx);
-+ return (jint) 0/*ps->removeTextObject (layer, idx)*/;
++ return (jint) ps->removeTextObject (layer, idx).code();
}
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
