opencv/modules/imgproc/doc
mshabunin c54b8f9b00 Merge remote-tracking branch 'master' into stitch-fix
* 'master' of github.com:itseez/opencv: (82 commits)
  moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
  added some basic functionality needed by the new face module (moved from the old "contrib")
  moved to the new opencv_contrib/face module
  fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
  Fixed review comment from Vadim Pisarevsky
  modified farneback sample to use T-API
  ECC patch by the author (G. Evangelidis); fixed some OCL Farneback optical flow test failures on Mac
  small fix for GaussianBlur ocl test
  fix binary package build
  small fix for ocl_resize
  fix IOS framework
  fixed test ocl_MatchTemplate for sparse matrix
  Fixed typos
  fixing error, wrong template method param.
  fixing Mac build
  some formal changes (generally adding constness)
  Fixed choice of kercn and rowsPerWI for non-Intel device.
  fixed nDiffs for CalcBackProject
  fixed tests for ocl_filter2d, ocl_matchTemplate, ocl_histogram.cpp
  Fixed issue: Mat::copyTo(UMat) if device copy is obsolete. Added test.
  ...

Conflicts:
	modules/core/include/opencv2/core/mat.inl.hpp
2014-08-11 14:50:08 +04:00
..
pics added some basic functionality needed by the new face module (moved from the old "contrib") 2014-08-10 01:54:16 +04:00
colormaps.rst added some basic functionality needed by the new face module (moved from the old "contrib") 2014-08-10 01:54:16 +04:00
feature_detection.rst Issue #3709 - PyBindings for LSD 2014-06-03 14:25:33 +05:30
filtering.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-07-08 14:33:56 +04:00
geometric_transformations.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-05-19 18:39:20 +04:00
histograms.rst Implemented Kullback-Leibler divergence 2014-05-17 23:44:31 +08:00
imgproc.rst added some basic functionality needed by the new face module (moved from the old "contrib") 2014-08-10 01:54:16 +04:00
miscellaneous_transformations.rst Updating missed defines in documentation 2014-05-27 18:09:12 +01:00
motion_analysis_and_object_tracking.rst Remove documentation for old python wrapper 2013-04-12 19:37:40 +04:00
object_detection.rst Normalized file endings. 2013-08-21 18:59:25 +04:00
structural_analysis_and_shape_descriptors.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-05-19 18:39:20 +04:00