Removed the header opencv2/photo/denoising.hpp
All the functions from it are moved to the header opencv2/photo/photo.hpp
This commit is contained in:
parent
4fb15ae1f0
commit
6a5d996ca8
@ -1,79 +0,0 @@
|
||||
/*M///////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
|
||||
//
|
||||
// By downloading, copying, installing or using the software you agree to this license.
|
||||
// If you do not agree to this license, do not download, install,
|
||||
// copy or use the software.
|
||||
//
|
||||
//
|
||||
// License Agreement
|
||||
// For Open Source Computer Vision Library
|
||||
//
|
||||
// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
|
||||
// Copyright (C) 2008-2012, Willow Garage Inc., all rights reserved.
|
||||
// Third party copyrights are property of their respective owners.
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without modification,
|
||||
// are permitted provided that the following conditions are met:
|
||||
//
|
||||
// * Redistribution's of source code must retain the above copyright notice,
|
||||
// this list of conditions and the following disclaimer.
|
||||
//
|
||||
// * Redistribution's in binary form must reproduce the above copyright notice,
|
||||
// this list of conditions and the following disclaimer in the documentation
|
||||
// and/or other materials provided with the distribution.
|
||||
//
|
||||
// * The name of the copyright holders may not be used to endorse or promote products
|
||||
// derived from this software without specific prior written permission.
|
||||
//
|
||||
// This software is provided by the copyright holders and contributors "as is" and
|
||||
// any express or implied warranties, including, but not limited to, the implied
|
||||
// warranties of merchantability and fitness for a particular purpose are disclaimed.
|
||||
// In no event shall the Intel Corporation or contributors be liable for any direct,
|
||||
// indirect, incidental, special, exemplary, or consequential damages
|
||||
// (including, but not limited to, procurement of substitute goods or services;
|
||||
// loss of use, data, or profits; or business interruption) however caused
|
||||
// and on any theory of liability, whether in contract, strict liability,
|
||||
// or tort (including negligence or otherwise) arising in any way out of
|
||||
// the use of this software, even if advised of the possibility of such damage.
|
||||
//
|
||||
//M*/
|
||||
|
||||
#ifndef __OPENCV_DENOISING_HPP__
|
||||
#define __OPENCV_DENOISING_HPP__
|
||||
|
||||
#include "opencv2/core/core.hpp"
|
||||
#include "opencv2/imgproc/imgproc.hpp"
|
||||
#include <vector>
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
/*! \namespace cv
|
||||
Namespace where all the C++ OpenCV functionality resides
|
||||
*/
|
||||
namespace cv
|
||||
{
|
||||
|
||||
CV_EXPORTS_W void fastNlMeansDenoising( InputArray src, OutputArray dst,
|
||||
int templateWindowSize, int searchWindowSize, int h);
|
||||
|
||||
CV_EXPORTS_W void fastNlMeansDenoisingColored( InputArray src, OutputArray dst,
|
||||
int templateWindowSize, int searchWindowSize,
|
||||
int h, int hForColorComponents);
|
||||
|
||||
CV_EXPORTS_W void fastNlMeansDenoisingMulti( InputArrayOfArrays srcImgs,
|
||||
int imgToDenoiseIndex, int temporalWindowSize,
|
||||
OutputArray dst,
|
||||
int templateWindowSize, int searchWindowSize, int h);
|
||||
|
||||
CV_EXPORTS_W void fastNlMeansDenoisingColoredMulti( InputArrayOfArrays srcImgs,
|
||||
int imgToDenoiseIndex, int temporalWindowSize,
|
||||
OutputArray dst,
|
||||
int templateWindowSize, int searchWindowSize,
|
||||
int h, int hForColorComponents);
|
||||
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
@ -47,7 +47,6 @@
|
||||
#include "opencv2/imgproc/imgproc.hpp"
|
||||
|
||||
#include "opencv2/photo/photo_c.h"
|
||||
#include "opencv2/photo/denoising.hpp"
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
@ -68,6 +67,25 @@ enum
|
||||
CV_EXPORTS_W void inpaint( InputArray src, InputArray inpaintMask,
|
||||
OutputArray dst, double inpaintRadius, int flags );
|
||||
|
||||
|
||||
CV_EXPORTS_W void fastNlMeansDenoising( InputArray src, OutputArray dst,
|
||||
int templateWindowSize, int searchWindowSize, int h);
|
||||
|
||||
CV_EXPORTS_W void fastNlMeansDenoisingColored( InputArray src, OutputArray dst,
|
||||
int templateWindowSize, int searchWindowSize,
|
||||
int h, int hForColorComponents);
|
||||
|
||||
CV_EXPORTS_W void fastNlMeansDenoisingMulti( InputArrayOfArrays srcImgs,
|
||||
int imgToDenoiseIndex, int temporalWindowSize,
|
||||
OutputArray dst,
|
||||
int templateWindowSize, int searchWindowSize, int h);
|
||||
|
||||
CV_EXPORTS_W void fastNlMeansDenoisingColoredMulti( InputArrayOfArrays srcImgs,
|
||||
int imgToDenoiseIndex, int temporalWindowSize,
|
||||
OutputArray dst,
|
||||
int templateWindowSize, int searchWindowSize,
|
||||
int h, int hForColorComponents);
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
|
@ -40,7 +40,7 @@
|
||||
//M*/
|
||||
|
||||
#include "precomp.hpp"
|
||||
#include "opencv2/photo/denoising.hpp"
|
||||
#include "opencv2/photo/photo.hpp"
|
||||
#include "opencv2/imgproc/imgproc.hpp"
|
||||
#include "fast_nlmeans_denoising_invoker.hpp"
|
||||
#include "fast_nlmeans_multi_denoising_invoker.hpp"
|
||||
|
@ -41,7 +41,7 @@
|
||||
//M*/
|
||||
|
||||
#include "test_precomp.hpp"
|
||||
#include "opencv2/photo/denoising.hpp"
|
||||
#include "opencv2/photo/photo.hpp"
|
||||
#include <string>
|
||||
|
||||
using namespace cv;
|
||||
|
Loading…
x
Reference in New Issue
Block a user