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

fix build under win.

Browse Source
This commit is contained in:
marina.kolpakova 2012-12-07 16:56:17 +04:00
parent 4102aaaf15
commit 79c3a8e03b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/gpu/src/icf.hpp
View File

@ -56,7 +56,7 @@
namespace cv { namespace gpu { namespace device { namespace cv { namespace gpu { namespace device {
namespace icf { namespace icf {
struct __align__(16) Octave struct Octave
{ {
ushort index; ushort index;
ushort stages; ushort stages;
@ -68,7 +68,7 @@ struct __align__(16) Octave
: index(i), stages(s), shrinkage(sh), size(sz), scale(sc) {} : index(i), stages(s), shrinkage(sh), size(sz), scale(sc) {}
}; };
struct __align__(8) Level //is actually 24 bytes struct Level //is actually 24 bytes
{ {
int octave; int octave;
int step; int step;
@ -84,7 +84,7 @@ struct __align__(8) Level //is actually 24 bytes
__device Level(){} __device Level(){}
}; };
struct __align__(8) Node struct Node
{ {
uchar4 rect; uchar4 rect;
// ushort channel; // ushort channel;
@ -95,12 +95,13 @@ struct __align__(8) Node
Node(const uchar4 r, const unsigned int ch, const unsigned int t) : rect(r), threshold(t + (ch << 28)) {} Node(const uchar4 r, const unsigned int ch, const unsigned int t) : rect(r), threshold(t + (ch << 28)) {}
}; };
struct __align__(16) Detection struct Detection
{ {
ushort x; ushort x;
ushort y; ushort y;
ushort w; ushort w;
ushort h; ushort h;
float confidence; float confidence;
int kind; int kind;