diff --git a/modules/dnn/src/tensorflow/tf_importer.cpp b/modules/dnn/src/tensorflow/tf_importer.cpp index bdab0663a7..a0fcffff2e 100644 --- a/modules/dnn/src/tensorflow/tf_importer.cpp +++ b/modules/dnn/src/tensorflow/tf_importer.cpp @@ -306,7 +306,7 @@ bool hasAllOnes(const Mat &inputs, int startPos, int endPos) for (int i = startPos; i < endPos; i++) { - if (inputs.at(i) != 1 || inputs.at(i)!= -1) + if (inputs.at(i) != 1 && inputs.at(i) != -1) return false; } return true; diff --git a/modules/dnn/test/test_tf_importer.cpp b/modules/dnn/test/test_tf_importer.cpp index 5e45a5c0f0..cbf2c60ccb 100644 --- a/modules/dnn/test/test_tf_importer.cpp +++ b/modules/dnn/test/test_tf_importer.cpp @@ -478,6 +478,11 @@ TEST_P(Test_TensorFlow_layers, reshape_nchw) runTensorFlowNet("reshape_nchw"); } +TEST_P(Test_TensorFlow_layers, reshape_conv) +{ + runTensorFlowNet("reshape_conv"); +} + TEST_P(Test_TensorFlow_layers, leaky_relu) { #if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_EQ(2018050000)