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

fixed build on Windows with MSVC2010

Browse Source
This commit is contained in:
Vadim Pisarevsky 2011-02-09 22:45:45 +00:00
parent 0f1a047ed0
commit d9ab1d2b92
6 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/core/test/test_arithm.cpp
View File

@ -18,7 +18,7 @@ struct BaseElemWiseOp
BaseElemWiseOp(int _ninputs, int _flags, double _alpha, double _beta, BaseElemWiseOp(int _ninputs, int _flags, double _alpha, double _beta,
Scalar _gamma=Scalar::all(0), int _context=1) Scalar _gamma=Scalar::all(0), int _context=1)
: ninputs(_ninputs), flags(_flags), alpha(_alpha), beta(_beta), gamma(_gamma), context(_context) {} : ninputs(_ninputs), flags(_flags), alpha(_alpha), beta(_beta), gamma(_gamma), context(_context) {}
BaseElemWiseOp() { flags = alpha = beta = 0; gamma = Scalar::all(0); } BaseElemWiseOp() { flags = 0; alpha = beta = 0; gamma = Scalar::all(0); }
virtual ~BaseElemWiseOp() {} virtual ~BaseElemWiseOp() {}
virtual void op(const vector<Mat>&, Mat&, const Mat&) {} virtual void op(const vector<Mat>&, Mat&, const Mat&) {}
virtual void refop(const vector<Mat>&, Mat&, const Mat&) {} virtual void refop(const vector<Mat>&, Mat&, const Mat&) {}
@ -288,7 +288,7 @@ struct LogicOp : public BaseElemWiseOp
else else
cvtest::logicOp(src[0], src[1], dst, opcode); cvtest::logicOp(src[0], src[1], dst, opcode);
} }
double getMaxErr(int depth) double getMaxErr(int)
{ {
return 0; return 0;
} }
@ -339,7 +339,7 @@ struct MinOp : public BaseElemWiseOp
{ {
cvtest::min(src[0], src[1], dst); cvtest::min(src[0], src[1], dst);
} }
double getMaxErr(int depth) double getMaxErr(int)
{ {
return 0; return 0;
} }
@ -356,7 +356,7 @@ struct MaxOp : public BaseElemWiseOp
{ {
cvtest::max(src[0], src[1], dst); cvtest::max(src[0], src[1], dst);
} }
double getMaxErr(int depth) double getMaxErr(int)
{ {
return 0; return 0;
} }
@ -373,7 +373,7 @@ struct MinSOp : public BaseElemWiseOp
{ {
cvtest::min(src[0], gamma[0], dst); cvtest::min(src[0], gamma[0], dst);
} }
double getMaxErr(int depth) double getMaxErr(int)
{ {
return 0; return 0;
} }
@ -390,7 +390,7 @@ struct MaxSOp : public BaseElemWiseOp
{ {
cvtest::max(src[0], gamma[0], dst); cvtest::max(src[0], gamma[0], dst);
} }
double getMaxErr(int depth) double getMaxErr(int)
{ {
return 0; return 0;
} }
@ -482,7 +482,7 @@ struct SetOp : public BaseElemWiseOp
{ {
dst.setTo(gamma, mask); dst.setTo(gamma, mask);
} }
void refop(const vector<Mat>& src, Mat& dst, const Mat& mask) void refop(const vector<Mat>&, Mat& dst, const Mat& mask)
{ {
cvtest::set(dst, gamma, mask); cvtest::set(dst, gamma, mask);
} }
@ -808,7 +808,7 @@ struct FlipOp : public BaseElemWiseOp
{ {
cvtest::flip(src[0], dst, flipcode); cvtest::flip(src[0], dst, flipcode);
} }
void generateScalars(int depth, RNG& rng) void generateScalars(int, RNG& rng)
{ {
flipcode = rng.uniform(0, 3) - 1; flipcode = rng.uniform(0, 3) - 1;
} }
@ -1291,7 +1291,7 @@ TEST_P(ElemWiseTest, accuracy)
ElemWiseOpPtr op = GetParam(); ElemWiseOpPtr op = GetParam();
int testIdx = 0; int testIdx = 0;
RNG rng(cvtest::ARITHM_RNG_SEED); RNG rng((uint64)cvtest::ARITHM_RNG_SEED);
for( testIdx = 0; testIdx < cvtest::ARITHM_NTESTS; testIdx++ ) for( testIdx = 0; testIdx < cvtest::ARITHM_NTESTS; testIdx++ )
{ {
vector<int> size; vector<int> size;

1
modules/features2d/src/blobdetector.cpp
View File

@ -41,6 +41,7 @@
//M*/ //M*/
#include "precomp.hpp" #include "precomp.hpp"
#include <iterator>
//#define DEBUG_BLOB_DETECTOR //#define DEBUG_BLOB_DETECTOR

2
modules/imgproc/test/test_canny.cpp
View File

@ -184,7 +184,7 @@ test_Canny( const Mat& src, Mat& dst,
int dxval = dx.at<short>(y, x), dyval = dy.at<short>(y, x); int dxval = dx.at<short>(y, x), dyval = dy.at<short>(y, x);
mag.at<float>(y, x) = use_true_gradient ? mag.at<float>(y, x) = use_true_gradient ?
(float)sqrt((double)(dxval*dxval + dyval*dyval)) : (float)sqrt((double)(dxval*dxval + dyval*dyval)) :
(float)(fabs(dxval) + fabs(dyval)); (float)(fabs((double)dxval) + fabs((double)dyval));
} }
} }

4
modules/ts/include/opencv2/ts/ts.hpp
View File

@ -1,6 +1,10 @@
#ifndef __OPENCV_GTESTCV_HPP__ #ifndef __OPENCV_GTESTCV_HPP__
#define __OPENCV_GTESTCV_HPP__ #define __OPENCV_GTESTCV_HPP__
#ifndef GTEST_CREATE_AS_SHARED_LIBRARY
#define GTEST_LINKED_AS_SHARED_LIBRARY 1
#endif
#include "opencv2/ts/ts_gtest.h" #include "opencv2/ts/ts_gtest.h"
#include "opencv2/core/core.hpp" #include "opencv2/core/core.hpp"

2
modules/ts/src/precomp.hpp
View File

@ -1,2 +1,4 @@
#define GTEST_CREATE_AS_SHARED_LIBRARY 1
#include "opencv2/ts/ts.hpp" #include "opencv2/ts/ts.hpp"
#include "opencv2/core/core_c.h" #include "opencv2/core/core_c.h"

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

@ -68,7 +68,7 @@ namespace cvtest
#if defined WIN32 || defined _WIN32 || defined WIN64 || defined _WIN64 #if defined WIN32 || defined _WIN32 || defined WIN64 || defined _WIN64
#ifdef _MSC_VER #ifdef _MSC_VER
static void setSEHTranslator( unsigned int /*u*/, EXCEPTION_POINTERS* pExp ) static void SEHTranslator( unsigned int /*u*/, EXCEPTION_POINTERS* pExp )
{ {
int code = TS::FAIL_EXCEPTION; int code = TS::FAIL_EXCEPTION;
switch( pExp->ExceptionRecord->ExceptionCode ) switch( pExp->ExceptionRecord->ExceptionCode )