generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #371 from taka-no-me:fix_build

Browse Source
This commit is contained in:
Andrey Kamaev 2013-01-30 15:06:19 +04:00 committed by OpenCV Buildbot
commit 52b32ba8f0
5 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/calib3d/src/_modelest.h
View File

@ -43,7 +43,7 @@
#ifndef _CV_MODEL_EST_H_ #ifndef _CV_MODEL_EST_H_
#define _CV_MODEL_EST_H_ #define _CV_MODEL_EST_H_
#include "precomp.hpp" #include "opencv2/calib3d/calib3d.hpp"
class CV_EXPORTS CvModelEstimator2 class CV_EXPORTS CvModelEstimator2
{ {

2
modules/calib3d/test/test_modelest.cpp
View File

@ -159,7 +159,7 @@ void CV_ModelEstimator2_Test::fill_array( int test_case_idx, int i, int j, Mat&
Point2d tangentVector_1 = arr.at<Point2d>(endPointIndex) - arr.at<Point2d>(startPointIndex); Point2d tangentVector_1 = arr.at<Point2d>(endPointIndex) - arr.at<Point2d>(startPointIndex);
Point2d tangentVector_2 = arr.at<Point2d>(testPointIndex) - arr.at<Point2d>(startPointIndex); Point2d tangentVector_2 = arr.at<Point2d>(testPointIndex) - arr.at<Point2d>(startPointIndex);
const float eps = 1e-4; const float eps = 1e-4f;
//TODO: perhaps it is better to normalize the cross product by norms of the tangent vectors //TODO: perhaps it is better to normalize the cross product by norms of the tangent vectors
if (fabs(tangentVector_1.cross(tangentVector_2)) < eps) if (fabs(tangentVector_1.cross(tangentVector_2)) < eps)
{ {

6
modules/ts/src/ts.cpp
View File

@ -47,8 +47,12 @@
#include <time.h> #include <time.h>
#if defined WIN32 || defined _WIN32 || defined WIN64 || defined _WIN64 #if defined WIN32 || defined _WIN32 || defined WIN64 || defined _WIN64
#include <io.h> #include <io.h>
#define NOMINMAX
#include <windows.h> #include <windows.h>
#undef small
#undef min
#undef max
#undef abs
#ifdef _MSC_VER #ifdef _MSC_VER
#include <eh.h> #include <eh.h>

2
samples/cpp/descriptor_extractor_matcher.cpp
View File

@ -222,7 +222,7 @@ static void doIteration( const Mat& img1, Mat& img2, bool isWarpPerspective,
DrawMatchesFlags::DRAW_OVER_OUTIMG | DrawMatchesFlags::NOT_DRAW_SINGLE_POINTS ); DrawMatchesFlags::DRAW_OVER_OUTIMG | DrawMatchesFlags::NOT_DRAW_SINGLE_POINTS );
#endif #endif
printf("Number of inliers: %d\n", countNonZero(matchesMask)); cout << "Number of inliers: " << countNonZero(matchesMask) << endl;
} }
else else
drawMatches( img1, keypoints1, img2, keypoints2, filteredMatches, drawImg ); drawMatches( img1, keypoints1, img2, keypoints2, filteredMatches, drawImg );

4
samples/cpp/videostab.cpp
View File

@ -1,3 +1,7 @@
#if defined __clang__
# pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor"
#endif
#include <string> #include <string>
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>