Fix bounds of checking if a radii are too long for a side.

tests/ScaleToSidesTest.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkScaleToSides.h"
 
 #include <cfloat>

[robertphillips, 2016/01/22 14:42:51]

Do we actually need all these new headers ?

[herb_g, 2016/01/22 16:01:05]

Done.

+#include <algorithm>
+#include <cstdint>
+#include <string>
 #include "Test.h"
 
+float BToF(uint8_t a, uint8_t b, uint8_t c, uint8_t d) {
+    uint8_t mem[4] = {a, b, c, d};
+    float val;
+    memcpy(&val, &mem, sizeof(mem));
+    //SkDebugf("BToF: %.12e\n", val);
+    return val;
+}
+
 DEF_TEST(ScaleToSides, reporter) {
-    float interestingValues[] = {
-        0.0f,
-        0.5f,
-        1.0f,
-        2.0f,
-        3.0f,
-        33.0f,
-        33554430.0f,
-        33554431.0f,
-        33554464.0f,
-        333333332.0f,
-        333333333.0f,
-        333333334.0f,
+    double interestingValues[] = {
+        // From skp bitbucket
+        111.60000228881836,
+        55.800003051757813,
+        0.99999996581812677920,
+        0.0,
+        0.5,
+        1.0,
+        2.0,
+        3.0,
+        33.0,
+        33554430.0,
+        33554431.0,
+        33554464.0,
+        333333332.0,
+        333333333.0,
+        333333334.0,
         FLT_MAX,
         FLT_EPSILON,
         FLT_MIN
     };
 
     int numInterestingValues = (int)SK_ARRAY_COUNT(interestingValues);
 
-    for (int i = 0; i < numInterestingValues; i++) {
-        for (int j = 0; j < numInterestingValues; j++) {
-            for (int k = 0; k < numInterestingValues; k++) {
-                float radius1 = interestingValues[i];
-                float radius2 = interestingValues[j];
-                float width = interestingValues[k];
-                if (width > 0.0f) {
-                    double scale = (double)width / ((double)radius1 + (double)radius2);
-                    if (scale < 1.0) {
-                        ScaleToSides::AdjustRadii(width, scale, &radius1, &radius2);
+    for (int s = 0; s <= numInterestingValues; s++) {
+        for (int i = 0; i < numInterestingValues; i++) {
+            for (int j = 0; j < numInterestingValues; j++) {
+                for (int k = 0; k < numInterestingValues; k++) {
+                    float radius1 = interestingValues[i];
+                    float radius2 = interestingValues[j];
+                    double width = interestingValues[k];
+                    double scale = width / ((double)radius1 + (double)radius2);
+                    if (width > 0.0) {
+                        if (s != 0) {
+                            scale = std::min(scale, (double)interestingValues[s-1]);
+                        }
+                        if (scale < 1.0 && scale > 0.0) {
+                            ScaleToSides::AdjustRadii(width, scale, &radius1, &radius2);
+                        }
                     }
                 }
             }
         }
     }
 }