From 242a3d1f192c986e3ffd6b23c8202e136159d67d Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Thu, 19 Dec 2013 16:57:02 +0400 Subject: [PATCH] 2 more fixes to calm down the doc builder --- modules/objdetect/doc/cascade_classification.rst | 2 +- modules/objdetect/src/cascadedetect.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/objdetect/doc/cascade_classification.rst b/modules/objdetect/doc/cascade_classification.rst index f867dec10..b10887b35 100644 --- a/modules/objdetect/doc/cascade_classification.rst +++ b/modules/objdetect/doc/cascade_classification.rst @@ -91,7 +91,7 @@ Assigns an image to feature evaluator. :param img: Matrix of the type ``CV_8UC1`` containing an image where the features are computed. :param origWinSize: Size of training images. - + :param sumSize: The requested size of integral images (so if the integral image is smaller, it resides in the top-left corner of the larger image of requested size). Because the features are represented using offsets from the image origin, using the same sumSize for all scales helps to avoid constant readjustments of the features to different scales. The method assigns an image, where the features will be computed, to the feature evaluator. diff --git a/modules/objdetect/src/cascadedetect.cpp b/modules/objdetect/src/cascadedetect.cpp index 483519c69..17776013c 100644 --- a/modules/objdetect/src/cascadedetect.cpp +++ b/modules/objdetect/src/cascadedetect.cpp @@ -113,7 +113,7 @@ struct Logger namespace cv { - + template void copyVectorToUMat(const std::vector<_Tp>& v, UMat& um) { if(v.empty())