Merge pull request #482 from vpisarev:c2cpp_imgproc_part2

modules/core/src/matrix.cpp

@@ -1969,6 +1969,11 @@ static TransposeInplaceFunc transposeInplaceTab[] =
 void cv::transpose( InputArray _src, OutputArray _dst )
 {
     Mat src = _src.getMat();
+    if( src.empty() )
+    {
+        _dst.release();
+        return;
+    }
     size_t esz = src.elemSize();
     CV_Assert( src.dims <= 2 && esz <= (size_t)32 );
 

modules/imgproc/perf/perf_houghLines.cpp

@@ -36,5 +36,6 @@ PERF_TEST_P(Image_RhoStep_ThetaStep_Threshold, HoughLines,
 
     TEST_CYCLE() HoughLines(image, lines, rhoStep, thetaStep, threshold);
 
+    transpose(lines, lines);
     SANITY_CHECK(lines);
 }

modules/imgproc/src/deriv.cpp

@@ -43,83 +43,6 @@
 #if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >= 7)
 static IppStatus sts = ippInit();
 #endif
-/****************************************************************************************/
-
-/* lightweight convolution with 3x3 kernel */
-void icvSepConvSmall3_32f( float* src, int src_step, float* dst, int dst_step,
-            CvSize src_size, const float* kx, const float* ky, float* buffer )
-{
-    int  dst_width, buffer_step = 0;
-    int  x, y;
-    bool fast_kx = true, fast_ky = true;
-
-    assert( src && dst && src_size.width > 2 && src_size.height > 2 &&
-            (src_step & 3) == 0 && (dst_step & 3) == 0 &&
-            (kx || ky) && (buffer || !kx || !ky));
-
-    src_step /= sizeof(src[0]);
-    dst_step /= sizeof(dst[0]);
-
-    dst_width = src_size.width - 2;
-
-    if( !kx )
-    {
-        /* set vars, so that vertical convolution
-           will write results into destination ROI and
-           horizontal convolution won't run */
-        src_size.width = dst_width;
-        buffer_step = dst_step;
-        buffer = dst;
-        dst_width = 0;
-    }
-    else
-        fast_kx = kx[1] == 0.f && kx[0] == -kx[2] && kx[0] == -1.f;
-
-    assert( src_step >= src_size.width && dst_step >= dst_width );
-
-    src_size.height -= 2;
-    if( !ky )
-    {
-        /* set vars, so that vertical convolution won't run and
-           horizontal convolution will write results into destination ROI */
-        src_size.height += 2;
-        buffer_step = src_step;
-        buffer = src;
-        src_size.width = 0;
-    }
-    else
-        fast_ky = ky[1] == 0.f && ky[0] == -ky[2] && ky[0] == -1.f;
-
-    for( y = 0; y < src_size.height; y++, src += src_step,
-                                          dst += dst_step,
-                                          buffer += buffer_step )
-    {
-        float* src2 = src + src_step;
-        float* src3 = src + src_step*2;
-        if( fast_ky )
-            for( x = 0; x < src_size.width; x++ )
-            {
-                buffer[x] = (float)(src3[x] - src[x]);
-            }
-        else
-            for( x = 0; x < src_size.width; x++ )
-            {
-                buffer[x] = (float)(ky[0]*src[x] + ky[1]*src2[x] + ky[2]*src3[x]);
-            }
-
-        if( fast_kx )
-            for( x = 0; x < dst_width; x++ )
-            {
-                dst[x] = (float)(buffer[x+2] - buffer[x]);
-            }
-        else
-            for( x = 0; x < dst_width; x++ )
-            {
-                dst[x] = (float)(kx[0]*buffer[x] + kx[1]*buffer[x+1] + kx[2]*buffer[x+2]);
-            }
-    }
-}
-
 
 /****************************************************************************************\
                              Sobel & Scharr Derivative Filters

modules/imgproc/src/imgwarp.cpp

@@ -2891,10 +2891,10 @@ class RemapInvoker :
 {
 public:
     RemapInvoker(const Mat& _src, Mat& _dst, const Mat *_m1,
-                 const Mat *_m2, int _interpolation, int _borderType, const Scalar &_borderValue,
+                 const Mat *_m2, int _borderType, const Scalar &_borderValue,
                  int _planar_input, RemapNNFunc _nnfunc, RemapFunc _ifunc, const void *_ctab) :
         ParallelLoopBody(), src(&_src), dst(&_dst), m1(_m1), m2(_m2),
-        interpolation(_interpolation), borderType(_borderType), borderValue(_borderValue),
+        borderType(_borderType), borderValue(_borderValue),
         planar_input(_planar_input), nnfunc(_nnfunc), ifunc(_ifunc), ctab(_ctab)
     {
     }
@@ -3077,7 +3077,7 @@ private:
     const Mat* src;
     Mat* dst;
     const Mat *m1, *m2;
-    int interpolation, borderType;
+    int borderType;
     Scalar borderValue;
     int planar_input;
     RemapNNFunc nnfunc;
@@ -3178,7 +3178,7 @@ void cv::remap( InputArray _src, OutputArray _dst,
         planar_input = map1.channels() == 1;
     }
 
-    RemapInvoker invoker(src, dst, m1, m2, interpolation,
+    RemapInvoker invoker(src, dst, m1, m2,
                          borderType, borderValue, planar_input, nnfunc, ifunc,
                          ctab);
     parallel_for_(Range(0, dst.rows), invoker, dst.total()/(double)(1<<16));

modules/imgproc/src/precomp.hpp

@@ -116,41 +116,12 @@ CvPyramid;
 #define  CV_SET( dst, val, len, idx )  \
     for( (idx) = 0; (idx) < (len); (idx)++) (dst)[idx] = (val)
 
-/* performs convolution of 2d floating-point array with 3x1, 1x3 or separable 3x3 mask */
-void icvSepConvSmall3_32f( float* src, int src_step, float* dst, int dst_step,
-            CvSize src_size, const float* kx, const float* ky, float* buffer );
-
 #undef   CV_CALC_MIN
 #define  CV_CALC_MIN(a, b) if((a) > (b)) (a) = (b)
 
 #undef   CV_CALC_MAX
 #define  CV_CALC_MAX(a, b) if((a) < (b)) (a) = (b)
 
-CvStatus CV_STDCALL
-icvCopyReplicateBorder_8u( const uchar* src, int srcstep, CvSize srcroi,
-                           uchar* dst, int dststep, CvSize dstroi,
-                           int left, int right, int cn, const uchar* value = 0 );
-
-CvStatus CV_STDCALL icvGetRectSubPix_8u_C1R
-( const uchar* src, int src_step, CvSize src_size,
-  uchar* dst, int dst_step, CvSize win_size, CvPoint2D32f center );
-CvStatus CV_STDCALL icvGetRectSubPix_8u32f_C1R
-( const uchar* src, int src_step, CvSize src_size,
-  float* dst, int dst_step, CvSize win_size, CvPoint2D32f center );
-CvStatus CV_STDCALL icvGetRectSubPix_32f_C1R
-( const float* src, int src_step, CvSize src_size,
-  float* dst, int dst_step, CvSize win_size, CvPoint2D32f center );
-
-CvStatus CV_STDCALL icvGetQuadrangleSubPix_8u_C1R
-( const uchar* src, int src_step, CvSize src_size,
-  uchar* dst, int dst_step, CvSize win_size, const float *matrix );
-CvStatus CV_STDCALL icvGetQuadrangleSubPix_8u32f_C1R
-( const uchar* src, int src_step, CvSize src_size,
-  float* dst, int dst_step, CvSize win_size, const float *matrix );
-CvStatus CV_STDCALL icvGetQuadrangleSubPix_32f_C1R
-( const float* src, int src_step, CvSize src_size,
-  float* dst, int dst_step, CvSize win_size, const float *matrix );
-
 #include "_geom.h"
 
 #endif /*__OPENCV_CV_INTERNAL_H_*/

modules/imgproc/src/thresh.cpp

@@ -699,7 +699,6 @@ public:
 private:
     Mat src;
     Mat dst;
-    int nStripes;
 
     double thresh;
     double maxval;

modules/imgproc/test/test_distancetransform.cpp

@@ -90,30 +90,20 @@ void CV_DisTransTest::get_test_array_types_and_sizes( int test_case_idx,
     if( cvtest::randInt(rng) & 1 )
     {
         mask_size = 3;
-        dist_type = cvtest::randInt(rng) % 4;
-        dist_type = dist_type == 0 ? CV_DIST_C : dist_type == 1 ? CV_DIST_L1 :
-                    dist_type == 2 ? CV_DIST_L2 : CV_DIST_USER;
     }
     else
     {
         mask_size = 5;
-        dist_type = cvtest::randInt(rng) % 10;
-        dist_type = dist_type == 0 ? CV_DIST_C : dist_type == 1 ? CV_DIST_L1 :
-                    dist_type < 6 ? CV_DIST_L2 : CV_DIST_USER;
     }
 
+    dist_type = cvtest::randInt(rng) % 3;
+    dist_type = dist_type == 0 ? CV_DIST_C : dist_type == 1 ? CV_DIST_L1 : CV_DIST_L2;
+
     // for now, check only the "labeled" distance transform mode
     fill_labels = 0;
 
     if( !fill_labels )
         sizes[OUTPUT][1] = sizes[REF_OUTPUT][1] = cvSize(0,0);
-
-    if( dist_type == CV_DIST_USER )
-    {
-        mask[0] = (float)(1.1 - cvtest::randReal(rng)*0.2);
-        mask[1] = (float)(1.9 - cvtest::randReal(rng)*0.8);
-        mask[2] = (float)(3. - cvtest::randReal(rng));
-    }
 }