third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed ~200 warnings for windows

Browse Source 
minor build system changes (now cuda code in opencv_core is compiled using CUDA_ARCH* cmake variables)
This commit is contained in:
Anatoly Baksheev
2012-02-14 10:22:34 +00:00
parent 8f4d63913a
commit 84db4eb6fa
29 changed files with 126 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/features2d/src/orb.cpp
+2 -2
View File
@@ -974,7 +974,7 @@ void ORB::computeKeyPoints(const vector<Mat>& image_pyramid,
* @param scale the scale at which we compute the orientation
* @param keypoints the resulting keypoints
*/
void ORB::computeOrientation(const Mat& image, const Mat&, unsigned int scale,
void ORB::computeOrientation(const Mat& image, const Mat&, unsigned int /*scale*/,
vector<KeyPoint>& keypoints) const
{
int half_patch_size = params_.patch_size_/2;
@@ -1003,7 +1003,7 @@ void ORB::computeIntegralImage(const Mat&, unsigned int, Mat&)
* @param keypoints the keypoints to use
* @param descriptors the resulting descriptors
*/
void ORB::computeDescriptors(const Mat& image, const Mat& integral_image, unsigned int,
void ORB::computeDescriptors(const Mat& image, const Mat& /*integral_image*/, unsigned int,
vector<KeyPoint>& keypoints, Mat& descriptors) const
{
//convert to grayscale if more than one color