Skip to content

O
opencv
Commit 85700737 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #10895 from tomoaki0705:fixBuildVS2013sprintf

parents aa7a9641 6a661e1e
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
modules/core/test/test_io.cpp
View file @ 85700737
...@@ -1129,7 +1129,7 @@ TEST(Core_InputOutput, FileStorage_DMatch) ...@@ -1129,7 +1129,7 @@ TEST(Core_InputOutput, FileStorage_DMatch)
EXPECT_NO_THROW(fs << "d" << d); EXPECT_NO_THROW(fs << "d" << d);
cv::String fs_result = fs.releaseAndGetString(); cv::String fs_result = fs.releaseAndGetString();
#if defined _MSC_VER && _MSC_VER <= 1700 /* MSVC 2012 and older */ #if defined _MSC_VER && _MSC_VER <= 1800 /* MSVC 2013 and older */
EXPECT_STREQ(fs_result.c_str(), "%YAML:1.0\n---\nd: [ 1, 2, 3, -1.5000000000000000e+000 ]\n"); EXPECT_STREQ(fs_result.c_str(), "%YAML:1.0\n---\nd: [ 1, 2, 3, -1.5000000000000000e+000 ]\n");
#else #else
EXPECT_STREQ(fs_result.c_str(), "%YAML:1.0\n---\nd: [ 1, 2, 3, -1.5000000000000000e+00 ]\n"); EXPECT_STREQ(fs_result.c_str(), "%YAML:1.0\n---\nd: [ 1, 2, 3, -1.5000000000000000e+00 ]\n");
...@@ -1160,7 +1160,7 @@ TEST(Core_InputOutput, FileStorage_DMatch_vector) ...@@ -1160,7 +1160,7 @@ TEST(Core_InputOutput, FileStorage_DMatch_vector)
EXPECT_NO_THROW(fs << "dv" << dv); EXPECT_NO_THROW(fs << "dv" << dv);
cv::String fs_result = fs.releaseAndGetString(); cv::String fs_result = fs.releaseAndGetString();
#if defined _MSC_VER && _MSC_VER <= 1700 /* MSVC 2012 and older */ #if defined _MSC_VER && _MSC_VER <= 1800 /* MSVC 2013 and older */
EXPECT_STREQ(fs_result.c_str(), EXPECT_STREQ(fs_result.c_str(),
"%YAML:1.0\n" "%YAML:1.0\n"
"---\n" "---\n"
...@@ -1218,7 +1218,7 @@ TEST(Core_InputOutput, FileStorage_DMatch_vector_vector) ...@@ -1218,7 +1218,7 @@ TEST(Core_InputOutput, FileStorage_DMatch_vector_vector)
EXPECT_NO_THROW(fs << "dvv" << dvv); EXPECT_NO_THROW(fs << "dvv" << dvv);
cv::String fs_result = fs.releaseAndGetString(); cv::String fs_result = fs.releaseAndGetString();
#ifndef OPENCV_TRAITS_ENABLE_DEPRECATED #ifndef OPENCV_TRAITS_ENABLE_DEPRECATED
#if defined _MSC_VER && _MSC_VER <= 1700 /* MSVC 2012 and older */ #if defined _MSC_VER && _MSC_VER <= 1800 /* MSVC 2013 and older */
EXPECT_STREQ(fs_result.c_str(), EXPECT_STREQ(fs_result.c_str(),
"%YAML:1.0\n" "%YAML:1.0\n"
"---\n" "---\n"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment