Update the trunk to the OpenCV's CVS (2008-07-14)

[opencv] / interfaces / swig / general / typemaps.i

diff --git a/interfaces/swig/general/typemaps.i b/interfaces/swig/general/typemaps.i
index 8cde9b9..b12a75a 100644 (file)
--- a/interfaces/swig/general/typemaps.i
+++ b/interfaces/swig/general/typemaps.i
@@ -53,14 +53,13 @@
  * sets the Python error.
  * We need to return 0 here instead of an PyObject to tell Python
  * that an error has occured.
- * NOTE (Olivier Bornet): not sure, but this must be language-independant...
  */
 %exception
     {
     try { $action } 
     catch (...) 
         {
-        return NULL;
+         SWIG_fail;
         } 
     }
 
@@ -70,11 +69,6 @@
 
 %include "sizeof.i"
 
-/* assign type conversion precedence */
-%typemap(typecheck) CvPoint = SWIGTYPE;
-%typemap(typecheck) CvScalar = SWIGTYPE;
-%typemap(typecheck) CvPoint2D32f = SWIGTYPE;
-
 /**
  * IplImage has no reference counting of underlying data, which creates problems with double 
  * frees after accessing subarrays in python -- instead, replace IplImage with CvMat, which
@@ -122,4 +116,3 @@ CvMat * func##__CvMat##decl{
 }
 %}
 %enddef
-