Remove useless C headers

The cvInvSqrt code replacement is taken from 5.x
pull/3870/head
Vincent Rabaud 4 months ago
parent 0e5254ebf5
commit 45c86643ef
  1. 1
      modules/cnn_3dobj/include/opencv2/cnn_3dobj.hpp
  2. 1
      modules/cvv/src/qtutil/filter/sobelfilterwidget.cpp
  3. 2
      modules/dpm/src/dpm_cascade.cpp
  4. 2
      modules/dpm/src/dpm_feature.cpp
  5. 1
      modules/dpm/src/dpm_feature.hpp
  6. 1
      modules/img_hash/src/precomp.hpp
  7. 1
      modules/xfeatures2d/src/affine_feature2d.cpp
  8. 1
      modules/xphoto/samples/dct_image_denoising.cpp
  9. 10
      modules/xphoto/src/dct_image_denoising.cpp

@ -66,7 +66,6 @@ the use of this software, even if advised of the possibility of such damage.
#include "opencv2/viz/vizcore.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/highgui/highgui_c.h"
#include "opencv2/imgproc.hpp"
/** @defgroup cnn_3dobj 3D object recognition and pose estimation API

@ -1,7 +1,6 @@
#include "sobelfilterwidget.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/imgproc/types_c.h"
#include <QVBoxLayout>
#include <QLabel>

@ -62,7 +62,7 @@ void DPMCascade::loadCascadeModel(const string &modelPath)
if (!is_success)
{
string errorMessage = format("Unable to parse the model: %s", modelPath.c_str());
CV_Error(CV_StsBadArg, errorMessage);
CV_Error(Error::StsBadArg, errorMessage);
}
model.initModel();

@ -81,7 +81,7 @@ void ParalComputePyramid::initialize()
if (params.maxScale < params.interval)
{
CV_Error(CV_StsBadArg, "The image is too small to create a pyramid");
CV_Error(Error::StsBadArg, "The image is too small to create a pyramid");
return;
}

@ -43,7 +43,6 @@
#define __DPM_FEATURE__
#include "opencv2/core.hpp"
#include "opencv2/core/core_c.h"
#include "opencv2/imgproc.hpp"
#include <string>

@ -8,7 +8,6 @@
#include "opencv2/core.hpp"
#include "opencv2/core/base.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/imgproc/types_c.h"
#include "opencv2/img_hash.hpp"
#include <bitset>

@ -8,7 +8,6 @@
#include "precomp.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/imgproc/types_c.h"
namespace {

@ -4,7 +4,6 @@
#include "opencv2/highgui.hpp"
#include "opencv2/core/utility.hpp"
#include "opencv2/imgproc/types_c.h"
const char* keys =
{

@ -47,10 +47,8 @@
#include "opencv2/imgproc.hpp"
#include "opencv2/core.hpp"
#include "opencv2/core/core_c.h"
#include "opencv2/core/types.hpp"
#include "opencv2/core/types_c.h"
namespace cv
{
@ -137,9 +135,9 @@ namespace xphoto
{
CV_Assert( src.type() == CV_MAKE_TYPE(CV_32F, 3) );
cv::Matx33f mt(cvInvSqrt(3.0f), cvInvSqrt(3.0f), cvInvSqrt(3.0f),
cvInvSqrt(2.0f), 0.0f, -cvInvSqrt(2.0f),
cvInvSqrt(6.0f), -2.0f*cvInvSqrt(6.0f), cvInvSqrt(6.0f));
cv::Matx33f mt(pow(3.0f, -0.5f), pow(3.0f, -0.5f), pow(3.0f, -0.5f),
pow(2.0f, -0.5f), 0.0f, -pow(2.0f, -0.5f),
pow(6.0f, -0.5f), -2.0f*pow(6.0f, -0.5f), pow(6.0f, -0.5f));
cv::transform(src, dst, mt);
@ -175,7 +173,7 @@ namespace xphoto
else if ( img.type() == CV_32FC1 )
grayDctDenoising( img, img, sigma, psize );
else
CV_Error_( CV_StsNotImplemented,
CV_Error_( Error::StsNotImplemented,
("Unsupported source image format (=%d)", img.type()) );
img.convertTo( dst, src.type() );

Loading…
Cancel
Save