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

clean code; fix problems in documentation

Browse Source
This commit is contained in:
marina.kolpakova
2012-11-26 18:50:08 +04:00
parent bd3179bda8
commit 05cd88ae42
7 changed files with 9 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gpu/src/cuda/icf-sc.cu
View File

@@ -49,7 +49,7 @@
namespace cv { namespace gpu { namespace device {
namespace icf {
// ToDo: use textures or ancached load instruction.
// ToDo: use textures or uncached load instruction.
__global__ void magToHist(const uchar* __restrict__ mag,
const float* __restrict__ angle, const int angPitch,
uchar* __restrict__ hog, const int hogPitch, const int fh)

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

@@ -45,7 +45,6 @@
#define __OPENCV_ICF_HPP__
#include <opencv2/gpu/device/common.hpp>
#include <stdio.h>
#if defined __CUDACC__
# define __device __device__ __forceinline__
@@ -93,12 +92,7 @@ struct __align__(8) Node
enum { THRESHOLD_MASK = 0x0FFFFFFF };
Node(const uchar4 r, const uint ch, const uint t) : rect(r), threshold(t + (ch << 28))
{
// printf("%d\n", t);
// printf("[%d %d %d %d] %d, %d\n",rect.x, rect.y, rect.z, rect.w, (int)(threshold >> 28),
// (int)(0x0FFFFFFF & threshold));
}
Node(const uchar4 r, const uint ch, const uint t) : rect(r), threshold(t + (ch << 28)) {}
};
struct __align__(16) Detection

2
modules/gpu/src/softcascade.cpp
View File

@@ -142,7 +142,7 @@ struct cv::gpu::SCascade::Fields
static const char * const SC_F_RECT = "rect";
FileNode fn = root[SC_OCTAVES];
if (fn.empty()) return false;
if (fn.empty()) return false;
using namespace device::icf;