mozilla
/
moz-skia
зеркало из https://github.com/mozilla/moz-skia.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Sanitizing source files in Housekeeper-Nightly 

git-svn-id: http://skia.googlecode.com/svn/trunk@10096 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2013-07-16 07:00:56 +00:00
Родитель e1a81d2e22
Коммит 977409aceb
5 изменённых файлов: 236 добавлений и 236 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
src/effects/SkBlurImageFilter.cpp
Просмотреть файл

@ -204,7 +204,7 @@ bool SkBlurImageFilter::filterImageGPU(Proxy* proxy, const SkBitmap& src, SkBitm
GrTexture* source = input.getTexture();
SkRect rect;
src.getBounds(&rect);
SkAutoTUnref<GrTexture> tex(SkGpuBlurUtils::GaussianBlur(source->getContext(),
SkAutoTUnref<GrTexture> tex(SkGpuBlurUtils::GaussianBlur(source->getContext(),
source, false, rect,
fSigma.width(), fSigma.height()));
return SkImageFilterUtils::WrapTexture(tex, src.width(), src.height(), result);

2
src/effects/SkGpuBlurUtils.cpp
Просмотреть файл

@ -58,7 +58,7 @@ GrTexture* GaussianBlur(GrContext* context,
GrTexture* srcTexture,
bool canClobberSrc,
const SkRect& rect,
float sigmaX,
float sigmaX,
float sigmaY) {
GrAssert(NULL != context);

2
src/effects/SkGpuBlurUtils.h
Просмотреть файл

@ -34,7 +34,7 @@ namespace SkGpuBlurUtils {
GrTexture* srcTexture,
bool canClobberSrc,
const SkRect& rect,
float sigmaX,
float sigmaX,
float sigmaY);
#endif

462
tests/PathOpsOpTest.cpp
Просмотреть файл

@ -1733,251 +1733,251 @@ static void skphealth_com76(skiatest::Reporter* reporter) {
#endif
}
static void skpahrefs_com88(skiatest::Reporter* reporter) {
SkPath path;
path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1099.82886f, 7.17117119f);
path.lineTo(1099.12134f, 7.87867832f);
path.cubicTo(1099.66418f, 8.42157173f, 1100.00000f, 9.17157173f, 1100.00000f, 10.0000000f);
path.lineTo(1100.00000f, 28.0000000f);
path.cubicTo(1100.00000f, 29.6568546f, 1098.65686f, 31.0000000f, 1097.00000f, 31.0000000f);
path.lineTo(1088.00000f, 31.0000000f);
path.lineTo(1088.00000f, 32.0000000f);
path.lineTo(1097.00000f, 32.0000000f);
path.quadTo(1098.65686f, 32.0000000f, 1099.82886f, 30.8288002f);
path.quadTo(1101.00000f, 29.6568546f, 1101.00000f, 28.0000000f);
path.lineTo(1101.00000f, 10.0000000f);
path.quadTo(1101.00000f, 8.34314537f, 1099.82886f, 7.17119980f);
path.lineTo(1099.82886f, 7.17117119f);
path.close();
SkPath pathB;
pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1101.00000f, 6.00000000f);
pathB.lineTo(1088.00000f, 6.00000000f);
pathB.lineTo(1088.00000f, 19.0000000f);
pathB.lineTo(1101.00000f, 32.0000000f);
testPathOp(reporter, path, pathB, kIntersect_PathOp);
}
static void skpahrefs_com88(skiatest::Reporter* reporter) {
SkPath path;
path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1099.82886f, 7.17117119f);
path.lineTo(1099.12134f, 7.87867832f);
path.cubicTo(1099.66418f, 8.42157173f, 1100.00000f, 9.17157173f, 1100.00000f, 10.0000000f);
path.lineTo(1100.00000f, 28.0000000f);
path.cubicTo(1100.00000f, 29.6568546f, 1098.65686f, 31.0000000f, 1097.00000f, 31.0000000f);
path.lineTo(1088.00000f, 31.0000000f);
path.lineTo(1088.00000f, 32.0000000f);
path.lineTo(1097.00000f, 32.0000000f);
path.quadTo(1098.65686f, 32.0000000f, 1099.82886f, 30.8288002f);
path.quadTo(1101.00000f, 29.6568546f, 1101.00000f, 28.0000000f);
path.lineTo(1101.00000f, 10.0000000f);
path.quadTo(1101.00000f, 8.34314537f, 1099.82886f, 7.17119980f);
path.lineTo(1099.82886f, 7.17117119f);
path.close();
SkPath pathB;
pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1101.00000f, 6.00000000f);
pathB.lineTo(1088.00000f, 6.00000000f);
pathB.lineTo(1088.00000f, 19.0000000f);
pathB.lineTo(1101.00000f, 32.0000000f);
testPathOp(reporter, path, pathB, kIntersect_PathOp);
}
static void skpahrefs_com29(skiatest::Reporter* reporter) {
SkPath path;
path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1037.17114f, 7.17119980f);
path.quadTo(1038.34314f, 6.00000000f, 1040.00000f, 6.00000000f);
path.lineTo(1074.00000f, 6.00000000f);
path.lineTo(1074.00000f, 32.0000000f);
path.lineTo(1040.00000f, 32.0000000f);
path.quadTo(1038.34314f, 32.0000000f, 1037.17114f, 30.8288002f);
path.quadTo(1036.00000f, 29.6568546f, 1036.00000f, 28.0000000f);
path.lineTo(1036.00000f, 10.0000000f);
path.quadTo(1036.00000f, 8.34314537f, 1037.17114f, 7.17119980f);
path.close();
path.moveTo(1037.00000f, 10.0000000f);
path.cubicTo(1037.00000f, 8.34314537f, 1038.34314f, 7.00000000f, 1040.00000f, 7.00000000f);
path.lineTo(1073.00000f, 7.00000000f);
path.lineTo(1073.00000f, 31.0000000f);
path.lineTo(1040.00000f, 31.0000000f);
path.cubicTo(1038.34314f, 31.0000000f, 1037.00000f, 29.6568546f, 1037.00000f, 28.0000000f);
path.lineTo(1037.00000f, 10.0000000f);
path.close();
SkPath pathB;
pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1036.00000f, 32.0000000f);
pathB.lineTo(1049.00000f, 19.0000000f);
pathB.lineTo(1073.00000f, 31.0000000f);
pathB.lineTo(1074.00000f, 32.0000000f);
testPathOp(reporter, path, pathB, kIntersect_PathOp);
}
static void skpahrefs_com29(skiatest::Reporter* reporter) {
SkPath path;
path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1037.17114f, 7.17119980f);
path.quadTo(1038.34314f, 6.00000000f, 1040.00000f, 6.00000000f);
path.lineTo(1074.00000f, 6.00000000f);
path.lineTo(1074.00000f, 32.0000000f);
path.lineTo(1040.00000f, 32.0000000f);
path.quadTo(1038.34314f, 32.0000000f, 1037.17114f, 30.8288002f);
path.quadTo(1036.00000f, 29.6568546f, 1036.00000f, 28.0000000f);
path.lineTo(1036.00000f, 10.0000000f);
path.quadTo(1036.00000f, 8.34314537f, 1037.17114f, 7.17119980f);
path.close();
path.moveTo(1037.00000f, 10.0000000f);
path.cubicTo(1037.00000f, 8.34314537f, 1038.34314f, 7.00000000f, 1040.00000f, 7.00000000f);
path.lineTo(1073.00000f, 7.00000000f);
path.lineTo(1073.00000f, 31.0000000f);
path.lineTo(1040.00000f, 31.0000000f);
path.cubicTo(1038.34314f, 31.0000000f, 1037.00000f, 29.6568546f, 1037.00000f, 28.0000000f);
path.lineTo(1037.00000f, 10.0000000f);
path.close();
SkPath pathB;
pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1036.00000f, 32.0000000f);
pathB.lineTo(1049.00000f, 19.0000000f);
pathB.lineTo(1073.00000f, 31.0000000f);
pathB.lineTo(1074.00000f, 32.0000000f);
testPathOp(reporter, path, pathB, kIntersect_PathOp);
}
static void cubicOp85d(skiatest::Reporter* reporter) {
SkPath path;
path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(1,6, 1,0, 6,2);
path.close();
SkPath pathB;
pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,1);
pathB.cubicTo(2,6, 1,0, 6,1);
pathB.close();
testPathOp(reporter, path, pathB, kDifference_PathOp);
static void cubicOp85d(skiatest::Reporter* reporter) {
SkPath path;
path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(1,6, 1,0, 6,2);
path.close();
SkPath pathB;
pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,1);
pathB.cubicTo(2,6, 1,0, 6,1);
pathB.close();
testPathOp(reporter, path, pathB, kDifference_PathOp);
}
#if 0 // FIXME
// this fails because the pair of nearly coincident cubics intersect at the ends
// but the line connected to one of the cubics at the same point does not intersect
// the other
static void skpkkiste_to98(skiatest::Reporter* reporter) {
SkPath path;
path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(96, 122);
path.cubicTo(94.6192932f, 122, 93.3692932f, 122.559647f, 92.4644699f, 123.46447f);
path.lineTo(94.1715698f, 125.17157f);
path.cubicTo(94.8954315f, 124.447708f, 95.8954315f, 124, 97, 124);
path.lineTo(257, 124);
path.cubicTo(258.104553f, 124, 259.104584f, 124.447708f, 259.82843f, 125.17157f);
path.lineTo(261.535522f, 123.46447f);
path.cubicTo(260.630707f, 122.559647f, 259.380707f, 122, 258, 122);
path.lineTo(96, 122);
path.close();
SkPath pathB;
pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(258, 122);
pathB.cubicTo(260.761414f, 122, 263, 124.238579f, 263, 127);
pathB.lineTo(263, 284);
pathB.cubicTo(263, 286.761414f, 260.761414f, 289, 258, 289);
pathB.lineTo(96, 289);
pathB.cubicTo(93.2385788f, 289, 91, 286.761414f, 91, 284);
pathB.lineTo(91, 127);
pathB.cubicTo(91, 124.238579f, 93.2385788f, 122, 96, 122);
pathB.lineTo(258, 122);
pathB.close();
testPathOp(reporter, path, pathB, kIntersect_PathOp);
}
static void skpkkiste_to98(skiatest::Reporter* reporter) {
SkPath path;
path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(96, 122);
path.cubicTo(94.6192932f, 122, 93.3692932f, 122.559647f, 92.4644699f, 123.46447f);
path.lineTo(94.1715698f, 125.17157f);
path.cubicTo(94.8954315f, 124.447708f, 95.8954315f, 124, 97, 124);
path.lineTo(257, 124);
path.cubicTo(258.104553f, 124, 259.104584f, 124.447708f, 259.82843f, 125.17157f);
path.lineTo(261.535522f, 123.46447f);
path.cubicTo(260.630707f, 122.559647f, 259.380707f, 122, 258, 122);
path.lineTo(96, 122);
path.close();
SkPath pathB;
pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(258, 122);
pathB.cubicTo(260.761414f, 122, 263, 124.238579f, 263, 127);
pathB.lineTo(263, 284);
pathB.cubicTo(263, 286.761414f, 260.761414f, 289, 258, 289);
pathB.lineTo(96, 289);
pathB.cubicTo(93.2385788f, 289, 91, 286.761414f, 91, 284);
pathB.lineTo(91, 127);
pathB.cubicTo(91, 124.238579f, 93.2385788f, 122, 96, 122);
pathB.lineTo(258, 122);
pathB.close();
testPathOp(reporter, path, pathB, kIntersect_PathOp);
}
#endif
#if 0 // https://code.google.com/p/skia/issues/detail?id=1417
static void issue1417(skiatest::Reporter* reporter) {
SkPath path1;
path1.moveTo(122.589f, 82.2836f);
path1.quadTo(129.822f, 80, 138, 80);
path1.quadTo(147.157f, 80, 155.128f, 82.8628f);
path1.lineTo(161.176f, 100);
path1.lineTo(161.176f, 100);
path1.lineTo(115.294f, 100);
path1.lineTo(115.294f, 100);
path1.lineTo(122.589f, 82.2836f);
path1.lineTo(122.589f, 82.2836f);
path1.close();
path1.moveTo(98.6819f, 140.344f);
path1.lineTo(115.294f, 100);
path1.lineTo(115.294f, 100);
path1.lineTo(97.9338f, 100);
path1.lineTo(97.9338f, 100);
path1.quadTo(88, 112.943f, 88, 130);
path1.quadTo(88, 131.545f, 88.0815f, 133.056f);
path1.lineTo(98.6819f, 140.344f);
path1.lineTo(98.6819f, 140.344f);
path1.close();
path1.moveTo(136.97f, 166.667f);
path1.lineTo(98.6819f, 140.344f);
path1.lineTo(98.6819f, 140.344f);
path1.lineTo(93.4589f, 153.028f);
path1.lineTo(93.4589f, 153.028f);
path1.quadTo(96.9412f, 159.652f, 102.645f, 165.355f);
path1.quadTo(110.792f, 173.503f, 120.818f, 177.118f);
path1.lineTo(136.97f, 166.667f);
path1.lineTo(136.97f, 166.667f);
path1.close();
path1.moveTo(175.831f, 141.521f);
path1.lineTo(136.97f, 166.667f);
path1.lineTo(136.97f, 166.667f);
path1.lineTo(153.157f, 177.796f);
path1.lineTo(153.157f, 177.796f);
path1.quadTo(164.392f, 174.318f, 173.355f, 165.355f);
path1.quadTo(177.806f, 160.905f, 180.904f, 155.894f);
path1.lineTo(175.831f, 141.521f);
path1.lineTo(175.831f, 141.521f);
path1.close();
path1.moveTo(175.831f, 141.521f);
path1.lineTo(187.878f, 133.726f);
path1.lineTo(187.878f, 133.726f);
path1.quadTo(188, 131.888f, 188, 130);
path1.quadTo(188, 112.943f, 178.066f, 100);
path1.lineTo(161.176f, 100);
path1.lineTo(161.176f, 100);
path1.lineTo(175.831f, 141.521f);
path1.lineTo(175.831f, 141.521f);
path1.close();
SkPath path2;
path2.moveTo(174.118f, 100);
path2.lineTo(161.176f, 100);
path2.lineTo(161.176f, 100);
path2.lineTo(155.128f, 82.8628f);
path2.lineTo(155.128f, 82.8628f);
path2.quadTo(153.15f, 82.1523f, 151.098f, 81.6181f);
path2.lineTo(143.529f, 100);
path2.lineTo(143.529f, 100);
path2.lineTo(161.176f, 100);
path2.lineTo(161.176f, 100);
path2.lineTo(168.235f, 120);
path2.lineTo(168.235f, 120);
path2.lineTo(181.176f, 120);
path2.lineTo(181.176f, 120);
path2.lineTo(186.366f, 134.704f);
path2.lineTo(186.366f, 134.704f);
path2.lineTo(187.878f, 133.726f);
path2.lineTo(187.878f, 133.726f);
path2.quadTo(188, 131.888f, 188, 130);
path2.quadTo(188, 124.809f, 187.08f, 120);
path2.lineTo(181.176f, 120);
path2.lineTo(181.176f, 120);
path2.lineTo(174.118f, 100);
path2.lineTo(174.118f, 100);
path2.close();
path2.moveTo(88.9198f, 120);
path2.lineTo(107.059f, 120);
path2.lineTo(107.059f, 120);
path2.lineTo(98.6819f, 140.344f);
path2.lineTo(98.6819f, 140.344f);
path2.lineTo(88.0815f, 133.056f);
path2.lineTo(88.0815f, 133.056f);
path2.quadTo(88, 131.545f, 88, 130);
path2.quadTo(88, 124.81f, 88.9198f, 120);
path2.close();
path2.moveTo(96.6762f, 145.215f);
path2.lineTo(98.6819f, 140.344f);
path2.lineTo(98.6819f, 140.344f);
path2.lineTo(120.688f, 155.473f);
path2.lineTo(120.688f, 155.473f);
path2.lineTo(118.682f, 160.344f);
path2.lineTo(118.682f, 160.344f);
path2.lineTo(96.6762f, 145.215f);
path2.lineTo(96.6762f, 145.215f);
path2.close();
path2.moveTo(113.232f, 173.579f);
path2.quadTo(116.88f, 175.698f, 120.818f, 177.118f);
path2.lineTo(132.286f, 169.697f);
path2.lineTo(132.286f, 169.697f);
path2.lineTo(118.682f, 160.344f);
path2.lineTo(118.682f, 160.344f);
path2.lineTo(113.232f, 173.579f);
path2.lineTo(113.232f, 173.579f);
path2.close();
testPathOp(reporter, path1, path2, kUnion_PathOp);
}
static void issue1417(skiatest::Reporter* reporter) {
SkPath path1;
path1.moveTo(122.589f, 82.2836f);
path1.quadTo(129.822f, 80, 138, 80);
path1.quadTo(147.157f, 80, 155.128f, 82.8628f);
path1.lineTo(161.176f, 100);
path1.lineTo(161.176f, 100);
path1.lineTo(115.294f, 100);
path1.lineTo(115.294f, 100);
path1.lineTo(122.589f, 82.2836f);
path1.lineTo(122.589f, 82.2836f);
path1.close();
path1.moveTo(98.6819f, 140.344f);
path1.lineTo(115.294f, 100);
path1.lineTo(115.294f, 100);
path1.lineTo(97.9338f, 100);
path1.lineTo(97.9338f, 100);
path1.quadTo(88, 112.943f, 88, 130);
path1.quadTo(88, 131.545f, 88.0815f, 133.056f);
path1.lineTo(98.6819f, 140.344f);
path1.lineTo(98.6819f, 140.344f);
path1.close();
path1.moveTo(136.97f, 166.667f);
path1.lineTo(98.6819f, 140.344f);
path1.lineTo(98.6819f, 140.344f);
path1.lineTo(93.4589f, 153.028f);
path1.lineTo(93.4589f, 153.028f);
path1.quadTo(96.9412f, 159.652f, 102.645f, 165.355f);
path1.quadTo(110.792f, 173.503f, 120.818f, 177.118f);
path1.lineTo(136.97f, 166.667f);
path1.lineTo(136.97f, 166.667f);
path1.close();
path1.moveTo(175.831f, 141.521f);
path1.lineTo(136.97f, 166.667f);
path1.lineTo(136.97f, 166.667f);
path1.lineTo(153.157f, 177.796f);
path1.lineTo(153.157f, 177.796f);
path1.quadTo(164.392f, 174.318f, 173.355f, 165.355f);
path1.quadTo(177.806f, 160.905f, 180.904f, 155.894f);
path1.lineTo(175.831f, 141.521f);
path1.lineTo(175.831f, 141.521f);
path1.close();
path1.moveTo(175.831f, 141.521f);
path1.lineTo(187.878f, 133.726f);
path1.lineTo(187.878f, 133.726f);
path1.quadTo(188, 131.888f, 188, 130);
path1.quadTo(188, 112.943f, 178.066f, 100);
path1.lineTo(161.176f, 100);
path1.lineTo(161.176f, 100);
path1.lineTo(175.831f, 141.521f);
path1.lineTo(175.831f, 141.521f);
path1.close();
SkPath path2;
path2.moveTo(174.118f, 100);
path2.lineTo(161.176f, 100);
path2.lineTo(161.176f, 100);
path2.lineTo(155.128f, 82.8628f);
path2.lineTo(155.128f, 82.8628f);
path2.quadTo(153.15f, 82.1523f, 151.098f, 81.6181f);
path2.lineTo(143.529f, 100);
path2.lineTo(143.529f, 100);
path2.lineTo(161.176f, 100);
path2.lineTo(161.176f, 100);
path2.lineTo(168.235f, 120);
path2.lineTo(168.235f, 120);
path2.lineTo(181.176f, 120);
path2.lineTo(181.176f, 120);
path2.lineTo(186.366f, 134.704f);
path2.lineTo(186.366f, 134.704f);
path2.lineTo(187.878f, 133.726f);
path2.lineTo(187.878f, 133.726f);
path2.quadTo(188, 131.888f, 188, 130);
path2.quadTo(188, 124.809f, 187.08f, 120);
path2.lineTo(181.176f, 120);
path2.lineTo(181.176f, 120);
path2.lineTo(174.118f, 100);
path2.lineTo(174.118f, 100);
path2.close();
path2.moveTo(88.9198f, 120);
path2.lineTo(107.059f, 120);
path2.lineTo(107.059f, 120);
path2.lineTo(98.6819f, 140.344f);
path2.lineTo(98.6819f, 140.344f);
path2.lineTo(88.0815f, 133.056f);
path2.lineTo(88.0815f, 133.056f);
path2.quadTo(88, 131.545f, 88, 130);
path2.quadTo(88, 124.81f, 88.9198f, 120);
path2.close();
path2.moveTo(96.6762f, 145.215f);
path2.lineTo(98.6819f, 140.344f);
path2.lineTo(98.6819f, 140.344f);
path2.lineTo(120.688f, 155.473f);
path2.lineTo(120.688f, 155.473f);
path2.lineTo(118.682f, 160.344f);
path2.lineTo(118.682f, 160.344f);
path2.lineTo(96.6762f, 145.215f);
path2.lineTo(96.6762f, 145.215f);
path2.close();
path2.moveTo(113.232f, 173.579f);
path2.quadTo(116.88f, 175.698f, 120.818f, 177.118f);
path2.lineTo(132.286f, 169.697f);
path2.lineTo(132.286f, 169.697f);
path2.lineTo(118.682f, 160.344f);
path2.lineTo(118.682f, 160.344f);
path2.lineTo(113.232f, 173.579f);
path2.lineTo(113.232f, 173.579f);
path2.close();
testPathOp(reporter, path1, path2, kUnion_PathOp);
}
#endif
#if 0 // https://code.google.com/p/skia/issues/detail?id=1418
static void issue1418(skiatest::Reporter* reporter) {
SkPath path1;
path1.moveTo(0, 0);
path1.lineTo(1, 0);
path1.lineTo(1, 0);
path1.lineTo(1, 1);
path1.lineTo(1, 1);
path1.lineTo(0, 1);
path1.lineTo(0, 1);
path1.lineTo(0, 0);
path1.lineTo(0, 0);
path1.close();
SkPath path2;
path2.moveTo(0.646447f, -0.353553f);
path2.quadTo(0.792893f, -0.5f, 1, -0.5f);
path2.quadTo(1.20711f, -0.5f, 1.35355f, -0.353553f);
path2.quadTo(1.5f, -0.207107f, 1.5f, 0);
path2.quadTo(1.5f, 0.207107f, 1.35355f, 0.353553f);
path2.quadTo(1.20711f, 0.5f, 1, 0.5f);
path2.quadTo(0.792893f, 0.5f, 0.646447f, 0.353553f);
path2.quadTo(0.5f, 0.207107f, 0.5f, 0);
path2.quadTo(0.5f, -0.207107f, 0.646447f, -0.353553f);
path2.close();
testPathOp(reporter, path1, path2, kIntersect_PathOp);
}
static void issue1418(skiatest::Reporter* reporter) {
SkPath path1;
path1.moveTo(0, 0);
path1.lineTo(1, 0);
path1.lineTo(1, 0);
path1.lineTo(1, 1);
path1.lineTo(1, 1);
path1.lineTo(0, 1);
path1.lineTo(0, 1);
path1.lineTo(0, 0);
path1.lineTo(0, 0);
path1.close();
SkPath path2;
path2.moveTo(0.646447f, -0.353553f);
path2.quadTo(0.792893f, -0.5f, 1, -0.5f);
path2.quadTo(1.20711f, -0.5f, 1.35355f, -0.353553f);
path2.quadTo(1.5f, -0.207107f, 1.5f, 0);
path2.quadTo(1.5f, 0.207107f, 1.35355f, 0.353553f);
path2.quadTo(1.20711f, 0.5f, 1, 0.5f);
path2.quadTo(0.792893f, 0.5f, 0.646447f, 0.353553f);
path2.quadTo(0.5f, 0.207107f, 0.5f, 0);
path2.quadTo(0.5f, -0.207107f, 0.646447f, -0.353553f);
path2.close();
testPathOp(reporter, path1, path2, kIntersect_PathOp);
}
#endif
static void (*firstTest)(skiatest::Reporter* ) = 0;

4
tests/PathOpsQuadIntersectionTest.cpp
Просмотреть файл

@ -50,8 +50,8 @@ static void standardTestCases(skiatest::Reporter* reporter) {
}
static const SkDQuad testSet[] = {
{{{0.647069409,2.97691634}, {0.946860918,3.17625612}, {1.46875407,2.65105457}}},
{{{0,1}, {0.723699095,2.82756208}, {1.08907197,2.97497449}}},
{{{0.647069409,2.97691634}, {0.946860918,3.17625612}, {1.46875407,2.65105457}}},
{{{0,1}, {0.723699095,2.82756208}, {1.08907197,2.97497449}}},
{{{131.37418,11414.9825}, {130.28798,11415.9328}, {130.042755,11417.4131}}},
{{{130.585787,11418.4142}, {130.021447,11417.8498}, {130,11417}}},