OpenCV-CS.diff

Pavel Heimlich, 2011-02-15 01:07 am

Download (821 Bytes)

 
modules/flann/include/opencv2/flann/general.h 2011-02-15 01:02:55.088553293 +0100
73 73 
	MAX_DIST   = 4,
74 74 
	HIK       = 5,
75 75 
	HELLINGER = 6,
76 
	CS        = 7,
76 
	dist_CS    = 7,
77 77 
	CHI_SQUARE = 7,
78 78 
	KL        = 8,
79 79 
	KULLBACK_LEIBLER        = 8
80 
-- modules/flann/include/opencv2/flann/dist.h.orig	2011-02-15 01:03:52.097864674 +0100
80 
++ modules/flann/include/opencv2/flann/dist.h	2011-02-15 01:04:12.815957294 +0100
......
317 317 
		return hist_intersection_dist_sq(first1, last1, first2, acc);
318 318 
	case HELLINGER:
319 319 
		return hellinger_dist(first1, last1, first2, acc);
320 
	case CS:
320 
	case dist_CS:
321 321 
		return chi_square_dist(first1, last1, first2, acc);
322 322 
	case KL:
323 323 
		return kl_divergence(first1, last1, first2, acc);