Fix: incorrect probe region bug (#211)

In correct precision results in incorrect probe region. It makes
tests/cases/clear_and_probe_small_wrong_color.expect_fail.amber not
fail.

2 files changed, 33 insertions, 43 deletions

diff --git a/src/verifier.cc b/src/verifier.cc
index 78021b5..963c2a3 100644
--- a/src/verifier.cc
+++ b/src/verifier.cc
@@ -189,10 +189,14 @@ Result Verifier::Probe(const ProbeCommand* command,
     width = frame_width;
     height = frame_height;
   } else if (command->IsRelative()) {
-    x = frame_width * static_cast<uint32_t>(command->GetX());
-    y = frame_height * static_cast<uint32_t>(command->GetY());
-    width = frame_width * static_cast<uint32_t>(command->GetWidth());
-    height = frame_height * static_cast<uint32_t>(command->GetHeight());
+    x = static_cast<uint32_t>(static_cast<float>(frame_width) *
+                              command->GetX());
+    y = static_cast<uint32_t>(static_cast<float>(frame_height) *
+                              command->GetY());
+    width = static_cast<uint32_t>(static_cast<float>(frame_width) *
+                                  command->GetWidth());
+    height = static_cast<uint32_t>(static_cast<float>(frame_height) *
+                                   command->GetHeight());
   } else {
     x = static_cast<uint32_t>(command->GetX());
     y = static_cast<uint32_t>(command->GetY());
diff --git a/src/verifier_test.cc b/src/verifier_test.cc
index 7e5a87b..2ae322f 100644
--- a/src/verifier_test.cc
+++ b/src/verifier_test.cc
@@ -36,13 +36,6 @@ TEST_F(VerifierTest, ProbeFrameBufferWholeWindow) {
   probe.SetB(0.2f);
   probe.SetA(0.8f);
 
-  EXPECT_TRUE(probe.IsWholeWindow());
-  EXPECT_TRUE(probe.IsRGBA());
-  EXPECT_FLOAT_EQ(0.5f, probe.GetR());
-  EXPECT_FLOAT_EQ(0.25f, probe.GetG());
-  EXPECT_FLOAT_EQ(0.2f, probe.GetB());
-  EXPECT_FLOAT_EQ(0.8f, probe.GetA());
-
   const uint8_t frame_buffer[3][3][4] = {
       {
           {128, 64, 51, 204},
@@ -80,18 +73,6 @@ TEST_F(VerifierTest, ProbeFrameBufferRelative) {
   probe.SetB(0.2f);
   probe.SetA(0.8f);
 
-  EXPECT_FALSE(probe.IsWholeWindow());
-  EXPECT_TRUE(probe.IsRelative());
-  EXPECT_TRUE(probe.IsRGBA());
-  EXPECT_FLOAT_EQ(0.1f, probe.GetX());
-  EXPECT_FLOAT_EQ(0.2f, probe.GetY());
-  EXPECT_FLOAT_EQ(0.4f, probe.GetWidth());
-  EXPECT_FLOAT_EQ(0.6f, probe.GetHeight());
-  EXPECT_FLOAT_EQ(0.5f, probe.GetR());
-  EXPECT_FLOAT_EQ(0.25f, probe.GetG());
-  EXPECT_FLOAT_EQ(0.2f, probe.GetB());
-  EXPECT_FLOAT_EQ(0.8f, probe.GetA());
-
   uint8_t frame_buffer[10][10][4] = {};
   for (uint8_t x = 1; x < 5; ++x) {
     for (uint8_t y = 2; y < 8; ++y) {
@@ -108,6 +89,31 @@ TEST_F(VerifierTest, ProbeFrameBufferRelative) {
   EXPECT_TRUE(r.IsSuccess());
 }
 
+TEST_F(VerifierTest, ProbeFrameBufferRelativeSmallExpectFail) {
+  ProbeCommand probe;
+  probe.SetRelative();
+  probe.SetIsRGBA();
+  probe.SetX(0.9f);
+  probe.SetY(0.9f);
+  probe.SetWidth(0.1f);
+  probe.SetHeight(0.1f);
+  probe.SetR(0.1f);
+  probe.SetG(0.0);
+  probe.SetB(0.0f);
+  probe.SetA(0.0f);
+
+  uint8_t frame_buffer[250][250][4] = {};
+
+  Verifier verifier;
+  Result r = verifier.Probe(&probe, 4, 1000, 250, 250,
+                            static_cast<const void*>(frame_buffer));
+  EXPECT_STREQ(
+      "Probe failed at: 225, 225\n  Expected RGBA: 25.500000, 0.000000, "
+      "0.000000, 0.000000\n  Actual RGBA: 0, 0, 0, 0\nProbe failed in 625 "
+      "pixels",
+      r.Error().c_str());
+}
+
 TEST_F(VerifierTest, ProbeFrameBuffer) {
   ProbeCommand probe;
   probe.SetIsRGBA();
@@ -120,18 +126,6 @@ TEST_F(VerifierTest, ProbeFrameBuffer) {
   probe.SetB(0.2f);
   probe.SetA(0.8f);
 
-  EXPECT_FALSE(probe.IsWholeWindow());
-  EXPECT_FALSE(probe.IsRelative());
-  EXPECT_TRUE(probe.IsRGBA());
-  EXPECT_FLOAT_EQ(1.0f, probe.GetX());
-  EXPECT_FLOAT_EQ(2.0f, probe.GetY());
-  EXPECT_FLOAT_EQ(4.0f, probe.GetWidth());
-  EXPECT_FLOAT_EQ(6.0f, probe.GetHeight());
-  EXPECT_FLOAT_EQ(0.5f, probe.GetR());
-  EXPECT_FLOAT_EQ(0.25f, probe.GetG());
-  EXPECT_FLOAT_EQ(0.2f, probe.GetB());
-  EXPECT_FLOAT_EQ(0.8f, probe.GetA());
-
   uint8_t frame_buffer[10][10][4] = {};
   for (uint8_t x = 1; x < 5; ++x) {
     for (uint8_t y = 2; y < 8; ++y) {
@@ -155,14 +149,6 @@ TEST_F(VerifierTest, ProbeFrameBufferRGB) {
   probe.SetG(0.25f);
   probe.SetB(0.2f);
 
-  EXPECT_TRUE(probe.IsWholeWindow());
-  EXPECT_FALSE(probe.IsRelative());
-  EXPECT_FALSE(probe.IsRGBA());
-  EXPECT_FLOAT_EQ(0.5f, probe.GetR());
-  EXPECT_FLOAT_EQ(0.25f, probe.GetG());
-  EXPECT_FLOAT_EQ(0.2f, probe.GetB());
-  EXPECT_FLOAT_EQ(0.0f, probe.GetA());
-
   const uint8_t frame_buffer[3][3][4] = {
       {
           {128, 64, 51, 255},