added Filter Engine to gpu module.
disabled gpu::sum, gpu::minMax, gpu:Canny until fix crash.
This commit is contained in:
		| @@ -407,10 +407,12 @@ namespace cv | ||||
|  | ||||
|         //! computes sum of array elements | ||||
|         //! supports CV_8UC1, CV_8UC4 types | ||||
|         //! disabled until fix crash | ||||
|         CV_EXPORTS Scalar sum(const GpuMat& m); | ||||
|  | ||||
|         //! finds global minimum and maximum array elements and returns their values | ||||
|         //! supports only CV_8UC1 type | ||||
|         //! disabled until fix npp bug | ||||
|         CV_EXPORTS void minMax(const GpuMat& src, double* minVal, double* maxVal = 0); | ||||
|  | ||||
|         //! transforms 8-bit unsigned integers using lookup table: dst(i)=lut(src(i)) | ||||
| @@ -451,8 +453,10 @@ namespace cv | ||||
|         CV_EXPORTS void log(const GpuMat& a, GpuMat& b); | ||||
|  | ||||
|         //! computes magnitude (magnitude(i)) of each (x(i), y(i)) vector | ||||
|         //! supports only CV_32FC1 type | ||||
|         CV_EXPORTS void magnitude(const GpuMat& x, const GpuMat& y, GpuMat& magnitude); | ||||
|         //! computes magnitude (magnitude(i)) of complex (x(i).re, x(i).im) vector | ||||
|         //! supports only CV_32FC2 type | ||||
|         CV_EXPORTS void magnitude(const GpuMat& x, GpuMat& magnitude); | ||||
|  | ||||
|         ////////////////////////////// Image processing ////////////////////////////// | ||||
| @@ -517,34 +521,169 @@ namespace cv | ||||
|         //! supports only CV_32FC1 source type | ||||
|         CV_EXPORTS void integral(GpuMat& src, GpuMat& sum, GpuMat& sqsum); | ||||
|  | ||||
|         //! applies Canny edge detector and produces the edge map | ||||
|         //! supprots only CV_8UC1 source type | ||||
|         //! disabled until fix crash | ||||
|         CV_EXPORTS void Canny(const GpuMat& image, GpuMat& edges, double threshold1, double threshold2, int apertureSize = 3); | ||||
|  | ||||
|         //////////////////////////////// Filter Engine //////////////////////////////// | ||||
|  | ||||
|         /*! | ||||
|          The Base Class for 1D or Row-wise Filters | ||||
|           | ||||
|          This is the base class for linear or non-linear filters that process 1D data. | ||||
|          In particular, such filters are used for the "horizontal" filtering parts in separable filters. | ||||
|          */ | ||||
|         class CV_EXPORTS BaseRowFilter_GPU | ||||
|         { | ||||
|         public: | ||||
|             BaseRowFilter_GPU(int ksize_, int anchor_) : ksize(ksize_), anchor(anchor_) {} | ||||
|             virtual ~BaseRowFilter_GPU() {} | ||||
|             virtual void operator()(const GpuMat& src, GpuMat& dst) = 0; | ||||
|             int ksize, anchor; | ||||
|         }; | ||||
|  | ||||
|         /*! | ||||
|          The Base Class for Column-wise Filters | ||||
|           | ||||
|          This is the base class for linear or non-linear filters that process columns of 2D arrays. | ||||
|          Such filters are used for the "vertical" filtering parts in separable filters. | ||||
|          */  | ||||
|         class CV_EXPORTS BaseColumnFilter_GPU | ||||
|         { | ||||
|         public: | ||||
|             BaseColumnFilter_GPU(int ksize_, int anchor_) : ksize(ksize_), anchor(anchor_) {} | ||||
|             virtual ~BaseColumnFilter_GPU() {} | ||||
|             virtual void operator()(const GpuMat& src, GpuMat& dst) = 0; | ||||
|             int ksize, anchor; | ||||
|         }; | ||||
|  | ||||
|         /*! | ||||
|          The Base Class for Non-Separable 2D Filters. | ||||
|           | ||||
|          This is the base class for linear or non-linear 2D filters. | ||||
|          */  | ||||
|         class CV_EXPORTS BaseFilter_GPU | ||||
|         { | ||||
|         public: | ||||
|             BaseFilter_GPU(const Size& ksize_, const Point& anchor_) : ksize(ksize_), anchor(anchor_) {} | ||||
|             virtual ~BaseFilter_GPU() {} | ||||
|             virtual void operator()(const GpuMat& src, GpuMat& dst) = 0; | ||||
|             Size ksize; | ||||
|             Point anchor; | ||||
|         }; | ||||
|  | ||||
|         /*! | ||||
|          The Base Class for Filter Engine. | ||||
|           | ||||
|          The class can be used to apply an arbitrary filtering operation to an image. | ||||
|          It contains all the necessary intermediate buffers. | ||||
|         */ | ||||
|         class CV_EXPORTS FilterEngine_GPU | ||||
|         { | ||||
|         public: | ||||
|             virtual ~FilterEngine_GPU() {} | ||||
|  | ||||
|             virtual void apply(const GpuMat& src, GpuMat& dst, Rect roi = Rect(0,0,-1,-1)) = 0; | ||||
|         }; | ||||
|  | ||||
|         //! returns the non-separable filter engine with the specified filter | ||||
|         CV_EXPORTS Ptr<FilterEngine_GPU> createFilter2D_GPU(const Ptr<BaseFilter_GPU> filter2D); | ||||
|  | ||||
|         //! returns the separable filter engine with the specified filters | ||||
|         CV_EXPORTS Ptr<FilterEngine_GPU> createSeparableFilter_GPU(const Ptr<BaseRowFilter_GPU>& rowFilter,  | ||||
|             const Ptr<BaseColumnFilter_GPU>& columnFilter); | ||||
|  | ||||
|         //! returns horizontal 1D box filter | ||||
|         //! supports only CV_8UC1 source type and CV_32FC1 sum type | ||||
|         CV_EXPORTS Ptr<BaseRowFilter_GPU> getRowSumFilter_GPU(int srcType, int sumType, int ksize, int anchor = -1); | ||||
|  | ||||
|         //! returns vertical 1D box filter | ||||
|         //! supports only CV_8UC1 sum type and CV_32FC1 dst type | ||||
|         CV_EXPORTS Ptr<BaseColumnFilter_GPU> getColumnSumFilter_GPU(int sumType, int dstType, int ksize, int anchor = -1); | ||||
|  | ||||
|         //! returns 2D box filter | ||||
|         //! supports CV_8UC1 and CV_8UC4 source type, dst type must be the same as source type | ||||
|         CV_EXPORTS Ptr<BaseFilter_GPU> getBoxFilter_GPU(int srcType, int dstType, const Size& ksize, Point anchor = Point(-1, -1)); | ||||
|  | ||||
|         //! returns box filter engine | ||||
|         CV_EXPORTS Ptr<FilterEngine_GPU> createBoxFilter_GPU(int srcType, int dstType, const Size& ksize,  | ||||
|             const Point& anchor = Point(-1,-1)); | ||||
|  | ||||
|         //! returns 2D morphological filter | ||||
|         //! only MORPH_ERODE and MORPH_DILATE are supported | ||||
|         //! supports CV_8UC1 and CV_8UC4 types | ||||
|         //! kernel must have CV_8UC1 type, one rows and cols == ksize.width * ksize.height | ||||
|         CV_EXPORTS Ptr<BaseFilter_GPU> getMorphologyFilter_GPU(int op, int type, const GpuMat& kernel, const Size& ksize,  | ||||
|             Point anchor=Point(-1,-1)); | ||||
|  | ||||
|         //! returns morphological filter engine. Only MORPH_ERODE and MORPH_DILATE are supported. | ||||
|         CV_EXPORTS Ptr<FilterEngine_GPU> createMorphologyFilter_GPU(int op, int type, const Mat& kernel,  | ||||
|             const Point& anchor = Point(-1,-1), int iterations = 1); | ||||
|  | ||||
|         //! returns 2D filter with the specified kernel | ||||
|         //! supports CV_8UC1 and CV_8UC4 types | ||||
|         //! kernel must have CV_8UC1 type, one rows and cols == ksize.width * ksize.height | ||||
|         CV_EXPORTS Ptr<BaseFilter_GPU> getLinearFilter_GPU(int srcType, int dstType, const GpuMat& kernel, const Size& ksize,  | ||||
|             Point anchor = Point(-1, -1), int nDivisor = 1); | ||||
|  | ||||
|         //! returns the non-separable linear filter engine | ||||
|         CV_EXPORTS Ptr<FilterEngine_GPU> createLinearFilter_GPU(int srcType, int dstType, const Mat& kernel,  | ||||
|             const Point& anchor = Point(-1,-1)); | ||||
|  | ||||
|         //! returns the primitive row filter with the specified kernel | ||||
|         CV_EXPORTS Ptr<BaseRowFilter_GPU> getLinearRowFilter_GPU(int srcType, int bufType, const GpuMat& rowKernel,  | ||||
|             int anchor = -1, int nDivisor = 1); | ||||
|  | ||||
|         //! returns the primitive column filter with the specified kernel | ||||
|         CV_EXPORTS Ptr<BaseColumnFilter_GPU> getLinearColumnFilter_GPU(int bufType, int dstType, const GpuMat& columnKernel,  | ||||
|             int anchor = -1, int nDivisor = 1); | ||||
|  | ||||
|         //! returns the separable linear filter engine | ||||
|         CV_EXPORTS Ptr<FilterEngine_GPU> createSeparableLinearFilter_GPU(int srcType, int dstType, const Mat& rowKernel,  | ||||
|             const Mat& columnKernel, const Point& anchor = Point(-1,-1)); | ||||
|  | ||||
|         //! returns filter engine for the generalized Sobel operator | ||||
|         CV_EXPORTS Ptr<FilterEngine_GPU> createDerivFilter_GPU(int srcType, int dstType, int dx, int dy, int ksize); | ||||
|  | ||||
|         //! returns the Gaussian filter engine | ||||
|         CV_EXPORTS Ptr<FilterEngine_GPU> createGaussianFilter_GPU(int type, Size ksize, double sigma1, double sigma2 = 0); | ||||
|  | ||||
|         //! smooths the image using the normalized box filter | ||||
|         //! supports CV_8UC1, CV_8UC4 types and kernel size 3, 5, 7 | ||||
|         CV_EXPORTS void boxFilter(const GpuMat& src, GpuMat& dst, Size ksize, Point anchor = Point(-1,-1)); | ||||
|         //! supports CV_8UC1, CV_8UC4 types | ||||
|         CV_EXPORTS void boxFilter(const GpuMat& src, GpuMat& dst, int ddepth, Size ksize, Point anchor = Point(-1,-1)); | ||||
|  | ||||
|         //! a synonym for normalized box filter | ||||
|         static inline void blur(const GpuMat& src, GpuMat& dst, Size ksize, Point anchor = Point(-1,-1)) { boxFilter(src, dst, ksize, anchor); } | ||||
|  | ||||
|         static inline void blur(const GpuMat& src, GpuMat& dst, Size ksize, Point anchor = Point(-1,-1)) { boxFilter(src, dst, -1, ksize, anchor); } | ||||
|          | ||||
|         //! erodes the image (applies the local minimum operator) | ||||
|         CV_EXPORTS void erode( const GpuMat& src, GpuMat& dst, const Mat& kernel, Point anchor, int iterations); | ||||
|         CV_EXPORTS void erode( const GpuMat& src, GpuMat& dst, const Mat& kernel, Point anchor = Point(-1, -1), int iterations = 1); | ||||
|  | ||||
|         //! dilates the image (applies the local maximum operator) | ||||
|         CV_EXPORTS void dilate( const GpuMat& src, GpuMat& dst, const Mat& kernel, Point anchor, int iterations); | ||||
|         CV_EXPORTS void dilate( const GpuMat& src, GpuMat& dst, const Mat& kernel, Point anchor = Point(-1, -1), int iterations = 1); | ||||
|  | ||||
|         //! applies an advanced morphological operation to the image | ||||
|         CV_EXPORTS void morphologyEx( const GpuMat& src, GpuMat& dst, int op, const Mat& kernel, Point anchor, int iterations); | ||||
|         CV_EXPORTS void morphologyEx( const GpuMat& src, GpuMat& dst, int op, const Mat& kernel, Point anchor = Point(-1, -1), int iterations = 1); | ||||
|  | ||||
|         //! 1D mask Window Sum for 8 bit images | ||||
|         CV_EXPORTS void sumWindowColumn(const GpuMat& src, GpuMat& dst, int ksize, int anchor = -1); | ||||
|         CV_EXPORTS void sumWindowRow(const GpuMat& src, GpuMat& dst, int ksize, int anchor = -1); | ||||
|         //! applies non-separable 2D linear filter to the image | ||||
|         CV_EXPORTS void filter2D(const GpuMat& src, GpuMat& dst, int ddepth, const Mat& kernel, Point anchor=Point(-1,-1)); | ||||
|  | ||||
|         //! applies separable 2D linear filter to the image | ||||
|         CV_EXPORTS void sepFilter2D(const GpuMat& src, GpuMat& dst, int ddepth, const Mat& kernelX, const Mat& kernelY,  | ||||
|             Point anchor = Point(-1,-1)); | ||||
|  | ||||
|         //! applies generalized Sobel operator to the image | ||||
|         CV_EXPORTS void Sobel(const GpuMat& src, GpuMat& dst, int ddepth, int dx, int dy, int ksize = 3, double scale = 1); | ||||
|  | ||||
|         //! applies the vertical or horizontal Scharr operator to the image | ||||
|         CV_EXPORTS void Scharr(const GpuMat& src, GpuMat& dst, int ddepth, int dx, int dy, double scale = 1); | ||||
|          | ||||
|         //! smooths the image using Gaussian filter. | ||||
|         CV_EXPORTS void GaussianBlur(const GpuMat& src, GpuMat& dst, Size ksize, double sigma1, double sigma2 = 0); | ||||
|  | ||||
|         //! applies Canny edge detector and produces the edge map. | ||||
|         CV_EXPORTS void Canny(const GpuMat& image, GpuMat& edges, double threshold1, double threshold2, int apertureSize = 3); | ||||
|         //! applies Laplacian operator to the image | ||||
|         //! supports only ksize = 1 and ksize = 3 | ||||
|         CV_EXPORTS void Laplacian(const GpuMat& src, GpuMat& dst, int ddepth, int ksize = 1, double scale = 1); | ||||
|  | ||||
|         //////////////////////////////// Image Labeling //////////////////////////////// | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Vladislav Vinogradov
					Vladislav Vinogradov