extended cv.KMeans2 API in Python (ticket #414; thanks to hogelog). fixed failures in the opencv python tests.

This commit is contained in:
Vadim Pisarevsky
2010-11-30 10:11:38 +00:00
parent 53e362e403
commit 8754cafffb
4 changed files with 83 additions and 32 deletions

View File

@@ -305,25 +305,25 @@
#define CV_EVENT_FLAG_SHIFTKEY 16
#define CV_EVENT_FLAG_ALTKEY 32
#define CV_MAX_DIM 32
include/highgui.h:#define CV_CAP_PROP_POS_MSEC 0
include/highgui.h:#define CV_CAP_PROP_POS_FRAMES 1
include/highgui.h:#define CV_CAP_PROP_POS_AVI_RATIO 2
include/highgui.h:#define CV_CAP_PROP_FRAME_WIDTH 3
include/highgui.h:#define CV_CAP_PROP_FRAME_HEIGHT 4
include/highgui.h:#define CV_CAP_PROP_FPS 5
include/highgui.h:#define CV_CAP_PROP_FOURCC 6
include/highgui.h:#define CV_CAP_PROP_FRAME_COUNT 7
include/highgui.h:#define CV_CAP_PROP_FORMAT 8
include/highgui.h:#define CV_CAP_PROP_MODE 9
include/highgui.h:#define CV_CAP_PROP_BRIGHTNESS 10
include/highgui.h:#define CV_CAP_PROP_CONTRAST 11
include/highgui.h:#define CV_CAP_PROP_SATURATION 12
include/highgui.h:#define CV_CAP_PROP_HUE 13
include/highgui.h:#define CV_CAP_PROP_GAIN 14
include/highgui.h:#define CV_CAP_PROP_EXPOSURE 15
include/highgui.h:#define CV_CAP_PROP_CONVERT_RGB 16
include/highgui.h:#define CV_CAP_PROP_WHITE_BALANCE 17
include/highgui.h:#define CV_CAP_PROP_RECTIFICATION 18
#define CV_CAP_PROP_POS_MSEC 0
#define CV_CAP_PROP_POS_FRAMES 1
#define CV_CAP_PROP_POS_AVI_RATIO 2
#define CV_CAP_PROP_FRAME_WIDTH 3
#define CV_CAP_PROP_FRAME_HEIGHT 4
#define CV_CAP_PROP_FPS 5
#define CV_CAP_PROP_FOURCC 6
#define CV_CAP_PROP_FRAME_COUNT 7
#define CV_CAP_PROP_FORMAT 8
#define CV_CAP_PROP_MODE 9
#define CV_CAP_PROP_BRIGHTNESS 10
#define CV_CAP_PROP_CONTRAST 11
#define CV_CAP_PROP_SATURATION 12
#define CV_CAP_PROP_HUE 13
#define CV_CAP_PROP_GAIN 14
#define CV_CAP_PROP_EXPOSURE 15
#define CV_CAP_PROP_CONVERT_RGB 16
#define CV_CAP_PROP_WHITE_BALANCE 17
#define CV_CAP_PROP_RECTIFICATION 18
#define CV_CN_SHIFT 3
#define CV_IMWRITE_JPEG_QUALITY 1
#define CV_IMWRITE_PNG_COMPRESSION 16
@@ -333,7 +333,9 @@ include/highgui.h:#define CV_CAP_PROP_RECTIFICATION 18
#define CV_PI
#define CV_GAUSSIAN_5x5
#define CV_CN_MAX
../include/opencv/highgui.h:#define CV_WINDOW_AUTOSIZE 1
../include/opencv/highgui.h:#define CV_WINDOW_NORMAL 0
../include/opencv/highgui.h:#define CV_WINDOW_FULLSCREEN 1
../include/opencv/highgui.h:#define HG_AUTOSIZE CV_WINDOW_AUTOSIZE
#define CV_WINDOW_AUTOSIZE 1
#define CV_WINDOW_NORMAL 0
#define CV_WINDOW_FULLSCREEN 1
#define HG_AUTOSIZE CV_WINDOW_AUTOSIZE
#define CV_CVTIMG_FLIP 1
#define CV_CVTIMG_SWAP_RB 2