@@ -1059,7 +1059,11 @@ TEST(Core_InputOutput, FileStorage_DMatch)
1059
1059
1060
1060
EXPECT_NO_THROW (fs << " d" << d);
1061
1061
cv::String fs_result = fs.releaseAndGetString ();
1062
+ #if defined _MSC_VER && _MSC_VER <= 1700 /* MSVC 2012 and older */
1063
+ EXPECT_STREQ (fs_result.c_str (), " %YAML:1.0\n ---\n d: [ 1, 2, 3, -1.5000000000000000e+000 ]\n " );
1064
+ #else
1062
1065
EXPECT_STREQ (fs_result.c_str (), " %YAML:1.0\n ---\n d: [ 1, 2, 3, -1.5000000000000000e+00 ]\n " );
1066
+ #endif
1063
1067
1064
1068
cv::FileStorage fs_read (fs_result, cv::FileStorage::READ | cv::FileStorage::MEMORY);
1065
1069
@@ -1086,12 +1090,21 @@ TEST(Core_InputOutput, FileStorage_DMatch_vector)
1086
1090
1087
1091
EXPECT_NO_THROW (fs << " dv" << dv);
1088
1092
cv::String fs_result = fs.releaseAndGetString ();
1093
+ #if defined _MSC_VER && _MSC_VER <= 1700 /* MSVC 2012 and older */
1094
+ EXPECT_STREQ (fs_result.c_str (),
1095
+ " %YAML:1.0\n "
1096
+ " ---\n "
1097
+ " dv: [ 1, 2, 3, -1.5000000000000000e+000, 2, 3, 4,\n "
1098
+ " 1.5000000000000000e+000, 3, 2, 1, 5.0000000000000000e-001 ]\n "
1099
+ );
1100
+ #else
1089
1101
EXPECT_STREQ (fs_result.c_str (),
1090
1102
" %YAML:1.0\n "
1091
1103
" ---\n "
1092
1104
" dv: [ 1, 2, 3, -1.5000000000000000e+00, 2, 3, 4, 1.5000000000000000e+00,\n "
1093
1105
" 3, 2, 1, 5.0000000000000000e-01 ]\n "
1094
1106
);
1107
+ #endif
1095
1108
1096
1109
cv::FileStorage fs_read (fs_result, cv::FileStorage::READ | cv::FileStorage::MEMORY);
1097
1110
@@ -1130,6 +1143,17 @@ TEST(Core_InputOutput, FileStorage_DMatch_vector_vector)
1130
1143
1131
1144
EXPECT_NO_THROW (fs << " dvv" << dvv);
1132
1145
cv::String fs_result = fs.releaseAndGetString ();
1146
+ #if defined _MSC_VER && _MSC_VER <= 1700 /* MSVC 2012 and older */
1147
+ EXPECT_STREQ (fs_result.c_str (),
1148
+ " %YAML:1.0\n "
1149
+ " ---\n "
1150
+ " dvv:\n "
1151
+ " - [ 1, 2, 3, -1.5000000000000000e+000, 2, 3, 4,\n "
1152
+ " 1.5000000000000000e+000, 3, 2, 1, 5.0000000000000000e-001 ]\n "
1153
+ " - [ 3, 2, 1, 5.0000000000000000e-001, 1, 2, 3,\n "
1154
+ " -1.5000000000000000e+000 ]\n "
1155
+ );
1156
+ #else
1133
1157
EXPECT_STREQ (fs_result.c_str (),
1134
1158
" %YAML:1.0\n "
1135
1159
" ---\n "
@@ -1138,6 +1162,7 @@ TEST(Core_InputOutput, FileStorage_DMatch_vector_vector)
1138
1162
" 3, 2, 1, 5.0000000000000000e-01 ]\n "
1139
1163
" - [ 3, 2, 1, 5.0000000000000000e-01, 1, 2, 3, -1.5000000000000000e+00 ]\n "
1140
1164
);
1165
+ #endif
1141
1166
1142
1167
cv::FileStorage fs_read (fs_result, cv::FileStorage::READ | cv::FileStorage::MEMORY);
1143
1168
0 commit comments