softcascade: remove device dependency on gpu

This commit is contained in:
marina.kolpakova
2013-03-03 16:27:49 +04:00
parent 6daf17f974
commit 3c8e66d580
9 changed files with 77 additions and 34 deletions

View File

@@ -44,9 +44,9 @@
#ifndef __OPENCV_ICF_HPP__
#define __OPENCV_ICF_HPP__
#include <opencv2/gpu/device/common.hpp>
using namespace cv::gpu::device;
// #include <opencv2/gpu/device/common.hpp>
#include "opencv2/core/cuda_devptrs.hpp"
#include "cuda_runtime_api.h"
#if defined __CUDACC__
# define __device_inline__ __device__ __forceinline__
@@ -57,6 +57,8 @@ using namespace cv::gpu::device;
namespace cv { namespace softcascade { namespace device {
typedef unsigned char uchar;
struct Octave
{
ushort index;