cv::convertMaps

modules/imgproc/src/pyramids.cpp

@@ -286,7 +286,7 @@ struct PyrDownVec_32s16s
             v_r00 = vaddq_s32(vaddq_s32(v_r00, v_r40), vaddq_s32(v_r20, v_r20));
             v_r10 = vaddq_s32(vaddq_s32(v_r10, v_r20), v_r30);
             v_r10 = vshlq_n_s32(v_r10, 2);
-            int32x4_t v_dst0 = vshrq_n_s32(vaddq_s32(vaddq_s32(v_r00, shifted), v_delta), 8);
+            int32x4_t v_dst0 = vshrq_n_s32(vaddq_s32(vaddq_s32(v_r00, v_r10), v_delta), 8);
 
             v_r01 = vaddq_s32(vaddq_s32(v_r01, v_r41), vaddq_s32(v_r21, v_r21));
             v_r11 = vaddq_s32(vaddq_s32(v_r11, v_r21), v_r31);

modules/imgproc/test/test_histograms.cpp

@@ -1100,7 +1100,7 @@ int CV_CompareHistTest::validate_test_results( int /*test_case_idx*/ )
             code = cvtest::TS::FAIL_INVALID_OUTPUT;
             break;
         }
-        else if( fabs(v0 - v) > FLT_EPSILON*10*MAX(fabs(v0),0.1) )
+        else if( fabs(v0 - v) > FLT_EPSILON*14*MAX(fabs(v0),0.1) )
         {
             ts->printf( cvtest::TS::LOG, "The comparison result using the method #%d (%s)\n\tis inaccurate (=%g, should be =%g)\n",
                 i, method_name, v, v0 );

modules/imgproc/test/test_imgwarp.cpp

@@ -1602,7 +1602,7 @@ TEST(Resize, Area_half)
     for (int i = 0, _size = sizeof(types) / sizeof(types[0]); i < _size; ++i)
     {
         int type = types[i], depth = CV_MAT_DEPTH(type), cn = CV_MAT_CN(type);
-        const float eps = depth <= CV_32S ? 0 : 5e-5;
+        const float eps = depth <= CV_32S ? 0 : 7e-5f;
 
         SCOPED_TRACE(depth);
         SCOPED_TRACE(cn);