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

fixed windows build

Browse Source
This commit is contained in:
Vladislav Vinogradov
2012-12-13 15:40:05 +04:00
parent da93a1dab9
commit 8c057af862
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/gpu/include/opencv2/gpu/device/common.hpp
View File

@@ -100,6 +100,9 @@ namespace cv { namespace gpu
typedef unsigned char uchar; typedef unsigned char uchar;
typedef unsigned short ushort; typedef unsigned short ushort;
typedef signed char schar; typedef signed char schar;
#ifdef WIN32
typedef unsigned int uint;
#endif
template<class T> inline void bindTexture(const textureReference* tex, const PtrStepSz<T>& img) template<class T> inline void bindTexture(const textureReference* tex, const PtrStepSz<T>& img)
{ {

2
modules/gpu/src/cuda/element_operations.cu
View File

@@ -1409,7 +1409,7 @@ namespace arithm
{ {
S val; S val;
explicit DivInv(double val_) : val(val_) {} explicit DivInv(S val_) : val(val_) {}
__device__ __forceinline__ D operator ()(T a) const __device__ __forceinline__ D operator ()(T a) const
{ {

8
modules/gpu/src/cuda/icf-sc.cu
View File

@@ -138,10 +138,10 @@ namespace icf {
template<bool isDefaultNum> template<bool isDefaultNum>
__device__ __forceinline__ int fast_angle_bin(const float& dx, const float& dy) __device__ __forceinline__ int fast_angle_bin(const float& dx, const float& dy)
{ {
const float angle_quantum = M_PI / 6.f; const float angle_quantum = CV_PI / 6.f;
float angle = atan2(dx, dy) + (angle_quantum / 2.f); float angle = atan2(dx, dy) + (angle_quantum / 2.f);
if (angle < 0) angle += M_PI; if (angle < 0) angle += CV_PI;
const float angle_scaling = 1.f / angle_quantum; const float angle_scaling = 1.f / angle_quantum;
return static_cast<int>(angle * angle_scaling) % 6; return static_cast<int>(angle * angle_scaling) % 6;
@@ -175,8 +175,8 @@ namespace icf {
{ {
int i = 3; int i = 3;
float2 bin_vector_i; float2 bin_vector_i;
bin_vector_i.x = ::cos(i * (M_PI / 6.f)); bin_vector_i.x = ::cos(i * (CV_PI / 6.f));
bin_vector_i.y = ::sin(i * (M_PI / 6.f)); bin_vector_i.y = ::sin(i * (CV_PI / 6.f));
const float dot_product = fabs(dx * bin_vector_i.x + dy * bin_vector_i.y); const float dot_product = fabs(dx * bin_vector_i.x + dy * bin_vector_i.y);
if(dot_product > max_dot) if(dot_product > max_dot)