Revert "call resetDevice if gpu test fails"

This reverts commit ab25fe9e.

modules/gpu/app/nv_perf_test/main.cpp

@@ -91,8 +91,6 @@ PERF_TEST_P(Image, HoughLinesP,
     cv::Mat image = cv::imread(fileName, cv::IMREAD_GRAYSCALE);
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_image(image);
         cv::gpu::GpuMat d_lines;
@@ -105,12 +103,6 @@ PERF_TEST_P(Image, HoughLinesP,
             cv::gpu::HoughLinesP(d_image, d_lines, d_buf, rho, theta, minLineLenght, maxLineGap);
         }
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::Mat mask;
@@ -162,8 +154,6 @@ PERF_TEST_P(Image_Depth, GoodFeaturesToTrack,
     mask(cv::Rect(0, 0, 100, 100)).setTo(cv::Scalar::all(0));
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GoodFeaturesToTrackDetector_GPU d_detector(maxCorners, qualityLevel, minDistance, blockSize, useHarrisDetector, k);
 
@@ -178,12 +168,6 @@ PERF_TEST_P(Image_Depth, GoodFeaturesToTrack,
             d_detector(d_src, d_pts, d_mask);
         }
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         if (depth != CV_8U)
@@ -259,8 +243,6 @@ PERF_TEST_P(ImagePair_Depth_GraySource, OpticalFlowPyrLKSparse,
     }
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_src1(src1);
         cv::gpu::GpuMat d_src2(src2);
@@ -281,12 +263,6 @@ PERF_TEST_P(ImagePair_Depth_GraySource, OpticalFlowPyrLKSparse,
             d_pyrLK.sparse(d_src1, d_src2, d_pts, d_nextPts, d_status);
         }
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         if (depth != CV_8U)
@@ -345,8 +321,6 @@ PERF_TEST_P(ImagePair_Depth, OpticalFlowFarneback,
     }
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_src1(src1);
         cv::gpu::GpuMat d_src2(src2);
@@ -369,12 +343,6 @@ PERF_TEST_P(ImagePair_Depth, OpticalFlowFarneback,
             d_farneback(d_src1, d_src2, d_u, d_v);
         }
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         if (depth != CV_8U)
@@ -440,8 +408,6 @@ PERF_TEST_P(ImagePair_BlockSize_ShiftSize_MaxRange, OpticalFlowBM,
         FAIL() << "Unable to load source image [" << fileNames.second << "]";
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_src1(src1);
         cv::gpu::GpuMat d_src2(src2);
@@ -454,12 +420,6 @@ PERF_TEST_P(ImagePair_BlockSize_ShiftSize_MaxRange, OpticalFlowBM,
             cv::gpu::calcOpticalFlowBM(d_src1, d_src2, block_size, shift_size, max_range, false, d_velx, d_vely, buf);
         }
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::Mat velx, vely;
@@ -499,8 +459,6 @@ PERF_TEST_P(ImagePair_BlockSize_ShiftSize_MaxRange, FastOpticalFlowBM,
         FAIL() << "Unable to load source image [" << fileNames.second << "]";
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_src1(src1);
         cv::gpu::GpuMat d_src2(src2);
@@ -515,12 +473,6 @@ PERF_TEST_P(ImagePair_BlockSize_ShiftSize_MaxRange, FastOpticalFlowBM,
             fastBM(d_src1, d_src2, d_velx, d_vely, max_range.width, block_size.width);
         }
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::Mat velx, vely;

modules/gpu/perf/perf_calib3d.cpp

@@ -25,8 +25,6 @@ PERF_TEST_P(ImagePair, Calib3D_StereoBM, Values(pair_string("gpu/perf/aloe.png",
     const int ndisp = 256;
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::StereoBM_GPU d_bm(preset, ndisp);
 
@@ -43,12 +41,6 @@ PERF_TEST_P(ImagePair, Calib3D_StereoBM, Values(pair_string("gpu/perf/aloe.png",
 
         GPU_SANITY_CHECK(d_dst);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::StereoBM bm(preset, ndisp);
@@ -82,8 +74,6 @@ PERF_TEST_P(ImagePair, Calib3D_StereoBeliefPropagation, Values(pair_string("gpu/
     const int ndisp = 64;
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::StereoBeliefPropagation d_bp(ndisp);
 
@@ -100,12 +90,6 @@ PERF_TEST_P(ImagePair, Calib3D_StereoBeliefPropagation, Values(pair_string("gpu/
 
         GPU_SANITY_CHECK(d_dst);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         FAIL() << "No such CPU implementation analogy.";
@@ -128,8 +112,6 @@ PERF_TEST_P(ImagePair, Calib3D_StereoConstantSpaceBP, Values(pair_string("gpu/st
     const int ndisp = 128;
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::StereoConstantSpaceBP d_csbp(ndisp);
 
@@ -146,12 +128,6 @@ PERF_TEST_P(ImagePair, Calib3D_StereoConstantSpaceBP, Values(pair_string("gpu/st
 
         GPU_SANITY_CHECK(d_dst);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         FAIL() << "No such CPU implementation analogy.";
@@ -172,8 +148,6 @@ PERF_TEST_P(ImagePair, Calib3D_DisparityBilateralFilter, Values(pair_string("gpu
     const int ndisp = 128;
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::DisparityBilateralFilter d_filter(ndisp);
 
@@ -190,12 +164,6 @@ PERF_TEST_P(ImagePair, Calib3D_DisparityBilateralFilter, Values(pair_string("gpu
 
         GPU_SANITY_CHECK(d_dst);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         FAIL() << "No such CPU implementation analogy.";
@@ -218,8 +186,6 @@ PERF_TEST_P(Count, Calib3D_TransformPoints, Values(5000, 10000, 20000))
     const cv::Mat tvec = cv::Mat::ones(1, 3, CV_32FC1);
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_src(src);
         cv::gpu::GpuMat d_dst;
@@ -233,12 +199,6 @@ PERF_TEST_P(Count, Calib3D_TransformPoints, Values(5000, 10000, 20000))
 
         GPU_SANITY_CHECK(d_dst);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         FAIL() << "No such CPU implementation analogy.";
@@ -260,8 +220,6 @@ PERF_TEST_P(Count, Calib3D_ProjectPoints, Values(5000, 10000, 20000))
     const cv::Mat camera_mat = cv::Mat::ones(3, 3, CV_32FC1);
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_src(src);
         cv::gpu::GpuMat d_dst;
@@ -275,12 +233,6 @@ PERF_TEST_P(Count, Calib3D_ProjectPoints, Values(5000, 10000, 20000))
 
         GPU_SANITY_CHECK(d_dst);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::Mat dst;
@@ -330,8 +282,6 @@ PERF_TEST_P(Count, Calib3D_SolvePnPRansac, Values(5000, 10000, 20000))
     cv::Mat tvec;
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::solvePnPRansac(object, image, camera_mat, dist_coef, rvec, tvec);
 
@@ -340,12 +290,6 @@ PERF_TEST_P(Count, Calib3D_SolvePnPRansac, Values(5000, 10000, 20000))
             cv::gpu::solvePnPRansac(object, image, camera_mat, dist_coef, rvec, tvec);
         }
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::solvePnPRansac(object, image, camera_mat, dist_coef, rvec, tvec);
@@ -375,8 +319,6 @@ PERF_TEST_P(Sz_Depth, Calib3D_ReprojectImageTo3D, Combine(GPU_TYPICAL_MAT_SIZES,
     fillRandom(Q, 0.1, 1.0);
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_src(src);
         cv::gpu::GpuMat d_dst;
@@ -390,12 +332,6 @@ PERF_TEST_P(Sz_Depth, Calib3D_ReprojectImageTo3D, Combine(GPU_TYPICAL_MAT_SIZES,
 
         GPU_SANITY_CHECK(d_dst);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::Mat dst;
@@ -423,8 +359,6 @@ PERF_TEST_P(Sz_Depth, Calib3D_DrawColorDisp, Combine(GPU_TYPICAL_MAT_SIZES, Valu
     fillRandom(src, 0, 255);
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_src(src);
         cv::gpu::GpuMat d_dst;
@@ -438,12 +372,6 @@ PERF_TEST_P(Sz_Depth, Calib3D_DrawColorDisp, Combine(GPU_TYPICAL_MAT_SIZES, Valu
 
         GPU_SANITY_CHECK(d_dst);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         FAIL() << "No such CPU implementation analogy.";

modules/gpu/perf/perf_denoising.cpp

@@ -31,8 +31,6 @@ PERF_TEST_P(Sz_Depth_Cn_KernelSz, Denoising_BilateralFilter,
     fillRandom(src);
 
      if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_src(src);
         cv::gpu::GpuMat d_dst;
@@ -46,12 +44,6 @@ PERF_TEST_P(Sz_Depth_Cn_KernelSz, Denoising_BilateralFilter,
 
         GPU_SANITY_CHECK(d_dst);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::Mat dst;
@@ -94,8 +86,6 @@ PERF_TEST_P(Sz_Depth_Cn_WinSz_BlockSz, Denoising_NonLocalMeans,
     fillRandom(src);
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_src(src);
         cv::gpu::GpuMat d_dst;
@@ -109,12 +99,6 @@ PERF_TEST_P(Sz_Depth_Cn_WinSz_BlockSz, Denoising_NonLocalMeans,
 
         GPU_SANITY_CHECK(d_dst);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         FAIL() << "No such CPU implementation analogy";
@@ -145,8 +129,6 @@ PERF_TEST_P(Sz_Depth_Cn_WinSz_BlockSz, Denoising_FastNonLocalMeans,
     fillRandom(src);
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_src(src);
         cv::gpu::GpuMat d_dst;
@@ -161,12 +143,6 @@ PERF_TEST_P(Sz_Depth_Cn_WinSz_BlockSz, Denoising_FastNonLocalMeans,
 
         GPU_SANITY_CHECK(d_dst);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::Mat dst;
@@ -204,8 +180,6 @@ PERF_TEST_P(Sz_Depth_WinSz_BlockSz, Denoising_FastNonLocalMeansColored,
     fillRandom(src);
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_src(src);
         cv::gpu::GpuMat d_dst;
@@ -220,12 +194,6 @@ PERF_TEST_P(Sz_Depth_WinSz_BlockSz, Denoising_FastNonLocalMeansColored,
 
         GPU_SANITY_CHECK(d_dst);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::Mat dst;

modules/gpu/perf/perf_features2d.cpp

@@ -18,8 +18,6 @@ PERF_TEST_P(Image, Features2D_SURF, Values<string>("gpu/perf/aloe.png"))
     ASSERT_FALSE(img.empty());
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::SURF_GPU d_surf;
 
@@ -36,12 +34,6 @@ PERF_TEST_P(Image, Features2D_SURF, Values<string>("gpu/perf/aloe.png"))
         GPU_SANITY_CHECK(d_descriptors, 1e-4);
         GPU_SANITY_CHECK_KEYPOINTS(SURF, d_keypoints);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::SURF surf;
@@ -71,8 +63,6 @@ PERF_TEST_P(Image, Features2D_FAST, Values<string>("gpu/perf/aloe.png"))
     ASSERT_FALSE(img.empty());
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::FAST_GPU d_fast(20);
 
@@ -88,12 +78,6 @@ PERF_TEST_P(Image, Features2D_FAST, Values<string>("gpu/perf/aloe.png"))
 
         GPU_SANITY_CHECK_RESPONSE(FAST, d_keypoints);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         std::vector<cv::KeyPoint> keypoints;
@@ -119,8 +103,6 @@ PERF_TEST_P(Image, Features2D_ORB, Values<string>("gpu/perf/aloe.png"))
     ASSERT_FALSE(img.empty());
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::ORB_GPU d_orb(4000);
 
@@ -137,12 +119,6 @@ PERF_TEST_P(Image, Features2D_ORB, Values<string>("gpu/perf/aloe.png"))
         GPU_SANITY_CHECK_KEYPOINTS(ORB, d_keypoints);
         GPU_SANITY_CHECK(d_descriptors);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::ORB orb(4000);
@@ -184,8 +160,6 @@ PERF_TEST_P(DescSize_Norm, Features2D_BFMatch, Combine(Values(64, 128, 256), Val
     fillRandom(train);
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::BFMatcher_GPU d_matcher(normType);
 
@@ -203,12 +177,6 @@ PERF_TEST_P(DescSize_Norm, Features2D_BFMatch, Combine(Values(64, 128, 256), Val
         GPU_SANITY_CHECK(d_trainIdx);
         GPU_SANITY_CHECK(d_distance);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::BFMatcher matcher(normType);
@@ -251,8 +219,6 @@ PERF_TEST_P(DescSize_K_Norm, Features2D_BFKnnMatch, Combine(
     fillRandom(train);
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::BFMatcher_GPU d_matcher(normType);
 
@@ -270,12 +236,6 @@ PERF_TEST_P(DescSize_K_Norm, Features2D_BFKnnMatch, Combine(
         GPU_SANITY_CHECK(d_trainIdx);
         GPU_SANITY_CHECK(d_distance);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::BFMatcher matcher(normType);
@@ -312,8 +272,6 @@ PERF_TEST_P(DescSize_Norm, Features2D_BFRadiusMatch, Combine(Values(64, 128, 256
     fillRandom(train, 0.0, 1.0);
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::BFMatcher_GPU d_matcher(normType);
 
@@ -331,12 +289,6 @@ PERF_TEST_P(DescSize_Norm, Features2D_BFRadiusMatch, Combine(Values(64, 128, 256
         GPU_SANITY_CHECK(d_trainIdx);
         GPU_SANITY_CHECK(d_distance);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::BFMatcher matcher(normType);

modules/gpu/perf/perf_filters.cpp

@@ -22,8 +22,6 @@ PERF_TEST_P(Sz_Type_KernelSz, Filters_Blur, Combine(GPU_TYPICAL_MAT_SIZES, Value
     fillRandom(src);
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_src(src);
         cv::gpu::GpuMat d_dst;
@@ -37,12 +35,6 @@ PERF_TEST_P(Sz_Type_KernelSz, Filters_Blur, Combine(GPU_TYPICAL_MAT_SIZES, Value
 
         GPU_SANITY_CHECK(d_dst);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::Mat dst;
@@ -73,8 +65,6 @@ PERF_TEST_P(Sz_Type_KernelSz, Filters_Sobel, Combine(GPU_TYPICAL_MAT_SIZES, Valu
     fillRandom(src);
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_src(src);
         cv::gpu::GpuMat d_dst;
@@ -89,12 +79,6 @@ PERF_TEST_P(Sz_Type_KernelSz, Filters_Sobel, Combine(GPU_TYPICAL_MAT_SIZES, Valu
 
         GPU_SANITY_CHECK(d_dst);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::Mat dst;
@@ -124,8 +108,6 @@ PERF_TEST_P(Sz_Type, Filters_Scharr, Combine(GPU_TYPICAL_MAT_SIZES, Values(CV_8U
     fillRandom(src);
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_src(src);
         cv::gpu::GpuMat d_dst;
@@ -140,12 +122,6 @@ PERF_TEST_P(Sz_Type, Filters_Scharr, Combine(GPU_TYPICAL_MAT_SIZES, Values(CV_8U
 
         GPU_SANITY_CHECK(d_dst);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::Mat dst;
@@ -176,8 +152,6 @@ PERF_TEST_P(Sz_Type_KernelSz, Filters_GaussianBlur, Combine(GPU_TYPICAL_MAT_SIZE
     fillRandom(src);
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_src(src);
         cv::gpu::GpuMat d_dst;
@@ -192,12 +166,6 @@ PERF_TEST_P(Sz_Type_KernelSz, Filters_GaussianBlur, Combine(GPU_TYPICAL_MAT_SIZE
 
         GPU_SANITY_CHECK(d_dst);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::Mat dst;
@@ -228,8 +196,6 @@ PERF_TEST_P(Sz_Type_KernelSz, Filters_Laplacian, Combine(GPU_TYPICAL_MAT_SIZES,
     fillRandom(src);
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_src(src);
         cv::gpu::GpuMat d_dst;
@@ -243,12 +209,6 @@ PERF_TEST_P(Sz_Type_KernelSz, Filters_Laplacian, Combine(GPU_TYPICAL_MAT_SIZES,
 
         GPU_SANITY_CHECK(d_dst);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::Mat dst;
@@ -280,8 +240,6 @@ PERF_TEST_P(Sz_Type, Filters_Erode, Combine(GPU_TYPICAL_MAT_SIZES, Values(CV_8UC
     cv::Mat ker = cv::getStructuringElement(cv::MORPH_RECT, cv::Size(3, 3));
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_src(src);
         cv::gpu::GpuMat d_dst;
@@ -296,12 +254,6 @@ PERF_TEST_P(Sz_Type, Filters_Erode, Combine(GPU_TYPICAL_MAT_SIZES, Values(CV_8UC
 
         GPU_SANITY_CHECK(d_dst);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::Mat dst;
@@ -333,8 +285,6 @@ PERF_TEST_P(Sz_Type, Filters_Dilate, Combine(GPU_TYPICAL_MAT_SIZES, Values(CV_8U
     cv::Mat ker = cv::getStructuringElement(cv::MORPH_RECT, cv::Size(3, 3));
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_src(src);
         cv::gpu::GpuMat d_dst;
@@ -349,12 +299,6 @@ PERF_TEST_P(Sz_Type, Filters_Dilate, Combine(GPU_TYPICAL_MAT_SIZES, Values(CV_8U
 
         GPU_SANITY_CHECK(d_dst);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::Mat dst;
@@ -392,8 +336,6 @@ PERF_TEST_P(Sz_Type_Op, Filters_MorphologyEx, Combine(GPU_TYPICAL_MAT_SIZES, Val
     cv::Mat ker = cv::getStructuringElement(cv::MORPH_RECT, cv::Size(3, 3));
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_src(src);
         cv::gpu::GpuMat d_dst;
@@ -409,12 +351,6 @@ PERF_TEST_P(Sz_Type_Op, Filters_MorphologyEx, Combine(GPU_TYPICAL_MAT_SIZES, Val
 
         GPU_SANITY_CHECK(d_dst);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::Mat dst;
@@ -448,8 +384,6 @@ PERF_TEST_P(Sz_Type_KernelSz, Filters_Filter2D, Combine(GPU_TYPICAL_MAT_SIZES, V
     fillRandom(kernel, 0.0, 1.0);
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_src(src);
         cv::gpu::GpuMat d_dst;
@@ -463,12 +397,6 @@ PERF_TEST_P(Sz_Type_KernelSz, Filters_Filter2D, Combine(GPU_TYPICAL_MAT_SIZES, V
 
         GPU_SANITY_CHECK(d_dst);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::Mat dst;

modules/gpu/perf/perf_labeling.cpp

@@ -107,8 +107,6 @@ PERF_TEST_P(Image, Labeling_ConnectedComponents, Values<string>("gpu/labeling/al
     cv::Mat image = readImage(GetParam(), cv::IMREAD_GRAYSCALE);
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat mask;
         mask.create(image.rows, image.cols, CV_8UC1);
@@ -127,12 +125,6 @@ PERF_TEST_P(Image, Labeling_ConnectedComponents, Values<string>("gpu/labeling/al
 
         GPU_SANITY_CHECK(components);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         GreedyLabeling host(image);

modules/gpu/perf/perf_matop.cpp

@@ -19,8 +19,6 @@ PERF_TEST_P(Sz_Depth_Cn, MatOp_SetTo, Combine(GPU_TYPICAL_MAT_SIZES, Values(CV_8
     cv::Scalar val(1, 2, 3, 4);
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_src(size, type);
 
@@ -33,12 +31,6 @@ PERF_TEST_P(Sz_Depth_Cn, MatOp_SetTo, Combine(GPU_TYPICAL_MAT_SIZES, Values(CV_8
 
         GPU_SANITY_CHECK(d_src);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::Mat src(size, type);
@@ -74,8 +66,6 @@ PERF_TEST_P(Sz_Depth_Cn, MatOp_SetToMasked, Combine(GPU_TYPICAL_MAT_SIZES, Value
     cv::Scalar val(1, 2, 3, 4);
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_src(src);
         cv::gpu::GpuMat d_mask(mask);
@@ -89,12 +79,6 @@ PERF_TEST_P(Sz_Depth_Cn, MatOp_SetToMasked, Combine(GPU_TYPICAL_MAT_SIZES, Value
 
         GPU_SANITY_CHECK(d_src);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         src.setTo(val, mask);
@@ -126,8 +110,6 @@ PERF_TEST_P(Sz_Depth_Cn, MatOp_CopyToMasked, Combine(GPU_TYPICAL_MAT_SIZES, Valu
     fillRandom(mask, 0, 2);
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_src(src);
         cv::gpu::GpuMat d_mask(mask);
@@ -142,12 +124,6 @@ PERF_TEST_P(Sz_Depth_Cn, MatOp_CopyToMasked, Combine(GPU_TYPICAL_MAT_SIZES, Valu
 
         GPU_SANITY_CHECK(d_dst);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::Mat dst;
@@ -178,8 +154,6 @@ PERF_TEST_P(Sz_2Depth, MatOp_ConvertTo, Combine(GPU_TYPICAL_MAT_SIZES, Values(CV
     fillRandom(src);
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_src(src);
         cv::gpu::GpuMat d_dst;
@@ -193,12 +167,6 @@ PERF_TEST_P(Sz_2Depth, MatOp_ConvertTo, Combine(GPU_TYPICAL_MAT_SIZES, Values(CV
 
         GPU_SANITY_CHECK(d_dst);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::Mat dst;

modules/gpu/perf/perf_objdetect.cpp

@@ -18,8 +18,6 @@ PERF_TEST_P(Image, ObjDetect_HOG, Values<string>("gpu/hog/road.png"))
     std::vector<cv::Rect> found_locations;
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_img(img);
 
@@ -33,12 +31,6 @@ PERF_TEST_P(Image, ObjDetect_HOG, Values<string>("gpu/hog/road.png"))
             d_hog.detectMultiScale(d_img, found_locations);
         }
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::HOGDescriptor hog;
@@ -68,8 +60,6 @@ PERF_TEST_P(HOG, CalTech, Values<string>("gpu/caltech/image_00000009_0.png", "gp
     std::vector<cv::Rect> found_locations;
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_img(img);
 
@@ -83,12 +73,6 @@ PERF_TEST_P(HOG, CalTech, Values<string>("gpu/caltech/image_00000009_0.png", "gp
             d_hog.detectMultiScale(d_img, found_locations);
         }
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::HOGDescriptor hog;
@@ -118,8 +102,6 @@ PERF_TEST_P(ImageAndCascade, ObjDetect_HaarClassifier,
     ASSERT_FALSE(img.empty());
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::CascadeClassifier_GPU d_cascade;
         ASSERT_TRUE(d_cascade.load(perf::TestBase::getDataPath(GetParam().second)));
@@ -136,12 +118,6 @@ PERF_TEST_P(ImageAndCascade, ObjDetect_HaarClassifier,
 
         GPU_SANITY_CHECK(d_objects_buffer);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::CascadeClassifier cascade;
@@ -170,8 +146,6 @@ PERF_TEST_P(ImageAndCascade, ObjDetect_LBPClassifier,
     ASSERT_FALSE(img.empty());
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::CascadeClassifier_GPU d_cascade;
         ASSERT_TRUE(d_cascade.load(perf::TestBase::getDataPath(GetParam().second)));
@@ -188,12 +162,6 @@ PERF_TEST_P(ImageAndCascade, ObjDetect_LBPClassifier,
 
         GPU_SANITY_CHECK(d_gpu_rects);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::CascadeClassifier cascade;

modules/gpu/perf/perf_softcascade.cpp

@@ -60,8 +60,6 @@ GPU_PERF_TEST_P(SCascadeTest, detect,
 
 RUN_GPU(SCascadeTest, detect)
 {
-    try
-    {
     cv::Mat cpu = readImage (GET_PARAM(1));
     ASSERT_FALSE(cpu.empty());
     cv::gpu::GpuMat colored(cpu);
@@ -84,12 +82,6 @@ RUN_GPU(SCascadeTest, detect)
     }
 
     SANITY_CHECK(sortDetections(objectBoxes));
-    }
-    catch (...)
-    {
-        cv::gpu::resetDevice();
-        throw;
-    }
 }
 
 NO_CPU(SCascadeTest, detect)
@@ -126,8 +118,6 @@ GPU_PERF_TEST_P(SCascadeTestRoi, detectInRoi,
 
 RUN_GPU(SCascadeTestRoi, detectInRoi)
 {
-    try
-    {
     cv::Mat cpu = readImage (GET_PARAM(1));
     ASSERT_FALSE(cpu.empty());
     cv::gpu::GpuMat colored(cpu);
@@ -159,12 +149,6 @@ RUN_GPU(SCascadeTestRoi, detectInRoi)
     }
 
     SANITY_CHECK(sortDetections(objectBoxes));
-    }
-    catch (...)
-    {
-        cv::gpu::resetDevice();
-        throw;
-    }
 }
 
 NO_CPU(SCascadeTestRoi, detectInRoi)
@@ -179,8 +163,6 @@ GPU_PERF_TEST_P(SCascadeTestRoi, detectEachRoi,
 
 RUN_GPU(SCascadeTestRoi, detectEachRoi)
 {
-    try
-    {
     cv::Mat cpu = readImage (GET_PARAM(1));
     ASSERT_FALSE(cpu.empty());
     cv::gpu::GpuMat colored(cpu);
@@ -208,12 +190,6 @@ RUN_GPU(SCascadeTestRoi, detectEachRoi)
     }
 
     SANITY_CHECK(sortDetections(objectBoxes));
-    }
-    catch (...)
-    {
-        cv::gpu::resetDevice();
-        throw;
-    }
 }
 
 NO_CPU(SCascadeTestRoi, detectEachRoi)
@@ -233,8 +209,6 @@ GPU_PERF_TEST_P(SCascadeTest, detectOnIntegral,
 
 RUN_GPU(SCascadeTest, detectOnIntegral)
 {
-    try
-    {
     cv::FileStorage fsi(perf::TestBase::getDataPath(GET_PARAM(1)), cv::FileStorage::READ);
     ASSERT_TRUE(fsi.isOpened());
 
@@ -265,12 +239,6 @@ RUN_GPU(SCascadeTest, detectOnIntegral)
     }
 
     SANITY_CHECK(sortDetections(objectBoxes));
-    }
-    catch (...)
-    {
-        cv::gpu::resetDevice();
-        throw;
-    }
 }
 
 NO_CPU(SCascadeTest, detectOnIntegral)
@@ -283,8 +251,6 @@ GPU_PERF_TEST_P(SCascadeTest, detectStream,
 
 RUN_GPU(SCascadeTest, detectStream)
 {
-    try
-    {
     cv::Mat cpu = readImage (GET_PARAM(1));
     ASSERT_FALSE(cpu.empty());
     cv::gpu::GpuMat colored(cpu);
@@ -308,17 +274,11 @@ RUN_GPU(SCascadeTest, detectStream)
         cascade.detect(colored, rois, objectBoxes, s);
     }
 
-    #ifdef HAVE_CUDA
+#ifdef HAVE_CUDA
     cudaDeviceSynchronize();
-    #endif
+#endif
 
     SANITY_CHECK(sortDetections(objectBoxes));
-    }
-    catch (...)
-    {
-        cv::gpu::resetDevice();
-        throw;
-    }
 }
 
 NO_CPU(SCascadeTest, detectStream)

modules/gpu/perf/perf_video.cpp

@@ -35,8 +35,6 @@ PERF_TEST_P(ImagePair, Video_BroxOpticalFlow,
     frame1.convertTo(frame1, CV_32FC1, 1.0 / 255.0);
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_frame0(frame0);
         cv::gpu::GpuMat d_frame1(frame1);
@@ -56,12 +54,6 @@ PERF_TEST_P(ImagePair, Video_BroxOpticalFlow,
         GPU_SANITY_CHECK(d_u);
         GPU_SANITY_CHECK(d_v);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         FAIL() << "No such CPU implementation analogy";
@@ -84,8 +76,6 @@ PERF_TEST_P(ImagePair, Video_InterpolateFrames,
     frame1.convertTo(frame1, CV_32FC1, 1.0 / 255.0);
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_frame0(frame0);
         cv::gpu::GpuMat d_frame1(frame1);
@@ -113,12 +103,6 @@ PERF_TEST_P(ImagePair, Video_InterpolateFrames,
         GPU_SANITY_CHECK(d_bu);
         GPU_SANITY_CHECK(d_bv);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         FAIL() << "No such CPU implementation analogy";
@@ -141,8 +125,6 @@ PERF_TEST_P(ImagePair, Video_CreateOpticalFlowNeedleMap,
     frame1.convertTo(frame1, CV_32FC1, 1.0 / 255.0);
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_frame0(frame0);
         cv::gpu::GpuMat d_frame1(frame1);
@@ -166,12 +148,6 @@ PERF_TEST_P(ImagePair, Video_CreateOpticalFlowNeedleMap,
         GPU_SANITY_CHECK(d_vertex);
         GPU_SANITY_CHECK(d_colors);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         FAIL() << "No such CPU implementation analogy";
@@ -193,8 +169,6 @@ PERF_TEST_P(Image_MinDistance, Video_GoodFeaturesToTrack,
     ASSERT_FALSE(image.empty());
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GoodFeaturesToTrackDetector_GPU d_detector(8000, 0.01, minDistance);
 
@@ -210,12 +184,6 @@ PERF_TEST_P(Image_MinDistance, Video_GoodFeaturesToTrack,
 
         GPU_SANITY_CHECK(d_pts);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::Mat pts;
@@ -269,8 +237,6 @@ PERF_TEST_P(ImagePair_Gray_NPts_WinSz_Levels_Iters, Video_PyrLKOpticalFlowSparse
     cv::goodFeaturesToTrack(gray_frame, pts, points, 0.01, 0.0);
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_pts(pts.reshape(2, 1));
 
@@ -293,12 +259,6 @@ PERF_TEST_P(ImagePair_Gray_NPts_WinSz_Levels_Iters, Video_PyrLKOpticalFlowSparse
 
         GPU_SANITY_CHECK(d_status);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::Mat nextPts;
@@ -344,8 +304,6 @@ PERF_TEST_P(ImagePair_WinSz_Levels_Iters, Video_PyrLKOpticalFlowDense, Combine(
     ASSERT_FALSE(frame1.empty());
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_frame0(frame0);
         cv::gpu::GpuMat d_frame1(frame1);
@@ -367,12 +325,6 @@ PERF_TEST_P(ImagePair_WinSz_Levels_Iters, Video_PyrLKOpticalFlowDense, Combine(
         GPU_SANITY_CHECK(d_u);
         GPU_SANITY_CHECK(d_v);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         FAIL() << "No such CPU implementation analogy";
@@ -402,8 +354,6 @@ PERF_TEST_P(ImagePair, Video_FarnebackOpticalFlow,
     int flags = 0;
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_frame0(frame0);
         cv::gpu::GpuMat d_frame1(frame1);
@@ -429,12 +379,6 @@ PERF_TEST_P(ImagePair, Video_FarnebackOpticalFlow,
         GPU_SANITY_CHECK(d_u);
         GPU_SANITY_CHECK(d_v);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::Mat flow;
@@ -465,8 +409,6 @@ PERF_TEST_P(ImagePair, Video_OpticalFlowDual_TVL1,
     ASSERT_FALSE(frame1.empty());
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_frame0(frame0);
         cv::gpu::GpuMat d_frame1(frame1);
@@ -485,12 +427,6 @@ PERF_TEST_P(ImagePair, Video_OpticalFlowDual_TVL1,
         GPU_SANITY_CHECK(d_flowx);
         GPU_SANITY_CHECK(d_flowy);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::Mat flow;
@@ -545,8 +481,6 @@ PERF_TEST_P(ImagePair, Video_OpticalFlowBM,
     cv::Size max_range(16, 16);
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_frame0(frame0);
         cv::gpu::GpuMat d_frame1(frame1);
@@ -562,12 +496,6 @@ PERF_TEST_P(ImagePair, Video_OpticalFlowBM,
         GPU_SANITY_CHECK(d_velx);
         GPU_SANITY_CHECK(d_vely);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::Mat velx, vely;
@@ -600,8 +528,6 @@ PERF_TEST_P(ImagePair, Video_FastOpticalFlowBM,
     cv::Size max_range(16, 16);
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_frame0(frame0);
         cv::gpu::GpuMat d_frame1(frame1);
@@ -619,12 +545,6 @@ PERF_TEST_P(ImagePair, Video_FastOpticalFlowBM,
         GPU_SANITY_CHECK(d_velx);
         GPU_SANITY_CHECK(d_vely);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::Mat velx, vely;
@@ -660,8 +580,6 @@ PERF_TEST_P(Video, DISABLED_Video_FGDStatModel, Values("gpu/video/768x576.avi",
     ASSERT_FALSE(frame.empty());
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_frame(frame);
 
@@ -680,12 +598,6 @@ PERF_TEST_P(Video, DISABLED_Video_FGDStatModel, Values("gpu/video/768x576.avi",
             stopTimer();
         }
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         IplImage ipl_frame = frame;
@@ -736,8 +648,6 @@ PERF_TEST_P(Video_Cn_LearningRate, DISABLED_Video_MOG,
     }
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_frame(frame);
         cv::gpu::MOG_GPU d_mog;
@@ -767,12 +677,6 @@ PERF_TEST_P(Video_Cn_LearningRate, DISABLED_Video_MOG,
             stopTimer();
         }
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::BackgroundSubtractorMOG mog;
@@ -832,8 +736,6 @@ PERF_TEST_P(Video_Cn, DISABLED_Video_MOG2,
     }
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_frame(frame);
         cv::gpu::MOG2_GPU d_mog2;
@@ -863,12 +765,6 @@ PERF_TEST_P(Video_Cn, DISABLED_Video_MOG2,
             stopTimer();
         }
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::BackgroundSubtractorMOG2 mog2;
@@ -913,8 +809,6 @@ PERF_TEST_P(Video_Cn, Video_MOG2GetBackgroundImage,
     cv::Mat frame;
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_frame;
         cv::gpu::MOG2_GPU d_mog2;
@@ -950,12 +844,6 @@ PERF_TEST_P(Video_Cn, Video_MOG2GetBackgroundImage,
 
         GPU_SANITY_CHECK(d_background);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::BackgroundSubtractorMOG2 mog2;
@@ -1018,8 +906,6 @@ PERF_TEST_P(Video_Cn, DISABLED_Video_VIBE,
     }
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_frame(frame);
         cv::gpu::VIBE_GPU d_vibe;
@@ -1049,12 +935,6 @@ PERF_TEST_P(Video_Cn, DISABLED_Video_VIBE,
             stopTimer();
         }
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         FAIL() << "No such CPU implementation analogy";
@@ -1091,8 +971,6 @@ PERF_TEST_P(Video_Cn_MaxFeatures, DISABLED_Video_GMG,
     }
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::GpuMat d_frame(frame);
         cv::gpu::GpuMat d_fgmask;
@@ -1129,12 +1007,6 @@ PERF_TEST_P(Video_Cn_MaxFeatures, DISABLED_Video_GMG,
             stopTimer();
         }
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::Mat fgmask;
@@ -1193,8 +1065,6 @@ PERF_TEST_P(Video, Video_VideoWriter, Values("gpu/video/768x576.avi", "gpu/video
     cv::Mat frame;
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::VideoWriter_GPU d_writer;
 
@@ -1215,12 +1085,6 @@ PERF_TEST_P(Video, Video_VideoWriter, Values("gpu/video/768x576.avi", "gpu/video
             stopTimer();
         }
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::VideoWriter writer;
@@ -1250,8 +1114,6 @@ PERF_TEST_P(Video, Video_VideoReader, Values("gpu/video/768x576.avi", "gpu/video
     string inputFile = perf::TestBase::getDataPath(GetParam());
 
     if (PERF_RUN_GPU())
-    {
-        try
     {
         cv::gpu::VideoReader_GPU d_reader(inputFile);
         ASSERT_TRUE( d_reader.isOpened() );
@@ -1267,12 +1129,6 @@ PERF_TEST_P(Video, Video_VideoReader, Values("gpu/video/768x576.avi", "gpu/video
 
         GPU_SANITY_CHECK(d_frame);
     }
-        catch (...)
-        {
-            cv::gpu::resetDevice();
-            throw;
-        }
-    }
     else
     {
         cv::VideoCapture reader(inputFile);

modules/gpu/test/nvidia/main_nvidia.cpp

@@ -276,8 +276,6 @@ static void devNullOutput(const std::string& msg)
     (void)msg;
 }
 
-}
-
 bool nvidia_NPPST_Integral_Image(const std::string& test_data_path, OutputLevel outputLevel)
 {
     path = test_data_path.c_str();
@@ -294,6 +292,8 @@ bool nvidia_NPPST_Integral_Image(const std::string& test_data_path, OutputLevel
     return testListerII.invoke();
 }
 
+}
+
 bool nvidia_NPPST_Squared_Integral_Image(const std::string& test_data_path, OutputLevel outputLevel)
 {
     path = test_data_path;

modules/gpu/test/test_calib3d.cpp

@@ -62,8 +62,6 @@ struct StereoBM : testing::TestWithParam<cv::gpu::DeviceInfo>
 
 TEST_P(StereoBM, Regression)
 {
-    try
-    {
     cv::Mat left_image  = readImage("stereobm/aloe-L.png", cv::IMREAD_GRAYSCALE);
     cv::Mat right_image = readImage("stereobm/aloe-R.png", cv::IMREAD_GRAYSCALE);
     cv::Mat disp_gold   = readImage("stereobm/aloe-disp.png", cv::IMREAD_GRAYSCALE);
@@ -78,12 +76,6 @@ TEST_P(StereoBM, Regression)
     bm(loadMat(left_image), loadMat(right_image), disp);
 
     EXPECT_MAT_NEAR(disp_gold, disp, 0.0);
-    }
-    catch (...)
-    {
-        cv::gpu::resetDevice();
-        throw;
-    }
 }
 
 INSTANTIATE_TEST_CASE_P(GPU_Calib3D, StereoBM, ALL_DEVICES);
@@ -105,8 +97,6 @@ struct StereoBeliefPropagation : testing::TestWithParam<cv::gpu::DeviceInfo>
 
 TEST_P(StereoBeliefPropagation, Regression)
 {
-    try
-    {
     cv::Mat left_image  = readImage("stereobp/aloe-L.png");
     cv::Mat right_image = readImage("stereobp/aloe-R.png");
     cv::Mat disp_gold   = readImage("stereobp/aloe-disp.png", cv::IMREAD_GRAYSCALE);
@@ -124,12 +114,6 @@ TEST_P(StereoBeliefPropagation, Regression)
     h_disp.convertTo(h_disp, disp_gold.depth());
 
     EXPECT_MAT_NEAR(disp_gold, h_disp, 0.0);
-    }
-    catch (...)
-    {
-        cv::gpu::resetDevice();
-        throw;
-    }
 }
 
 INSTANTIATE_TEST_CASE_P(GPU_Calib3D, StereoBeliefPropagation, ALL_DEVICES);
@@ -151,8 +135,6 @@ struct StereoConstantSpaceBP : testing::TestWithParam<cv::gpu::DeviceInfo>
 
 TEST_P(StereoConstantSpaceBP, Regression)
 {
-    try
-    {
     cv::Mat left_image  = readImage("csstereobp/aloe-L.png");
     cv::Mat right_image = readImage("csstereobp/aloe-R.png");
 
@@ -176,12 +158,6 @@ TEST_P(StereoConstantSpaceBP, Regression)
     h_disp.convertTo(h_disp, disp_gold.depth());
 
     EXPECT_MAT_NEAR(disp_gold, h_disp, 1.0);
-    }
-    catch (...)
-    {
-        cv::gpu::resetDevice();
-        throw;
-    }
 }
 
 INSTANTIATE_TEST_CASE_P(GPU_Calib3D, StereoConstantSpaceBP, ALL_DEVICES);
@@ -203,8 +179,6 @@ struct TransformPoints : testing::TestWithParam<cv::gpu::DeviceInfo>
 
 TEST_P(TransformPoints, Accuracy)
 {
-    try
-    {
     cv::Mat src = randomMat(cv::Size(1000, 1), CV_32FC3, 0, 10);
     cv::Mat rvec = randomMat(cv::Size(3, 1), CV_32F, 0, 1);
     cv::Mat tvec = randomMat(cv::Size(3, 1), CV_32F, 0, 1);
@@ -232,12 +206,6 @@ TEST_P(TransformPoints, Accuracy)
 
         ASSERT_POINT3_NEAR(res_gold, res, 1e-5);
     }
-    }
-    catch (...)
-    {
-        cv::gpu::resetDevice();
-        throw;
-    }
 }
 
 INSTANTIATE_TEST_CASE_P(GPU_Calib3D, TransformPoints, ALL_DEVICES);
@@ -259,8 +227,6 @@ struct ProjectPoints : testing::TestWithParam<cv::gpu::DeviceInfo>
 
 TEST_P(ProjectPoints, Accuracy)
 {
-    try
-    {
     cv::Mat src = randomMat(cv::Size(1000, 1), CV_32FC3, 0, 10);
     cv::Mat rvec = randomMat(cv::Size(3, 1), CV_32F, 0, 1);
     cv::Mat tvec = randomMat(cv::Size(3, 1), CV_32F, 0, 1);
@@ -290,12 +256,6 @@ TEST_P(ProjectPoints, Accuracy)
 
         ASSERT_LE(cv::norm(res_gold - res) / cv::norm(res_gold), 1e-3f);
     }
-    }
-    catch (...)
-    {
-        cv::gpu::resetDevice();
-        throw;
-    }
 }
 
 INSTANTIATE_TEST_CASE_P(GPU_Calib3D, ProjectPoints, ALL_DEVICES);
@@ -317,8 +277,6 @@ struct SolvePnPRansac : testing::TestWithParam<cv::gpu::DeviceInfo>
 
 TEST_P(SolvePnPRansac, Accuracy)
 {
-    try
-    {
     cv::Mat object = randomMat(cv::Size(5000, 1), CV_32FC3, 0, 100);
     cv::Mat camera_mat = randomMat(cv::Size(3, 3), CV_32F, 0.5, 1);
     camera_mat.at<float>(0, 1) = 0.f;
@@ -341,12 +299,6 @@ TEST_P(SolvePnPRansac, Accuracy)
 
     ASSERT_LE(cv::norm(rvec - rvec_gold), 1e-3);
     ASSERT_LE(cv::norm(tvec - tvec_gold), 1e-3);
-    }
-    catch (...)
-    {
-        cv::gpu::resetDevice();
-        throw;
-    }
 }
 
 INSTANTIATE_TEST_CASE_P(GPU_Calib3D, SolvePnPRansac, ALL_DEVICES);
@@ -374,8 +326,6 @@ PARAM_TEST_CASE(ReprojectImageTo3D, cv::gpu::DeviceInfo, cv::Size, MatDepth, Use
 
 TEST_P(ReprojectImageTo3D, Accuracy)
 {
-    try
-    {
     cv::Mat disp = randomMat(size, depth, 5.0, 30.0);
     cv::Mat Q = randomMat(cv::Size(4, 4), CV_32FC1, 0.1, 1.0);
 
@@ -386,12 +336,6 @@ TEST_P(ReprojectImageTo3D, Accuracy)
     cv::reprojectImageTo3D(disp, dst_gold, Q, false);
 
     EXPECT_MAT_NEAR(dst_gold, dst, 1e-5);
-    }
-    catch (...)
-    {
-        cv::gpu::resetDevice();
-        throw;
-    }
 }
 
 INSTANTIATE_TEST_CASE_P(GPU_Calib3D, ReprojectImageTo3D, testing::Combine(

modules/gpu/test/test_copy_make_border.cpp

@@ -71,8 +71,6 @@ PARAM_TEST_CASE(CopyMakeBorder, cv::gpu::DeviceInfo, cv::Size, MatType, Border,
 
 TEST_P(CopyMakeBorder, Accuracy)
 {
-    try
-    {
     cv::Mat src = randomMat(size, type);
     cv::Scalar val = randomScalar(0, 255);
 
@@ -83,12 +81,6 @@ TEST_P(CopyMakeBorder, Accuracy)
     cv::copyMakeBorder(src, dst_gold, border, border, border, border, borderType, val);
 
     EXPECT_MAT_NEAR(dst_gold, dst, 0.0);
-    }
-    catch (...)
-    {
-        cv::gpu::resetDevice();
-        throw;
-    }
 }
 
 INSTANTIATE_TEST_CASE_P(GPU_ImgProc, CopyMakeBorder, testing::Combine(

modules/gpu/test/test_global_motion.cpp

@@ -53,8 +53,6 @@ struct CompactPoints : testing::TestWithParam<gpu::DeviceInfo>
 
 TEST_P(CompactPoints, CanCompactizeSmallInput)
 {
-    try
-    {
     Mat src0(1, 3, CV_32FC2);
     src0.at<Point2f>(0,0) = Point2f(0,0);
     src0.at<Point2f>(0,1) = Point2f(0,1);
@@ -84,12 +82,6 @@ TEST_P(CompactPoints, CanCompactizeSmallInput)
 
     ASSERT_TRUE(src1.at<Point2f>(0,0) == Point2f(1,0));
     ASSERT_TRUE(src1.at<Point2f>(0,1) == Point2f(1,2));
-    }
-    catch (...)
-    {
-        cv::gpu::resetDevice();
-        throw;
-    }
 }
 
 INSTANTIATE_TEST_CASE_P(GPU_GlobalMotion, CompactPoints, ALL_DEVICES);