Skip to content

O
opencv
Commit 77728115 authored by cuda-geek's avatar cuda-geek Committed by OpenCV Buildbot
Browse files
Options

Merge pull request #659 from Nerei:master

parents 92ba74a3 fe10c74f
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
modules/softcascade/src/cuda/channels.cu
View file @ 77728115
...@@ -63,6 +63,9 @@ __host__ __device__ __forceinline__ int divUp(int total, int grain) ...@@ -63,6 +63,9 @@ __host__ __device__ __forceinline__ int divUp(int total, int grain)
namespace cv { namespace softcascade { namespace device namespace cv { namespace softcascade { namespace device
{ {
typedef unsigned int uint;
typedef unsigned short ushort;
// Utility function to extract unsigned chars from an unsigned integer // Utility function to extract unsigned chars from an unsigned integer
__device__ uchar4 int_to_uchar4(unsigned int in) __device__ uchar4 int_to_uchar4(unsigned int in)
{ {
......
modules/softcascade/src/cuda_invoker.hpp
View file @ 77728115
...@@ -58,6 +58,8 @@ ...@@ -58,6 +58,8 @@
namespace cv { namespace softcascade { namespace device { namespace cv { namespace softcascade { namespace device {
typedef unsigned char uchar; typedef unsigned char uchar;
typedef unsigned int uint;
typedef unsigned short ushort;
struct Octave struct Octave
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment