Merge pull request #1874 from SpecLad:merge-2.4

This commit is contained in:
Roman Donchenko
2013-11-28 16:42:53 +04:00
committed by OpenCV Buildbot
111 changed files with 1018 additions and 473 deletions

View File

@@ -66,7 +66,7 @@
/* helper tables */
extern const uchar icvSaturate8u_cv[];
#define CV_FAST_CAST_8U(t) (assert(-256 <= (t) || (t) <= 512), icvSaturate8u_cv[(t)+256])
#define CV_FAST_CAST_8U(t) (assert(-256 <= (t) && (t) <= 512), icvSaturate8u_cv[(t)+256])
#define CV_CALC_MIN_8U(a,b) (a) -= CV_FAST_CAST_8U((a) - (b))
#define CV_CALC_MAX_8U(a,b) (a) += CV_FAST_CAST_8U((b) - (a))