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

fixed ~300 warnings under windows (had to hack gtest a bit)

Browse Source
This commit is contained in:
Anatoly Baksheev
2011-05-06 21:45:48 +00:00
parent c67f1a2551
commit 1c18e5fef9
25 changed files with 87 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/ts/include/opencv2/ts/ts_gtest.h
View File

@@ -1652,15 +1652,18 @@ inline bool operator!=(const GTEST_10_TUPLE_(T)& t,
#ifdef _MSC_VER
#if GTEST_LINKED_AS_SHARED_LIBRARY
#define GTEST_API_ __declspec(dllimport)
#define GTEST_API_
#define GTEST_API_2 __declspec(dllimport)
#elif GTEST_CREATE_SHARED_LIBRARY
#define GTEST_API_ __declspec(dllexport)
#define GTEST_API_2 GTEST_API_
#endif
#endif // _MSC_VER
#ifndef GTEST_API_
#define GTEST_API_
#define GTEST_API_2
#endif
namespace testing {
@@ -8378,7 +8381,7 @@ namespace testing {
namespace internal {
// Protects copying of all linked_ptr objects.
GTEST_API_ GTEST_DECLARE_STATIC_MUTEX_(g_linked_ptr_mutex);
GTEST_API_2 GTEST_DECLARE_STATIC_MUTEX_(g_linked_ptr_mutex);
// This is used internally by all instances of linked_ptr<>. It needs to be
// a non-template class because different types of linked_ptr<> can refer to
@@ -15359,7 +15362,7 @@ class GTEST_API_ TestPartResultArray {
};
// This interface knows how to report a test part result.
class TestPartResultReporterInterface {
class GTEST_API_ TestPartResultReporterInterface {
public:
virtual ~TestPartResultReporterInterface() {}

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

@@ -2712,7 +2712,7 @@ Mat calcLaplaceKernel2D( int aperture_size )
for( int i = 0; i < ksize; i++ )
for( int j = 0; j < ksize; j++ )
kernel.at<float>(i, j) = kx[j]*ky[i] + kx[i]*ky[j];
kernel.at<float>(i, j) = (float)(kx[j]*ky[i] + kx[i]*ky[j]);
return kernel;
}