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

Merge pull request #659 from Nerei:master

Browse Source
This commit is contained in:
cuda-geek 2013-03-18 00:46:40 +04:00 committed by OpenCV Buildbot
commit 7772811585
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/softcascade/src/cuda/channels.cu
View File

@ -63,6 +63,9 @@ __host__ __device__ __forceinline__ int divUp(int total, int grain)
namespace cv { namespace softcascade { namespace device
{
typedef unsigned int uint;
typedef unsigned short ushort;
// Utility function to extract unsigned chars from an unsigned integer
__device__ uchar4 int_to_uchar4(unsigned int in)
{

2
modules/softcascade/src/cuda_invoker.hpp
View File

@ -58,6 +58,8 @@
namespace cv { namespace softcascade { namespace device {
typedef unsigned char uchar;
typedef unsigned int uint;
typedef unsigned short ushort;
struct Octave
{