-#define CV_AUTOSTEP 0x7fffffff
+#define CV_AUTOSTEP 0x7fffffff\r
-#define cvGetSubArr cvGetSubRect
+#define cvGetSubArr cvGetSubRect\r
-#define CV_MAX_ARR 10
+#define CV_MAX_ARR 10\r
-#define CV_NO_DEPTH_CHECK 1
+#define CV_NO_DEPTH_CHECK 1\r
-#define CV_NO_CN_CHECK 2
+#define CV_NO_CN_CHECK 2\r
-#define CV_NO_SIZE_CHECK 4
+#define CV_NO_SIZE_CHECK 4\r
-#define cvZero cvSetZero
+#define cvZero cvSetZero\r
-#define cvCvtScale cvConvertScale
+#define cvCvtScale cvConvertScale\r
-#define cvScale cvConvertScale
+#define cvScale cvConvertScale\r
-#define cvCvtScaleAbs cvConvertScaleAbs
+#define cvCvtScaleAbs cvConvertScaleAbs\r
-#define CV_CMP_EQ 0
+#define CV_CMP_EQ 0\r
-#define CV_CMP_GT 1
+#define CV_CMP_GT 1\r
-#define CV_CMP_GE 2
+#define CV_CMP_GE 2\r
-#define CV_CMP_LT 3
+#define CV_CMP_LT 3\r
-#define CV_CMP_LE 4
+#define CV_CMP_LE 4\r
-#define CV_CMP_NE 5
+#define CV_CMP_NE 5\r
-#define CV_CHECK_RANGE 1
+#define CV_CHECK_RANGE 1\r
-#define CV_CHECK_QUIET 2
+#define CV_CHECK_QUIET 2\r
-#define cvCheckArray cvCheckArr
+#define cvCheckArray cvCheckArr\r
-#define CV_RAND_UNI 0
+#define CV_RAND_UNI 0\r
-#define CV_RAND_NORMAL 1
+#define CV_RAND_NORMAL 1\r
-#define CV_GEMM_A_T 1
+#define CV_SORT_EVERY_ROW 0\r
-#define CV_GEMM_B_T 2
+#define CV_SORT_EVERY_COLUMN 1\r
-#define CV_GEMM_C_T 4
+#define CV_SORT_ASCENDING 0\r
-#define cvMatMulAddEx cvGEMM
+#define CV_SORT_DESCENDING 16\r
-#define cvMatMulAddS cvTransform
+#define CV_GEMM_A_T 1\r
-#define cvT cvTranspose
+#define CV_GEMM_B_T 2\r
-#define cvMirror cvFlip
+#define CV_GEMM_C_T 4\r
-#define CV_SVD_MODIFY_A 1
+#define cvMatMulAddEx cvGEMM\r
-#define CV_SVD_U_T 2
+#define cvMatMulAddS cvTransform\r
-#define CV_SVD_V_T 4
+#define cvT cvTranspose\r
-#define CV_LU 0
+#define cvMirror cvFlip\r
-#define CV_SVD 1
+#define CV_SVD_MODIFY_A 1\r
-#define CV_SVD_SYM 2
+#define CV_SVD_U_T 2\r
-#define cvInv cvInvert
+#define CV_SVD_V_T 4\r
-#define CV_COVAR_SCRAMBLED 0
+#define CV_LU 0\r
-#define CV_COVAR_NORMAL 1
+#define CV_SVD 1\r
-#define CV_COVAR_USE_AVG 2
+#define CV_SVD_SYM 2\r
-#define CV_COVAR_SCALE 4
+#define CV_CHOLESKY 3\r
-#define CV_COVAR_ROWS 8
+#define CV_QR 4\r
-#define CV_COVAR_COLS 16
+#define CV_NORMAL 16\r
-#define CV_PCA_DATA_AS_ROW 0
+#define cvInv cvInvert\r
-#define CV_PCA_DATA_AS_COL 1
+#define CV_COVAR_SCRAMBLED 0\r
-#define CV_PCA_USE_AVG 2
+#define CV_COVAR_NORMAL 1\r
-#define cvMahalonobis cvMahalanobis
+#define CV_COVAR_USE_AVG 2\r
-#define CV_C 1
+#define CV_COVAR_SCALE 4\r
-#define CV_L1 2
+#define CV_COVAR_ROWS 8\r
-#define CV_L2 4
+#define CV_COVAR_COLS 16\r
-#define CV_NORM_MASK 7
+#define CV_PCA_DATA_AS_ROW 0\r
-#define CV_RELATIVE 8
+#define CV_PCA_DATA_AS_COL 1\r
-#define CV_DIFF 16
+#define CV_PCA_USE_AVG 2\r
-#define CV_MINMAX 32
+#define cvMahalonobis cvMahalanobis\r
-#define CV_DIFF_C (CV_DIFF | CV_C)
+#define CV_C 1\r
-#define CV_DIFF_L1 (CV_DIFF | CV_L1)
+#define CV_L1 2\r
-#define CV_DIFF_L2 (CV_DIFF | CV_L2)
+#define CV_L2 4\r
-#define CV_RELATIVE_C (CV_RELATIVE | CV_C)
+#define CV_NORM_MASK 7\r
-#define CV_RELATIVE_L1 (CV_RELATIVE | CV_L1)
+#define CV_RELATIVE 8\r
-#define CV_RELATIVE_L2 (CV_RELATIVE | CV_L2)
+#define CV_DIFF 16\r
-#define CV_REDUCE_SUM 0
+#define CV_MINMAX 32\r
-#define CV_REDUCE_AVG 1
+#define CV_DIFF_C (CV_DIFF | CV_C)\r
-#define CV_REDUCE_MAX 2
+#define CV_DIFF_L1 (CV_DIFF | CV_L1)\r
-#define CV_REDUCE_MIN 3
+#define CV_DIFF_L2 (CV_DIFF | CV_L2)\r
-#define CV_DXT_FORWARD 0
+#define CV_RELATIVE_C (CV_RELATIVE | CV_C)\r
-#define CV_DXT_INVERSE 1
+#define CV_RELATIVE_L1 (CV_RELATIVE | CV_L1)\r
+
+#define CV_RELATIVE_L2 (CV_RELATIVE | CV_L2)\r
+
+#define CV_REDUCE_SUM 0\r
+
+#define CV_REDUCE_AVG 1\r
+
+#define CV_REDUCE_MAX 2\r
+
+#define CV_REDUCE_MIN 3\r
+
+#define CV_DXT_FORWARD 0\r
+
+#define CV_DXT_INVERSE 1\r
#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)\r
-#define CV_DXT_INVERSE_SCALE CV_DXT_INV_SCALE
+#define CV_DXT_INVERSE_SCALE CV_DXT_INV_SCALE\r
#define CV_DXT_ROWS 4
#define CV_DXT_MUL_CONJ 8
-#define cvFFT cvDFT
+#define cvFFT cvDFT\r
-#define CV_FRONT 1
+#define CV_FRONT 1\r
-#define CV_BACK 0
+#define CV_BACK 0\r
-#define cvGraphFindEdge cvFindGraphEdge
+#define cvGraphFindEdge cvFindGraphEdge\r
-#define cvGraphFindEdgeByPtr cvFindGraphEdgeByPtr
+#define cvGraphFindEdgeByPtr cvFindGraphEdgeByPtr\r
-#define CV_GRAPH_VERTEX 1
+#define CV_GRAPH_VERTEX 1\r
-#define CV_GRAPH_TREE_EDGE 2
+#define CV_GRAPH_TREE_EDGE 2\r
-#define CV_GRAPH_BACK_EDGE 4
+#define CV_GRAPH_BACK_EDGE 4\r
-#define CV_GRAPH_FORWARD_EDGE 8
+#define CV_GRAPH_FORWARD_EDGE 8\r
-#define CV_GRAPH_CROSS_EDGE 16
+#define CV_GRAPH_CROSS_EDGE 16\r
-#define CV_GRAPH_ANY_EDGE 30
+#define CV_GRAPH_ANY_EDGE 30\r
-#define CV_GRAPH_NEW_TREE 32
+#define CV_GRAPH_NEW_TREE 32\r
-#define CV_GRAPH_BACKTRACKING 64
+#define CV_GRAPH_BACKTRACKING 64\r
-#define CV_GRAPH_OVER -1
+#define CV_GRAPH_OVER -1\r
-#define CV_GRAPH_ALL_ITEMS -1
+#define CV_GRAPH_ALL_ITEMS -1\r
-#define CV_GRAPH_ITEM_VISITED_FLAG (1 << 30)
+#define CV_GRAPH_ITEM_VISITED_FLAG (1 << 30)\r
-#define CV_GRAPH_SEARCH_TREE_NODE_FLAG (1 << 29)
+#define CV_GRAPH_SEARCH_TREE_NODE_FLAG (1 << 29)\r
-#define CV_GRAPH_FORWARD_EDGE_FLAG (1 << 28)
+#define CV_GRAPH_FORWARD_EDGE_FLAG (1 << 28)\r
-#define CV_FILLED -1
+#define CV_FILLED -1\r
-#define CV_AA 16
+#define CV_AA 16\r
-#define cvDrawRect cvRectangle
+#define cvDrawRect cvRectangle\r
-#define cvDrawLine cvLine
+#define cvDrawLine cvLine\r
-#define cvDrawCircle cvCircle
+#define cvDrawCircle cvCircle\r
-#define cvDrawEllipse cvEllipse
+#define cvDrawEllipse cvEllipse\r
-#define cvDrawPolyLine cvPolyLine
+#define cvDrawPolyLine cvPolyLine\r
-#define CV_FONT_HERSHEY_SIMPLEX 0
+#define CV_FONT_HERSHEY_SIMPLEX 0\r
-#define CV_FONT_HERSHEY_PLAIN 1
+#define CV_FONT_HERSHEY_PLAIN 1\r
-#define CV_FONT_HERSHEY_DUPLEX 2
+#define CV_FONT_HERSHEY_DUPLEX 2\r
-#define CV_FONT_HERSHEY_COMPLEX 3
+#define CV_FONT_HERSHEY_COMPLEX 3\r
-#define CV_FONT_HERSHEY_TRIPLEX 4
+#define CV_FONT_HERSHEY_TRIPLEX 4\r
-#define CV_FONT_HERSHEY_COMPLEX_SMALL 5
+#define CV_FONT_HERSHEY_COMPLEX_SMALL 5\r
-#define CV_FONT_HERSHEY_SCRIPT_SIMPLEX 6
+#define CV_FONT_HERSHEY_SCRIPT_SIMPLEX 6\r
-#define CV_FONT_HERSHEY_SCRIPT_COMPLEX 7
+#define CV_FONT_HERSHEY_SCRIPT_COMPLEX 7\r
-#define CV_FONT_ITALIC 16
+#define CV_FONT_ITALIC 16\r
-#define CV_FONT_VECTOR0 CV_FONT_HERSHEY_SIMPLEX
+#define CV_FONT_VECTOR0 CV_FONT_HERSHEY_SIMPLEX\r
+
+#define CV_KMEANS_USE_INITIAL_LABELS 1\r
#define CV_ErrModeLeaf 0
#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
#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
#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)
#define CV_StsBadMemBlock -214
+#define CV_StsAssert -215
+
#define CV_BLUR_NO_SCALE 0
#define CV_BLUR 1
#define CV_LKFLOW_INITIAL_GUESSES 4
+#define CV_LKFLOW_GET_MIN_EIGENVALS 8
+
#define CV_POLY_APPROX_DP 0
#define CV_DOMINANT_IPAN 1
#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
#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