Update to 2.0.0 tree from current Fremantle build

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

diff --git a/interfaces/swig/python/cvaliases.i b/interfaces/swig/python/cvaliases.i
index f288ddf..19eeb11 100644 (file)
--- a/interfaces/swig/python/cvaliases.i
+++ b/interfaces/swig/python/cvaliases.i
@@ -1,51 +1,61 @@
-%module cv
-%pythoncode %{
-IPL_ALIGN_DWORD=IPL_ALIGN_4BYTES
-IPL_ALIGN_QWORD=IPL_ALIGN_8BYTES
-CV_MAKE_TYPE=CV_MAKETYPE
-CV_IS_CONT_MAT=CV_IS_MAT_CONT
-CV_HIST_TREE=CV_HIST_SPARSE
-CV_TERMCRIT_NUMBER=CV_TERMCRIT_ITER
-CV_SEQ_ELTYPE_PTR=CV_USRTYPE1
-CV_GRAPH=CV_SEQ_KIND_GRAPH
-CV_SEQ_CONTOUR=CV_SEQ_POLYGON
-CV_STORAGE_WRITE_TEXT=CV_STORAGE_WRITE
-CV_STORAGE_WRITE_BINARY=CV_STORAGE_WRITE
-CV_NODE_INTEGER=CV_NODE_INT
-CV_NODE_FLOAT=CV_NODE_REAL
-CV_NODE_STRING=CV_NODE_STR
-cvGetSubArr=cvGetSubRect
-cvZero=cvSetZero
-cvCvtScale=cvConvertScale
-cvScale=cvConvertScale
-cvCvtScaleAbs=cvConvertScaleAbs
-cvCheckArray=cvCheckArr
-cvMatMulAddEx=cvGEMM
-cvMatMulAddS=cvTransform
-cvT=cvTranspose
-cvMirror=cvFlip
-cvInv=cvInvert
-cvMahalonobis=cvMahalanobis
-CV_DXT_INVERSE_SCALE=CV_DXT_INV_SCALE
-cvFFT=cvDFT
-cvGraphFindEdge=cvFindGraphEdge
-cvGraphFindEdgeByPtr=cvFindGraphEdgeByPtr
-cvDrawRect=cvRectangle
-cvDrawLine=cvLine
-cvDrawCircle=cvCircle
-cvDrawEllipse=cvEllipse
-cvDrawPolyLine=cvPolyLine
-CV_FONT_VECTOR0=CV_FONT_HERSHEY_SIMPLEX
-CV_RGB2RGBA=CV_BGR2BGRA
-CV_RGBA2RGB=CV_BGRA2BGR
-CV_RGB2BGRA=CV_BGR2RGBA
-CV_BGRA2RGB=CV_RGBA2BGR
-CV_RGB2BGR=CV_BGR2RGB
-CV_RGBA2BGRA=CV_BGRA2RGBA
-CV_GRAY2RGB=CV_GRAY2BGR
-CV_GRAY2RGBA=CV_GRAY2BGRA
-CV_BayerBG2RGB=CV_BayerRG2BGR
-CV_BayerGB2RGB=CV_BayerGR2BGR
-CV_BayerRG2RGB=CV_BayerBG2BGR
-CV_BayerGR2RGB=CV_BayerGB2BGR
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                        Intel License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2000, Intel Corporation, all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of Intel Corporation may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+/*M// 
+// This file contains custom python-based aliases for some methods where
+// an autogenerated wrapper was unusable or missing.
+//M*/
+
+// This macro removes the wrapper for the function from_name, and creates 
+// an alias to to_name, so calling from_name() will invoke to_name()
+%define %myalias(from_name, to_name)
+%ignore from_name;
+%pythoncode%{
+from_name = to_name;
 %}
+%enddef
+
+// Map functions using IplImage ** argument to CvArr ** function instead
+%myalias(cvCalcBackProject, cvCalcArrBackProject);
+%myalias(cvCalcBackProjectPatch, cvCalcArrBackProjectPatch);
+%myalias(cvCalcImageHist, cvCalcArrHist);
+%myalias(cvCalcHist, cvCalcArrHist);
+