always import file in the buffer ASIS so no text conversion on Windows

opencv · Nov 3, 2017 · 31b52e8 · 31b52e8
1 parent b30d625
commit 31b52e8
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/modules/dnn/test/test_tf_importer.cpp b/modules/dnn/test/test_tf_importer.cpp
@@ -69,12 +69,9 @@ TEST(Test_TensorFlow, inception_accuracy)
     normAssert(ref, out);
 }
 
-static bool readFileInMemory(const string& filename, string& content, bool isBinary)
+static bool readFileInMemory(const string& filename, string& content)
 {
-    std::ios::openmode mode = std::ios::in;
-    if (isBinary)
-        mode |= std::ios::binary;
-
+    std::ios::openmode mode = std::ios::in | std::ios::binary;
     std::ifstream ifs(filename.c_str(), mode);
     if (!ifs.is_open())
         return false;
@@ -110,11 +107,11 @@ static void runTensorFlowNet(const std::string& prefix, bool hasText = false,
     {
         // Load files into a memory buffers
         string dataModel;
-        ASSERT_TRUE(readFileInMemory(netPath, dataModel, true));
+        ASSERT_TRUE(readFileInMemory(netPath, dataModel));
 
         string dataConfig;
         if (hasText)
-            ASSERT_TRUE(readFileInMemory(netConfig, dataConfig, false));
+            ASSERT_TRUE(readFileInMemory(netConfig, dataConfig));
 
         net = readNetFromTensorflow(dataModel.c_str(), dataModel.size(),
                                     dataConfig.c_str(), dataConfig.size());