X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=interfaces%2Fswig%2Ffiltered%2Fconstants.h;h=9b1c2a6dd7bcc908f3978da4ebd2c555f86dc01c;hb=HEAD;hp=c916434433fcfa1291298427d63a4c2cea444057;hpb=454138ff8a20f6edb9b65a910101403d8b520643;p=opencv diff --git a/interfaces/swig/filtered/constants.h b/interfaces/swig/filtered/constants.h index c916434..9b1c2a6 100644 --- a/interfaces/swig/filtered/constants.h +++ b/interfaces/swig/filtered/constants.h @@ -1,210 +1,226 @@ -#define CV_AUTOSTEP 0x7fffffff +#define CV_AUTOSTEP 0x7fffffff -#define cvGetSubArr cvGetSubRect +#define cvGetSubArr cvGetSubRect -#define CV_MAX_ARR 10 +#define CV_MAX_ARR 10 -#define CV_NO_DEPTH_CHECK 1 +#define CV_NO_DEPTH_CHECK 1 -#define CV_NO_CN_CHECK 2 +#define CV_NO_CN_CHECK 2 -#define CV_NO_SIZE_CHECK 4 +#define CV_NO_SIZE_CHECK 4 -#define cvZero cvSetZero +#define cvZero cvSetZero -#define cvCvtScale cvConvertScale +#define cvCvtScale cvConvertScale -#define cvScale cvConvertScale +#define cvScale cvConvertScale -#define cvCvtScaleAbs cvConvertScaleAbs +#define cvCvtScaleAbs cvConvertScaleAbs -#define CV_CMP_EQ 0 +#define CV_CMP_EQ 0 -#define CV_CMP_GT 1 +#define CV_CMP_GT 1 -#define CV_CMP_GE 2 +#define CV_CMP_GE 2 -#define CV_CMP_LT 3 +#define CV_CMP_LT 3 -#define CV_CMP_LE 4 +#define CV_CMP_LE 4 -#define CV_CMP_NE 5 +#define CV_CMP_NE 5 -#define CV_CHECK_RANGE 1 +#define CV_CHECK_RANGE 1 -#define CV_CHECK_QUIET 2 +#define CV_CHECK_QUIET 2 -#define cvCheckArray cvCheckArr +#define cvCheckArray cvCheckArr -#define CV_RAND_UNI 0 +#define CV_RAND_UNI 0 -#define CV_RAND_NORMAL 1 +#define CV_RAND_NORMAL 1 -#define CV_GEMM_A_T 1 +#define CV_SORT_EVERY_ROW 0 -#define CV_GEMM_B_T 2 +#define CV_SORT_EVERY_COLUMN 1 -#define CV_GEMM_C_T 4 +#define CV_SORT_ASCENDING 0 -#define cvMatMulAddEx cvGEMM +#define CV_SORT_DESCENDING 16 -#define cvMatMulAddS cvTransform +#define CV_GEMM_A_T 1 -#define cvT cvTranspose +#define CV_GEMM_B_T 2 -#define cvMirror cvFlip +#define CV_GEMM_C_T 4 -#define CV_SVD_MODIFY_A 1 +#define cvMatMulAddEx cvGEMM -#define CV_SVD_U_T 2 +#define cvMatMulAddS cvTransform -#define CV_SVD_V_T 4 +#define cvT cvTranspose -#define CV_LU 0 +#define cvMirror cvFlip -#define CV_SVD 1 +#define CV_SVD_MODIFY_A 1 -#define CV_SVD_SYM 2 +#define CV_SVD_U_T 2 -#define cvInv cvInvert +#define CV_SVD_V_T 4 -#define CV_COVAR_SCRAMBLED 0 +#define CV_LU 0 -#define CV_COVAR_NORMAL 1 +#define CV_SVD 1 -#define CV_COVAR_USE_AVG 2 +#define CV_SVD_SYM 2 -#define CV_COVAR_SCALE 4 +#define CV_CHOLESKY 3 -#define CV_COVAR_ROWS 8 +#define CV_QR 4 -#define CV_COVAR_COLS 16 +#define CV_NORMAL 16 -#define CV_PCA_DATA_AS_ROW 0 +#define cvInv cvInvert -#define CV_PCA_DATA_AS_COL 1 +#define CV_COVAR_SCRAMBLED 0 -#define CV_PCA_USE_AVG 2 +#define CV_COVAR_NORMAL 1 -#define cvMahalonobis cvMahalanobis +#define CV_COVAR_USE_AVG 2 -#define CV_C 1 +#define CV_COVAR_SCALE 4 -#define CV_L1 2 +#define CV_COVAR_ROWS 8 -#define CV_L2 4 +#define CV_COVAR_COLS 16 -#define CV_NORM_MASK 7 +#define CV_PCA_DATA_AS_ROW 0 -#define CV_RELATIVE 8 +#define CV_PCA_DATA_AS_COL 1 -#define CV_DIFF 16 +#define CV_PCA_USE_AVG 2 -#define CV_MINMAX 32 +#define cvMahalonobis cvMahalanobis -#define CV_DIFF_C (CV_DIFF | CV_C) +#define CV_C 1 -#define CV_DIFF_L1 (CV_DIFF | CV_L1) +#define CV_L1 2 -#define CV_DIFF_L2 (CV_DIFF | CV_L2) +#define CV_L2 4 -#define CV_RELATIVE_C (CV_RELATIVE | CV_C) +#define CV_NORM_MASK 7 -#define CV_RELATIVE_L1 (CV_RELATIVE | CV_L1) +#define CV_RELATIVE 8 -#define CV_RELATIVE_L2 (CV_RELATIVE | CV_L2) +#define CV_DIFF 16 -#define CV_REDUCE_SUM 0 +#define CV_MINMAX 32 -#define CV_REDUCE_AVG 1 +#define CV_DIFF_C (CV_DIFF | CV_C) -#define CV_REDUCE_MAX 2 +#define CV_DIFF_L1 (CV_DIFF | CV_L1) -#define CV_REDUCE_MIN 3 +#define CV_DIFF_L2 (CV_DIFF | CV_L2) -#define CV_DXT_FORWARD 0 +#define CV_RELATIVE_C (CV_RELATIVE | CV_C) -#define CV_DXT_INVERSE 1 +#define CV_RELATIVE_L1 (CV_RELATIVE | CV_L1) + +#define CV_RELATIVE_L2 (CV_RELATIVE | CV_L2) + +#define CV_REDUCE_SUM 0 + +#define CV_REDUCE_AVG 1 + +#define CV_REDUCE_MAX 2 + +#define CV_REDUCE_MIN 3 + +#define CV_DXT_FORWARD 0 + +#define CV_DXT_INVERSE 1 #define CV_DXT_SCALE 2 -#define CV_DXT_INV_SCALE (CV_DXT_INVERSE + CV_DXT_SCALE) +#define CV_DXT_INV_SCALE (CV_DXT_INVERSE + CV_DXT_SCALE) -#define CV_DXT_INVERSE_SCALE CV_DXT_INV_SCALE +#define CV_DXT_INVERSE_SCALE CV_DXT_INV_SCALE #define CV_DXT_ROWS 4 #define CV_DXT_MUL_CONJ 8 -#define cvFFT cvDFT +#define cvFFT cvDFT -#define CV_FRONT 1 +#define CV_FRONT 1 -#define CV_BACK 0 +#define CV_BACK 0 -#define cvGraphFindEdge cvFindGraphEdge +#define cvGraphFindEdge cvFindGraphEdge -#define cvGraphFindEdgeByPtr cvFindGraphEdgeByPtr +#define cvGraphFindEdgeByPtr cvFindGraphEdgeByPtr -#define CV_GRAPH_VERTEX 1 +#define CV_GRAPH_VERTEX 1 -#define CV_GRAPH_TREE_EDGE 2 +#define CV_GRAPH_TREE_EDGE 2 -#define CV_GRAPH_BACK_EDGE 4 +#define CV_GRAPH_BACK_EDGE 4 -#define CV_GRAPH_FORWARD_EDGE 8 +#define CV_GRAPH_FORWARD_EDGE 8 -#define CV_GRAPH_CROSS_EDGE 16 +#define CV_GRAPH_CROSS_EDGE 16 -#define CV_GRAPH_ANY_EDGE 30 +#define CV_GRAPH_ANY_EDGE 30 -#define CV_GRAPH_NEW_TREE 32 +#define CV_GRAPH_NEW_TREE 32 -#define CV_GRAPH_BACKTRACKING 64 +#define CV_GRAPH_BACKTRACKING 64 -#define CV_GRAPH_OVER -1 +#define CV_GRAPH_OVER -1 -#define CV_GRAPH_ALL_ITEMS -1 +#define CV_GRAPH_ALL_ITEMS -1 -#define CV_GRAPH_ITEM_VISITED_FLAG (1 << 30) +#define CV_GRAPH_ITEM_VISITED_FLAG (1 << 30) -#define CV_GRAPH_SEARCH_TREE_NODE_FLAG (1 << 29) +#define CV_GRAPH_SEARCH_TREE_NODE_FLAG (1 << 29) -#define CV_GRAPH_FORWARD_EDGE_FLAG (1 << 28) +#define CV_GRAPH_FORWARD_EDGE_FLAG (1 << 28) -#define CV_FILLED -1 +#define CV_FILLED -1 -#define CV_AA 16 +#define CV_AA 16 -#define cvDrawRect cvRectangle +#define cvDrawRect cvRectangle -#define cvDrawLine cvLine +#define cvDrawLine cvLine -#define cvDrawCircle cvCircle +#define cvDrawCircle cvCircle -#define cvDrawEllipse cvEllipse +#define cvDrawEllipse cvEllipse -#define cvDrawPolyLine cvPolyLine +#define cvDrawPolyLine cvPolyLine -#define CV_FONT_HERSHEY_SIMPLEX 0 +#define CV_FONT_HERSHEY_SIMPLEX 0 -#define CV_FONT_HERSHEY_PLAIN 1 +#define CV_FONT_HERSHEY_PLAIN 1 -#define CV_FONT_HERSHEY_DUPLEX 2 +#define CV_FONT_HERSHEY_DUPLEX 2 -#define CV_FONT_HERSHEY_COMPLEX 3 +#define CV_FONT_HERSHEY_COMPLEX 3 -#define CV_FONT_HERSHEY_TRIPLEX 4 +#define CV_FONT_HERSHEY_TRIPLEX 4 -#define CV_FONT_HERSHEY_COMPLEX_SMALL 5 +#define CV_FONT_HERSHEY_COMPLEX_SMALL 5 -#define CV_FONT_HERSHEY_SCRIPT_SIMPLEX 6 +#define CV_FONT_HERSHEY_SCRIPT_SIMPLEX 6 -#define CV_FONT_HERSHEY_SCRIPT_COMPLEX 7 +#define CV_FONT_HERSHEY_SCRIPT_COMPLEX 7 -#define CV_FONT_ITALIC 16 +#define CV_FONT_ITALIC 16 -#define CV_FONT_VECTOR0 CV_FONT_HERSHEY_SIMPLEX +#define CV_FONT_VECTOR0 CV_FONT_HERSHEY_SIMPLEX + +#define CV_KMEANS_USE_INITIAL_LABELS 1 #define CV_ErrModeLeaf 0 @@ -212,13 +228,13 @@ #define CV_ErrModeSilent 2 -#define CV_MAJOR_VERSION 1 +#define CV_MAJOR_VERSION 2 #define CV_MINOR_VERSION 0 #define CV_SUBMINOR_VERSION 0 -#define CV_VERSION "1.0.0" +#define CV_VERSION CVAUX_STR(CV_MAJOR_VERSION) "." CVAUX_STR(CV_MINOR_VERSION) "." CVAUX_STR(CV_SUBMINOR_VERSION) #define CV_PI 3.1415926535897932384626433832795 @@ -304,7 +320,11 @@ #define CV_USRTYPE1 7 -#define CV_MAKETYPE(depth,cn) ((depth) + (((cn)-1) << CV_CN_SHIFT)) +#define CV_MAT_DEPTH_MASK (CV_DEPTH_MAX - 1) + +#define CV_MAT_DEPTH(flags) ((flags) & CV_MAT_DEPTH_MASK) + +#define CV_MAKETYPE(depth,cn) (CV_MAT_DEPTH(depth) + (((cn)-1) << CV_CN_SHIFT)) #define CV_MAKE_TYPE CV_MAKETYPE @@ -370,10 +390,10 @@ #define CV_MAT_CN_MASK ((CV_CN_MAX - 1) << CV_CN_SHIFT) -#define CV_MAT_DEPTH_MASK (CV_DEPTH_MAX - 1) - #define CV_MAT_TYPE_MASK (CV_DEPTH_MAX*CV_CN_MAX - 1) +#define CV_MAT_TYPE(flags) ((flags) & CV_MAT_TYPE_MASK) + #define CV_MAT_CONT_FLAG_SHIFT 14 #define CV_MAT_CONT_FLAG (1 << CV_MAT_CONT_FLAG_SHIFT) @@ -654,6 +674,8 @@ #define CV_StsBadMemBlock -214 +#define CV_StsAssert -215 + #define CV_BLUR_NO_SCALE 0 #define CV_BLUR 1 @@ -866,6 +888,8 @@ #define CV_LKFLOW_INITIAL_GUESSES 4 +#define CV_LKFLOW_GET_MIN_EIGENVALS 8 + #define CV_POLY_APPROX_DP 0 #define CV_DOMINANT_IPAN 1 @@ -936,10 +960,20 @@ #define CV_HAAR_SCALE_IMAGE 2 -#define CV_HAAR_FIND_BIGGEST_OBJECT 4 +#define CV_HAAR_FIND_BIGGEST_OBJECT 4 #define CV_HAAR_DO_ROUGH_SEARCH 8 +#define CV_LMEDS 4 + +#define CV_RANSAC 8 + +#define CV_CALIB_CB_ADAPTIVE_THRESH 1 + +#define CV_CALIB_CB_NORMALIZE_IMAGE 2 + +#define CV_CALIB_CB_FILTER_QUADS 4 + #define CV_CALIB_USE_INTRINSIC_GUESS 1 #define CV_CALIB_FIX_ASPECT_RATIO 2 @@ -948,23 +982,41 @@ #define CV_CALIB_ZERO_TANGENT_DIST 8 -#define CV_CALIB_CB_ADAPTIVE_THRESH 1 +#define CV_CALIB_FIX_FOCAL_LENGTH 16 -#define CV_CALIB_CB_NORMALIZE_IMAGE 2 +#define CV_CALIB_FIX_K1 32 + +#define CV_CALIB_FIX_K2 64 -#define CV_CALIB_CB_FILTER_QUADS 4 +#define CV_CALIB_FIX_K3 128 + +#define CV_CALIB_FIX_INTRINSIC 256 + +#define CV_CALIB_SAME_FOCAL_LENGTH 512 + +#define CV_CALIB_ZERO_DISPARITY 1024 #define CV_FM_7POINT 1 #define CV_FM_8POINT 2 -#define CV_FM_LMEDS_ONLY 4 +#define CV_FM_LMEDS_ONLY CV_LMEDS + +#define CV_FM_RANSAC_ONLY CV_RANSAC + +#define CV_FM_LMEDS CV_LMEDS + +#define CV_FM_RANSAC CV_RANSAC + +#define CV_STEREO_BM_NORMALIZED_RESPONSE 0 + +#define CV_STEREO_BM_BASIC 0 -#define CV_FM_RANSAC_ONLY 8 +#define CV_STEREO_BM_FISH_EYE 1 -#define CV_FM_LMEDS (CV_FM_LMEDS_ONLY + CV_FM_8POINT) +#define CV_STEREO_BM_NARROW 2 -#define CV_FM_RANSAC (CV_FM_RANSAC_ONLY + CV_FM_8POINT) +#define CV_STEREO_GC_OCCLUDED SHRT_MAX #define CV_RETR_EXTERNAL 0