Skip to content

D
dlib
Commit 9697802e authored by Davis King's avatar Davis King
Browse files
Options

changed slightly to avoid warnings from visual studio. 

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%403292
parent 5402842c
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 8 deletions
dlib/test/matrix2.cpp
View file @ 9697802e
...@@ -513,8 +513,10 @@ namespace ...@@ -513,8 +513,10 @@ namespace
set_all_elements(bt1,2); set_all_elements(bt1,2);
set_all_elements(bt2,3); set_all_elements(bt2,3);
DLIB_TEST(trans(bt1)*bt2 == 18); float val = trans(bt1)*bt2;
DLIB_TEST(trans(bt1)*bt2 != 19); DLIB_TEST((float)(trans(bt1)*bt2) == 18);
DLIB_TEST((float)(trans(bt1)*bt2) != 19);
DLIB_TEST(val == 18);
} }
{ {
matrix<float,3,1> bt1; matrix<float,3,1> bt1;
...@@ -522,8 +524,10 @@ namespace ...@@ -522,8 +524,10 @@ namespace
set_all_elements(bt1,2); set_all_elements(bt1,2);
set_all_elements(bt2,3); set_all_elements(bt2,3);
DLIB_TEST(trans(bt1)*bt2 == 18); float val = trans(bt1)*bt2;
DLIB_TEST(trans(bt1)*bt2 != 19); DLIB_TEST((float)(trans(bt1)*bt2) == 18);
DLIB_TEST((float)(trans(bt1)*bt2) != 19);
DLIB_TEST(val == 18);
} }
{ {
matrix<float> bt1(3,1); matrix<float> bt1(3,1);
...@@ -531,8 +535,10 @@ namespace ...@@ -531,8 +535,10 @@ namespace
set_all_elements(bt1,2); set_all_elements(bt1,2);
set_all_elements(bt2,3); set_all_elements(bt2,3);
DLIB_TEST(trans(bt1)*bt2 == 18); float val = trans(bt1)*bt2;
DLIB_TEST(trans(bt1)*bt2 != 19); DLIB_TEST((float)(trans(bt1)*bt2) == 18);
DLIB_TEST((float)(trans(bt1)*bt2) != 19);
DLIB_TEST(val == 18);
} }
{ {
matrix<float,3,1> bt1; matrix<float,3,1> bt1;
...@@ -540,8 +546,10 @@ namespace ...@@ -540,8 +546,10 @@ namespace
set_all_elements(bt1,2); set_all_elements(bt1,2);
set_all_elements(bt2,3); set_all_elements(bt2,3);
DLIB_TEST(trans(bt1)*bt2 == 18); float val = trans(bt1)*bt2;
DLIB_TEST(trans(bt1)*bt2 != 19); DLIB_TEST((float)(trans(bt1)*bt2) == 18);
DLIB_TEST((float)(trans(bt1)*bt2) != 19);
DLIB_TEST(val == 18);
} }
......
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