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

GPU module update: _GPU suffix removed, some namespaces renamed, minor refactorings.

Browse Source
This commit is contained in:
Kirill Kornyakov
2010-09-06 14:27:23 +00:00
parent a38e511188
commit 6960e1544d
15 changed files with 67 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/gpu/src/cuda/beliefpropagation.cu
View File

@@ -45,7 +45,6 @@
#include "safe_call.hpp"
using namespace cv::gpu;
using namespace cv::gpu::impl;
#ifndef FLT_MAX
#define FLT_MAX 3.402823466e+38F

1
modules/gpu/src/cuda/bilateral_filter.cu
View File

@@ -45,7 +45,6 @@
#include "safe_call.hpp"
using namespace cv::gpu;
using namespace cv::gpu::impl;
#ifndef FLT_MAX
#define FLT_MAX 3.402823466e+30F

7
modules/gpu/src/cuda/color.cu
View File

@@ -44,7 +44,6 @@
#include "saturate_cast.hpp"
using namespace cv::gpu;
using namespace cv::gpu::impl;
#ifndef CV_DESCALE
#define CV_DESCALE(x,n) (((x) + (1 << ((n)-1))) >> (n))
@@ -167,7 +166,7 @@ namespace imgproc
}
}
namespace cv { namespace gpu { namespace impl
namespace cv { namespace gpu { namespace improc
{
template <typename T>
void RGB2RGB_caller(const DevMem2D_<T>& src, int srccn, const DevMem2D_<T>& dst, int dstcn, int bidx, cudaStream_t stream)
@@ -377,7 +376,7 @@ namespace imgproc
//};
}
namespace cv { namespace gpu { namespace impl
namespace cv { namespace gpu { namespace improc
{
template <typename T>
void Gray2RGB_caller(const DevMem2D_<T>& src, const DevMem2D_<T>& dst, int dstcn, cudaStream_t stream)
@@ -627,7 +626,7 @@ namespace imgproc
}
}
namespace cv { namespace gpu { namespace impl
namespace cv { namespace gpu { namespace improc
{
void RGB2Gray_gpu(const DevMem2D& src, int srccn, const DevMem2D& dst, int bidx, cudaStream_t stream)
{

1
modules/gpu/src/cuda/constantspacebp.cu
View File

@@ -45,7 +45,6 @@
#include "safe_call.hpp"
using namespace cv::gpu;
using namespace cv::gpu::impl;
#ifndef FLT_MAX
#define FLT_MAX 3.402823466e+30F

6
modules/gpu/src/cuda/cuda_shared.hpp
View File

@@ -56,10 +56,10 @@ namespace cv
typedef unsigned short ushort;
typedef unsigned int uint;
namespace impl
{
static inline int divUp(int a, int b) { return (a % b == 0) ? a/b : a/b + 1; }
static inline int divUp(int a, int b) { return (a % b == 0) ? a/b : a/b + 1; }
namespace matrix_operations
{
extern "C" void copy_to_with_mask(const DevMem2D& src, DevMem2D dst, int depth, const DevMem2D& mask, int channels, const cudaStream_t & stream = 0);
extern "C" void set_to_without_mask (DevMem2D dst, int depth, const double *scalar, int channels, const cudaStream_t & stream = 0);

8
modules/gpu/src/cuda/imgproc.cu
View File

@@ -123,7 +123,7 @@ namespace imgproc
}
}
namespace cv { namespace gpu { namespace impl
namespace cv { namespace gpu { namespace improc
{
void remap_gpu_1c(const DevMem2D& src, const DevMem2Df& xmap, const DevMem2Df& ymap, DevMem2D dst)
{
@@ -231,7 +231,7 @@ namespace imgproc
}
}
namespace cv { namespace gpu { namespace impl
namespace cv { namespace gpu { namespace improc
{
extern "C" void meanShiftFiltering_gpu(const DevMem2D& src, DevMem2D dst, int sp, int sr, int maxIter, float eps)
{
@@ -354,7 +354,7 @@ namespace imgproc
}
}
namespace cv { namespace gpu { namespace impl
namespace cv { namespace gpu { namespace improc
{
void drawColorDisp_gpu(const DevMem2D& src, const DevMem2D& dst, int ndisp, const cudaStream_t& stream)
{
@@ -420,7 +420,7 @@ namespace imgproc
}
}
namespace cv { namespace gpu { namespace impl
namespace cv { namespace gpu { namespace improc
{
template <typename T>
inline void reprojectImageTo3D_caller(const DevMem2D_<T>& disp, const DevMem2Df& xyzw, const float* q, const cudaStream_t& stream)

4
modules/gpu/src/cuda/matrix_operations.cu
View File

@@ -47,7 +47,7 @@
#include "saturate_cast.hpp"
using namespace cv::gpu;
using namespace cv::gpu::impl;
using namespace cv::gpu::matrix_operations;
namespace mat_operators
@@ -261,7 +261,7 @@ namespace cv
{
namespace gpu
{
namespace impl
namespace matrix_operations
{
///////////////////////////////////////////////////////////////////////////

6
modules/gpu/src/cuda/stereobm.cu
View File

@@ -316,7 +316,7 @@ __global__ void stereoKernel(unsigned char *left, unsigned char *right, size_t i
}
namespace cv { namespace gpu { namespace impl
namespace cv { namespace gpu { namespace bm
{
template<int RADIUS> void kernel_caller(const DevMem2D& left, const DevMem2D& right, const DevMem2D& disp, int maxdisp, const cudaStream_t & stream)
{
@@ -408,7 +408,7 @@ extern "C" __global__ void prefilter_kernel(unsigned char *output, size_t step,
}
namespace cv { namespace gpu { namespace impl
namespace cv { namespace gpu { namespace bm
{
extern "C" void prefilter_xsobel(const DevMem2D& input, const DevMem2D& output, int prefilterCap)
{
@@ -530,7 +530,7 @@ extern "C" __global__ void textureness_kernel(unsigned char *disp, size_t disp_s
}
}
namespace cv { namespace gpu { namespace impl
namespace cv { namespace gpu { namespace bm
{
extern "C" void postfilter_textureness(const DevMem2D& input, int winsz, float avgTexturenessThreshold, const DevMem2D& disp)
{