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

GPU module: minor interface changes

Browse Source
This commit is contained in:
Anatoly Baksheev
2010-09-17 17:18:41 +00:00
parent 1387bfcde0
commit 4ffb519cdd
6 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/gpu/src/gputest.hpp
View File

@@ -39,8 +39,8 @@
//
//M*/
#ifndef _CXCORE_TEST_H_
#define _CXCORE_TEST_H_
#ifndef _GPU_TEST_H_
#define _GPU_TEST_H_
#if defined WIN32 || defined _WIN32
#include <windows.h>
@@ -62,10 +62,8 @@
#pragma warning(disable : 4996) /* deprecated function */
#endif
#endif /* _CXCORE_TEST_H_ */
inline bool check_and_treat_gpu_exception(const cv::Exception& e, CvTS* ts)
static inline bool check_and_treat_gpu_exception(const cv::Exception& e, CvTS* ts)
{
switch (e.code)
{
@@ -88,4 +86,6 @@ inline bool check_and_treat_gpu_exception(const cv::Exception& e, CvTS* ts)
return true;
}
#endif
/* End of file. */

6
tests/gpu/src/morf_filters.cpp
View File

@@ -132,7 +132,7 @@ public:
protected:
virtual int test(const Mat& img)
{
Mat kernel(3, 3, CV_8U, 1);
Mat kernel(3, 3, CV_8U, Scalar(1));
Point anchor(1,1);
int iters = 3;
@@ -158,7 +158,7 @@ public:
protected:
virtual int test(const Mat& img)
{
Mat kernel(3, 3, CV_8U, 1);
Mat kernel(3, 3, CV_8U, Scalar(1));
Point anchor(1,1);
int iters = 3;
@@ -189,7 +189,7 @@ protected:
const char *names[] = { "MORPH_OPEN", "CV_MOP_CLOSE", "CV_MOP_GRADIENT", "CV_MOP_TOPHAT", "CV_MOP_BLACKHAT"};
int num = sizeof(ops)/sizeof(ops[0]);
Mat kernel(3, 3, CV_8U, 1);
Mat kernel(3, 3, CV_8U, Scalar(1));
Point anchor(1,1);
int iters = 3;