Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
8c057af8
Commit
8c057af8
authored
Dec 13, 2012
by
Vladislav Vinogradov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed windows build
parent
da93a1da
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
5 deletions
+8
-5
common.hpp
modules/gpu/include/opencv2/gpu/device/common.hpp
+3
-0
element_operations.cu
modules/gpu/src/cuda/element_operations.cu
+1
-1
icf-sc.cu
modules/gpu/src/cuda/icf-sc.cu
+4
-4
No files found.
modules/gpu/include/opencv2/gpu/device/common.hpp
View file @
8c057af8
...
...
@@ -100,6 +100,9 @@ namespace cv { namespace gpu
typedef
unsigned
char
uchar
;
typedef
unsigned
short
ushort
;
typedef
signed
char
schar
;
#ifdef WIN32
typedef
unsigned
int
uint
;
#endif
template
<
class
T
>
inline
void
bindTexture
(
const
textureReference
*
tex
,
const
PtrStepSz
<
T
>&
img
)
{
...
...
modules/gpu/src/cuda/element_operations.cu
View file @
8c057af8
...
...
@@ -1409,7 +1409,7 @@ namespace arithm
{
S val;
explicit DivInv(
double
val_) : val(val_) {}
explicit DivInv(
S
val_) : val(val_) {}
__device__ __forceinline__ D operator ()(T a) const
{
...
...
modules/gpu/src/cuda/icf-sc.cu
View file @
8c057af8
...
...
@@ -138,10 +138,10 @@ namespace icf {
template<bool isDefaultNum>
__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);
if (angle < 0) angle +=
M
_PI;
if (angle < 0) angle +=
CV
_PI;
const float angle_scaling = 1.f / angle_quantum;
return static_cast<int>(angle * angle_scaling) % 6;
...
...
@@ -175,8 +175,8 @@ namespace icf {
{
int i = 3;
float2 bin_vector_i;
bin_vector_i.x = ::cos(i * (
M
_PI / 6.f));
bin_vector_i.y = ::sin(i * (
M
_PI / 6.f));
bin_vector_i.x = ::cos(i * (
CV
_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);
if(dot_product > max_dot)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment