Merge pull request #2218 from alalek:fix_defects_code_coverity

author Andrey Pavlenko <andrey.pavlenko@itseez.com>

Fri, 31 Jan 2014 15:23:01 +0000 (19:23 +0400)

committer OpenCV Buildbot <buildbot@opencv.org>

Fri, 31 Jan 2014 15:23:02 +0000 (19:23 +0400)
author Andrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 31 Jan 2014 15:23:01 +0000 (19:23 +0400)
committer OpenCV Buildbot <buildbot@opencv.org>
Fri, 31 Jan 2014 15:23:02 +0000 (19:23 +0400)
diff --cc modules/core/include/opencv2/core/ocl.hpp
Simple merge
diff --cc modules/core/src/ocl.cpp
Simple merge
author	Andrey Pavlenko <andrey.pavlenko@itseez.com>
	Fri, 31 Jan 2014 15:23:01 +0000 (19:23 +0400)
committer	OpenCV Buildbot <buildbot@opencv.org>
	Fri, 31 Jan 2014 15:23:02 +0000 (19:23 +0400)
		1	2
modules/core/include/opencv2/core/ocl.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/core/src/ocl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history