Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove useless C headers #3870

Merged
merged 1 commit into from
Jan 15, 2025
+6 −14
Merged

Remove useless C headers #3870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion modules/cnn_3dobj/include/opencv2/cnn_3dobj.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion modules/cvv/src/qtutil/filter/sobelfilterwidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#include "sobelfilterwidget.hpp"

#include "opencv2/imgproc.hpp"
#include "opencv2/imgproc/types_c.h"

#include <QVBoxLayout>
#include <QLabel>
Expand Down
2 changes: 1 addition & 1 deletion modules/dpm/src/dpm_cascade.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion modules/dpm/src/dpm_feature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
1 change: 0 additions & 1 deletion modules/dpm/src/dpm_feature.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
#define __DPM_FEATURE__

#include "opencv2/core.hpp"
#include "opencv2/core/core_c.h"
#include "opencv2/imgproc.hpp"

#include <string>
Expand Down
1 change: 0 additions & 1 deletion modules/img_hash/src/precomp.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion modules/xfeatures2d/src/affine_feature2d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

#include "precomp.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/imgproc/types_c.h"

namespace {

Expand Down
1 change: 0 additions & 1 deletion modules/xphoto/samples/dct_image_denoising.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include "opencv2/highgui.hpp"

#include "opencv2/core/utility.hpp"
#include "opencv2/imgproc/types_c.h"

const char* keys =
{
Expand Down
10 changes: 4 additions & 6 deletions modules/xphoto/src/dct_image_denoising.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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() );
Expand Down