Update to 2.0.0 tree from current Fremantle build

[opencv] / interfaces / swig / python / cvshadow.i

diff --git a/interfaces/swig/python/cvshadow.i b/interfaces/swig/python/cvshadow.i
index 36cc64f..e7aae8e 100644 (file)
--- a/interfaces/swig/python/cvshadow.i
+++ b/interfaces/swig/python/cvshadow.i
@@ -45,35 +45,24 @@
 #include "cvshadow.h"
 %}
 
-%define %myshadow(function)
-%ignore function;
-%rename (function) function##_Shadow;
-%enddef
+// source %myshadow, %myrelease macros
+%include "cvswigmacros.i"
 
 %include "stl.i"
 
 // %ignore, %rename must come before %include
 %myshadow(cvCvtSeqToArray);
-%myshadow(cvArcLength);
 %myshadow(cvHaarDetectObjects);
 %myshadow(cvSegmentMotion);
 %myshadow(cvApproxPoly);
-%myshadow(cvContourPerimeter);
 %myshadow(cvConvexHull2);
-%newobject cvConvexHull2; // shadowed functioned always returns new object
+%newobject cvConvexHull2_Shadow; // shadowed functioned always returns new object
 
 /* cvSnakeImage shadow uses a vector<CvPoint> and vector<float> */ 
 %template(FloatVector)   std::vector<float>;
 %template(CvPointVector) std::vector<CvPoint>;
 %myshadow(cvSnakeImage);
 
-// eliminates need for IplImage ** typemap
-%rename (cvCalcImageHist) cvCalcHist;
-%pythoncode %{
-def cvCalcHist(*args):
-       return cvCalcArrHist(*args)
-%}
-
 // must come after %ignore, %rename
 %include "cvshadow.h"
 
@@ -128,33 +117,22 @@ def cvHoughLines2( *args ):
 // cvSeqSlice
 // cvTreeToNodeSeq
 
-// cvRelease* functions don't consider python's reference count
-// so we get a double-free error when the reference count reaches zero.
-// Instead, just make these aliases to Py_XDECREF()
-%define %myrelease(function)
-%ignore function;
-%rename (function) function##_Shadow;
-%inline %{
-void function##_Shadow(PyObject * obj){
-       Py_XDECREF(obj);
-}
-%}
-%enddef
-
-%myrelease(cvReleaseImage);
-%myrelease(cvReleaseMat);
-%myrelease(cvReleaseStructuringElement);
-%myrelease(cvReleaseConDensation);
-%myrelease(cvReleaseKalman);
-%myrelease(cvReleaseHist);
-%myrelease(cvReleaseHaarClassifierCascade);
-%myrelease(cvReleasePOSITObject);
-%myrelease(cvReleaseImageHeader);
-%myrelease(cvReleaseMatND);
-%myrelease(cvReleaseSparseMat);
-%myrelease(cvReleaseMemStorage);
-%myrelease(cvReleaseGraphScanner);
-%myrelease(cvReleaseFileStorage);
-%myrelease(cvRelease);
-%myrelease(cvReleaseCapture);
-%myrelease(cvReleaseVideoWriter);
+// Fix cvRelease* function to play nice w/ Python
+// TODO some of these objects lack the delete method -- why???
+%myrelease(cv, cvReleaseImage, CvMat);  // IplImage is CvMat in Python
+%myrelease(cv, cvReleaseMat, CvMat);
+%myrelease(cv, cvReleaseStructuringElement, IplConvKernel);
+%myrelease(cv, cvReleaseConDensation, CvConDensation);
+%myrelease(cv, cvReleaseKalman, CvKalman);
+%myrelease(cv, cvReleaseHist, CvHistogram);
+%myrelease(cv, cvReleaseHaarClassifierCascade, CvHaarClassifierCascade);
+//%myrelease(cvReleasePOSITObject, CvPOSITObject);
+%myrelease(cv, cvReleaseImageHeader, CvMat); // IplImage is CvMat
+%myrelease(cv, cvReleaseMatND, CvMatND);
+%myrelease(cv, cvReleaseSparseMat, CvSparseMat);
+%myrelease(cv, cvReleaseMemStorage, CvMemStorage);
+%myrelease(cv, cvReleaseGraphScanner, CvGraphScanner);
+//%myrelease(cvReleaseFileStorage, CvFileStorage);
+
+// TODO implement this
+%ignore cvRelease;