зеркало из https://github.com/mozilla/moz-skia.git
Fix compiler warning/error in r10079
git-svn-id: http://skia.googlecode.com/svn/trunk@10081 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
Родитель
736dd031f1
Коммит
8dcea7dcf9
|
@ -163,38 +163,38 @@ static const SkDCubic testSet[] = {
|
|||
const size_t testSetCount = SK_ARRAY_COUNT(testSet);
|
||||
|
||||
static const SkDCubic newTestSet[] = {
|
||||
{{{1.0516976506771041, 2.9684399028541346 },
|
||||
{1.0604363140895228, 2.9633503074444141 },
|
||||
{1.0692548215065762, 2.9580354426587459 },
|
||||
{1.0781560339512140, 2.9525043684031349 }}},
|
||||
|
||||
{{{1.0523038101345104, 2.9523755204833737 },
|
||||
{1.0607035288264237, 2.9580853881628375 },
|
||||
{1.0690530472271964, 2.9633896794787749 },
|
||||
{1.0773566568712512, 2.9682969775000219 }}},
|
||||
{{{1.0516976506771041, 2.9684399028541346 },
|
||||
{1.0604363140895228, 2.9633503074444141 },
|
||||
{1.0692548215065762, 2.9580354426587459 },
|
||||
{1.0781560339512140, 2.9525043684031349 }}},
|
||||
|
||||
{{{1.0386522625066592, 2.9759024812329078 },
|
||||
{1.0559713690392631, 2.9661782500838885 },
|
||||
{1.0736041309019990, 2.9555348259177858 },
|
||||
{1.0915734362784633, 2.9440446879826569 }}},
|
||||
|
||||
{{{1.0396670794879301, 2.9435062123457261 },
|
||||
{1.0565690546812769, 2.9557413250983462 },
|
||||
{1.0732616463413533, 2.9663369676594282 },
|
||||
{1.0897791867435489, 2.9753618045797472 }}},
|
||||
{{{1.0523038101345104, 2.9523755204833737 },
|
||||
{1.0607035288264237, 2.9580853881628375 },
|
||||
{1.0690530472271964, 2.9633896794787749 },
|
||||
{1.0773566568712512, 2.9682969775000219 }}},
|
||||
|
||||
{{{0.8685656183311091, 3.0409266475785208 },
|
||||
{0.99189542936395292, 3.0212163698184424 },
|
||||
{1.1302108367493320, 2.9265646471747306 },
|
||||
{1.2952305904872474, 2.7940808546473788 }}},
|
||||
|
||||
{{{0.85437872843682727, 2.7536036928549055 },
|
||||
{1.0045584590592620, 2.9493041024831705 },
|
||||
{1.1336998329885613, 3.0248027987251747 },
|
||||
{1.2593809752247314, 3.0152560315809107 }}},
|
||||
{{{1.0386522625066592, 2.9759024812329078 },
|
||||
{1.0559713690392631, 2.9661782500838885 },
|
||||
{1.0736041309019990, 2.9555348259177858 },
|
||||
{1.0915734362784633, 2.9440446879826569 }}},
|
||||
|
||||
{{{0, 1}, {1, 6}, {1, 0}, {6, 2}}},
|
||||
{{{0, 1}, {2, 6}, {1, 0}, {6, 1}}},
|
||||
{{{1.0396670794879301, 2.9435062123457261 },
|
||||
{1.0565690546812769, 2.9557413250983462 },
|
||||
{1.0732616463413533, 2.9663369676594282 },
|
||||
{1.0897791867435489, 2.9753618045797472 }}},
|
||||
|
||||
{{{0.8685656183311091, 3.0409266475785208 },
|
||||
{0.99189542936395292, 3.0212163698184424 },
|
||||
{1.1302108367493320, 2.9265646471747306 },
|
||||
{1.2952305904872474, 2.7940808546473788 }}},
|
||||
|
||||
{{{0.85437872843682727, 2.7536036928549055 },
|
||||
{1.0045584590592620, 2.9493041024831705 },
|
||||
{1.1336998329885613, 3.0248027987251747 },
|
||||
{1.2593809752247314, 3.0152560315809107 }}},
|
||||
|
||||
{{{0, 1}, {1, 6}, {1, 0}, {6, 2}}},
|
||||
{{{0, 1}, {2, 6}, {1, 0}, {6, 1}}},
|
||||
|
||||
{{{134,11414}, {131.990234375,11414}, {130.32666015625,11415.482421875}, {130.04275512695312,11417.4130859375}}},
|
||||
{{{132,11419}, {130.89543151855469,11419}, {130,11418.1044921875}, {130,11417}}},
|
||||
|
@ -306,8 +306,8 @@ static void oneOff(skiatest::Reporter* reporter, const SkDCubic& cubic1, const S
|
|||
xy1 = cubic1.xyAtT(tt1);
|
||||
tt2 = intersections[1][pt3];
|
||||
xy2 = cubic2.xyAtT(tt2);
|
||||
const SkDPoint& iPt = intersections.pt(pt3);
|
||||
#if ONE_OFF_DEBUG
|
||||
DEBUGCODE(const SkDPoint& iPt = intersections.pt(pt3);)
|
||||
SkDebugf("%s t1=%1.9g (%1.9g, %1.9g) (%1.9g, %1.9g) (%1.9g, %1.9g) t2=%1.9g\n",
|
||||
__FUNCTION__, tt1, xy1.fX, xy1.fY, iPt.fX,
|
||||
iPt.fY, xy2.fX, xy2.fY, tt2);
|
||||
|
|
Загрузка…
Ссылка в новой задаче