Merge pull request #25965 from mshabunin:cpp-imgproc-test-5.x

imgproc: C-API cleanup 5.x

modules/imgproc/src/drawing.cpp

@@ -2145,11 +2145,6 @@ void cv::polylines(InputOutputArray img, InputArrayOfArrays pts,
 }
 
 
-void
-cvDrawContours( void* _img, CvSeq* contour,
-                CvScalar _externalColor, CvScalar _holeColor,
-                int  maxLevel, int thickness,
-                int line_type, CvPoint _offset );
 
 void cv::drawContours( InputOutputArray _image, InputArrayOfArrays _contours,
                    int contourIdx, const Scalar& color, int thickness,
@@ -2248,128 +2243,3 @@ void cv::drawContours( InputOutputArray _image, InputArrayOfArrays _contours,
         fillPoly(image, contoursToFill, color, lineType, 0, offset);
     }
 }
-
-
-static const int CodeDeltas[8][2] =
-{ {1, 0}, {1, -1}, {0, -1}, {-1, -1}, {-1, 0}, {-1, 1}, {0, 1}, {1, 1} };
-
-void
-cvDrawContours( void* _img, CvSeq* contour,
-                CvScalar _externalColor, CvScalar _holeColor,
-                int  maxLevel, int thickness,
-                int line_type, CvPoint _offset )
-{
-    CvSeq *contour0 = contour, *h_next = 0;
-    CvTreeNodeIterator iterator;
-    std::vector<cv::PolyEdge> edges;
-    std::vector<cv::Point2l> pts;
-    cv::Scalar externalColor = _externalColor, holeColor = _holeColor;
-    cv::Mat img = cv::cvarrToMat(_img);
-    cv::Point offset = _offset;
-    double ext_buf[4], hole_buf[4];
-
-    if( line_type == cv::LINE_AA && img.depth() != CV_8U )
-        line_type = 8;
-
-    if( !contour )
-        return;
-
-    CV_Assert( thickness <= MAX_THICKNESS );
-
-    scalarToRawData( externalColor, ext_buf, img.type(), 0 );
-    scalarToRawData( holeColor, hole_buf, img.type(), 0 );
-
-    maxLevel = MAX(maxLevel, INT_MIN+2);
-    maxLevel = MIN(maxLevel, INT_MAX-1);
-
-    if( maxLevel < 0 )
-    {
-        h_next = contour->h_next;
-        contour->h_next = 0;
-        maxLevel = -maxLevel+1;
-    }
-
-    cvInitTreeNodeIterator( &iterator, contour, maxLevel );
-    while( (contour = (CvSeq*)cvNextTreeNode( &iterator )) != 0 )
-    {
-        CvSeqReader reader;
-        int i, count = contour->total;
-        int elem_type = CV_MAT_TYPE(contour->flags);
-        void* clr = (contour->flags & CV_SEQ_FLAG_HOLE) == 0 ? ext_buf : hole_buf;
-
-        cvStartReadSeq( contour, &reader, 0 );
-        CV_Assert(reader.ptr != NULL);
-        if( thickness < 0 )
-            pts.resize(0);
-
-        if( CV_IS_SEQ_CHAIN_CONTOUR( contour ))
-        {
-            cv::Point pt = ((CvChain*)contour)->origin;
-            cv::Point prev_pt = pt;
-            char prev_code = reader.ptr ? reader.ptr[0] : '\0';
-
-            prev_pt += offset;
-
-            for( i = 0; i < count; i++ )
-            {
-                char code;
-                CV_READ_SEQ_ELEM( code, reader );
-
-                CV_Assert( (code & ~7) == 0 );
-
-                if( code != prev_code )
-                {
-                    prev_code = code;
-                    if( thickness >= 0 )
-                        cv::ThickLine( img, prev_pt, pt, clr, thickness, line_type, 2, 0 );
-                    else
-                        pts.push_back(pt);
-                    prev_pt = pt;
-                }
-
-                pt.x += CodeDeltas[(int)code][0];
-                pt.y += CodeDeltas[(int)code][1];
-            }
-
-            if( thickness >= 0 )
-                cv::ThickLine( img, prev_pt,
-                    cv::Point(((CvChain*)contour)->origin) + offset,
-                    clr, thickness, line_type, 2, 0 );
-            else
-                cv::CollectPolyEdges(img, &pts[0], (int)pts.size(),
-                                     edges, ext_buf, line_type, 0, offset);
-        }
-        else if( CV_IS_SEQ_POLYLINE( contour ))
-        {
-            CV_Assert( elem_type == CV_32SC2 );
-            cv::Point pt1, pt2;
-            int shift = 0;
-
-            count -= !CV_IS_SEQ_CLOSED(contour);
-            { CvPoint pt_ = CV_STRUCT_INITIALIZER; CV_READ_SEQ_ELEM(pt_, reader); pt1 = pt_; }
-            pt1 += offset;
-            if( thickness < 0 )
-                pts.push_back(pt1);
-
-            for( i = 0; i < count; i++ )
-            {
-                { CvPoint pt_ = CV_STRUCT_INITIALIZER; CV_READ_SEQ_ELEM(pt_, reader); pt2 = pt_; }
-                pt2 += offset;
-                if( thickness >= 0 )
-                    cv::ThickLine( img, pt1, pt2, clr, thickness, line_type, 2, shift );
-                else
-                    pts.push_back(pt2);
-                pt1 = pt2;
-            }
-            if( thickness < 0 )
-                cv::CollectPolyEdges( img, &pts[0], (int)pts.size(),
-                                      edges, ext_buf, line_type, 0, cv::Point() );
-        }
-    }
-
-    if( thickness < 0 )
-        cv::FillEdgeCollection( img, edges, ext_buf, line_type);
-
-    if( h_next && contour0 )
-        contour0->h_next = h_next;
-}

modules/imgproc/src/histogram.cpp

@@ -45,8 +45,6 @@
 
 #include "opencv2/core/utils/tls.hpp"
 
-void cvSetHistBinRanges( CvHistogram* hist, float** ranges, int uniform );
-
 namespace cv
 {
 
@@ -2304,70 +2302,6 @@ double cv::compareHist( const SparseMat& H1, const SparseMat& H2, int method )
 }
 
 
-// Sets a value range for every histogram bin
-void cvSetHistBinRanges( CvHistogram* hist, float** ranges, int uniform )
-{
-    int dims, size[CV_MAX_DIM], total = 0;
-    int i, j;
-
-    if( !ranges )
-        CV_Error( cv::Error::StsNullPtr, "NULL ranges pointer" );
-
-    if( !CV_IS_HIST(hist) )
-        CV_Error( cv::Error::StsBadArg, "Invalid histogram header" );
-
-    dims = cvGetDims( hist->bins, size );
-    for( i = 0; i < dims; i++ )
-        total += size[i]+1;
-
-    if( uniform )
-    {
-        for( i = 0; i < dims; i++ )
-        {
-            if( !ranges[i] )
-                CV_Error( cv::Error::StsNullPtr, "One of <ranges> elements is NULL" );
-            hist->thresh[i][0] = ranges[i][0];
-            hist->thresh[i][1] = ranges[i][1];
-        }
-
-        hist->type |= CV_HIST_UNIFORM_FLAG + CV_HIST_RANGES_FLAG;
-    }
-    else
-    {
-        float* dim_ranges;
-
-        if( !hist->thresh2 )
-        {
-            hist->thresh2 = (float**)cvAlloc(
-                        dims*sizeof(hist->thresh2[0])+
-                        total*sizeof(hist->thresh2[0][0]));
-        }
-        dim_ranges = (float*)(hist->thresh2 + dims);
-
-        for( i = 0; i < dims; i++ )
-        {
-            float val0 = -FLT_MAX;
-
-            if( !ranges[i] )
-                CV_Error( cv::Error::StsNullPtr, "One of <ranges> elements is NULL" );
-
-            for( j = 0; j <= size[i]; j++ )
-            {
-                float val = ranges[i][j];
-                if( val <= val0 )
-                    CV_Error(cv::Error::StsOutOfRange, "Bin ranges should go in ascenting order");
-                val0 = dim_ranges[j] = val;
-            }
-
-            hist->thresh2[i] = dim_ranges;
-            dim_ranges += size[i] + 1;
-        }
-
-        hist->type |= CV_HIST_RANGES_FLAG;
-        hist->type &= ~CV_HIST_UNIFORM_FLAG;
-    }
-}
-
 
 class EqualizeHistCalcHist_Invoker : public cv::ParallelLoopBody
 {

modules/imgproc/src/precomp.hpp

@@ -103,8 +103,6 @@ static inline IppiInterpolationType ippiGetInterpolation(int inter)
 }
 #endif
 
-#include "opencv2/core/types_c.h"
-#include "opencv2/core/core_c.h"
 #include "filterengine.hpp"
 
 #include "opencv2/core/sse_utils.hpp"

modules/imgproc/test/test_color.cpp

@@ -40,7 +40,6 @@
 //M*/
 
 #include "test_precomp.hpp"
-#include "opencv2/core/core_c.h"
 
 namespace opencv_test { namespace {
 

modules/imgproc/test/test_pc.cpp

@@ -41,7 +41,6 @@
 //M*/
 
 #include "test_precomp.hpp"
-#include "opencv2/core/core_c.h"
 
 #define CV_DXT_MUL_CONJ 8