Merge pull request opencv#10925 from pengli:dnn

Author: alalek

modules/dnn/src/layers/convolution_layer.cpp

@@ -1390,8 +1390,8 @@ class DeConvolutionLayerImpl : public BaseConvolutionLayerImpl
                 {
                     int total = outGroupCn * decnBlob.cols;
                     int index = 0;
-                    int height_col = (outH + 2 * pad.height - kernel.height) / stride.height + 1;
-                    int width_col = (outW + 2 * pad.width - kernel.width) / stride.width + 1;
+                    int height_col = inpH;
+                    int width_col = inpW;
                     int coeff_h = (1 - stride.height * kernel.width * height_col) * width_col;
                     int coeff_w = (1 - stride.width * height_col * width_col);
 

modules/dnn/test/test_tf_importer.cpp

@@ -181,6 +181,10 @@ TEST(Test_TensorFlow, deconvolution)
 OCL_TEST(Test_TensorFlow, deconvolution)
 {
     runTensorFlowNet("deconvolution", DNN_TARGET_OPENCL);
+    runTensorFlowNet("deconvolution_same", DNN_TARGET_OPENCL);
+    runTensorFlowNet("deconvolution_stride_2_same", DNN_TARGET_OPENCL);
+    runTensorFlowNet("deconvolution_adj_pad_valid", DNN_TARGET_OPENCL);
+    runTensorFlowNet("deconvolution_adj_pad_same", DNN_TARGET_OPENCL);
 }
 
 TEST(Test_TensorFlow, matmul)