diff options
| -rw-r--r-- | docs/SkRect_Reference.bmh | 4 | ||||
| -rw-r--r-- | site/user/api/SkMatrix_Reference.md | 4 | ||||
| -rw-r--r-- | site/user/api/SkRect_Reference.md | 6 | ||||
| -rw-r--r-- | site/user/api/catalog.htm | 19 |
4 files changed, 16 insertions, 17 deletions
diff --git a/docs/SkRect_Reference.bmh b/docs/SkRect_Reference.bmh index 12f5a6208d..40fcfb39ae 100644 --- a/docs/SkRect_Reference.bmh +++ b/docs/SkRect_Reference.bmh @@ -905,13 +905,13 @@ added: nan, 8 count: 4 rect: 0, 0, 0, 0 success: false #In Set #Line # sets to upper and lower limits of Point array ## Sets to bounds of Point pts array with count entries. If any Point in pts -contains Infinity or NaN, all Rect dimensions are set to NaN. +contains infinity or NaN, all Rect dimensions are set to NaN. #Param pts Point array ## #Param count entries in array ## #Example - SkPoint points[] = {{3, 4}, {1, 2}, {SkScalar_Inf, 6}, {SK_ScalarNaN, 8}}; + SkPoint points[] = {{3, 4}, {1, 2}, {SK_ScalarInfinity, 6}, {SK_ScalarNaN, 8}}; for (int count = 0; count <= (int) SK_ARRAY_COUNT(points); ++count) { SkRect rect; rect.setBoundsNoCheck(points, count); diff --git a/site/user/api/SkMatrix_Reference.md b/site/user/api/SkMatrix_Reference.md index 3a6852a560..6815e9341f 100644 --- a/site/user/api/SkMatrix_Reference.md +++ b/site/user/api/SkMatrix_Reference.md @@ -4991,11 +4991,11 @@ mapped bounds ### Example -<div><fiddle-embed name="882e8e0103048009a25cfc20400492f7"></fiddle-embed></div> +<div><fiddle-embed name="3b7b1f884437ab450f986234e4aec27f"></fiddle-embed></div> ### See Also -incomplete +<a href='#SkMatrix_mapRectToQuad'>mapRectToQuad</a> <a href='#SkMatrix_mapRectScaleTranslate'>mapRectScaleTranslate</a> --- diff --git a/site/user/api/SkRect_Reference.md b/site/user/api/SkRect_Reference.md index 1c84c4cd22..68f6aff8da 100644 --- a/site/user/api/SkRect_Reference.md +++ b/site/user/api/SkRect_Reference.md @@ -1637,8 +1637,8 @@ added: nan, 8 count: 4 rect: 0, 0, 0, 0 success: false void <a href='#SkRect_setBoundsNoCheck'>setBoundsNoCheck</a>(const <a href='SkPoint_Reference#SkPoint'>SkPoint</a> pts[], int count) </pre> -Sets to bounds of <a href='SkPoint_Reference#Point'>Point</a> array with <a href='#SkRect_setBoundsNoCheck_count'>count</a> entries. If any point contains a non-finite value -then the rect will also be non-finite. +Sets to bounds of <a href='SkPoint_Reference#Point'>Point</a> <a href='#SkRect_setBoundsNoCheck_pts'>pts</a> array with <a href='#SkRect_setBoundsNoCheck_count'>count</a> entries. If any <a href='SkPoint_Reference#Point'>Point</a> in <a href='#SkRect_setBoundsNoCheck_pts'>pts</a> +contains infinity or NaN, all <a href='#Rect'>Rect</a> dimensions are set to NaN. ### Parameters @@ -1652,7 +1652,7 @@ then the rect will also be non-finite. ### Example -<div><fiddle-embed name="882e8e0103048009a25cfc20400492f7"></fiddle-embed></div> +<div><fiddle-embed name="be10cb1411dbcf7e38e0198e8a9b8b0e"></fiddle-embed></div> ### See Also diff --git a/site/user/api/catalog.htm b/site/user/api/catalog.htm index 698aed4ded..a945d4a428 100644 --- a/site/user/api/catalog.htm +++ b/site/user/api/catalog.htm @@ -3101,6 +3101,13 @@ "name": "SkRect::setBoundsCheck", "stdout": "count: 0 rect: 0, 0, 0, 0 success: true\\nadded: 3, 4 count: 1 rect: 3, 4, 3, 4 success: true\\nadded: 1, 2 count: 2 rect: 1, 2, 3, 4 success: true\\nadded: 5, 6 count: 3 rect: 1, 2, 5, 6 success: true\\nadded: nan, 8 count: 4 rect: 0, 0, 0, 0 success: false\\n" }, + "SkRect_setBoundsNoCheck": { + "code": "void draw(SkCanvas* canvas) {\n SkPoint points[] = {{3, 4}, {1, 2}, {SK_ScalarInfinity, 6}, {SK_ScalarNaN, 8}};\n for (int count = 0; count <= (int) SK_ARRAY_COUNT(points); ++count) {\n SkRect rect;\n rect.setBoundsNoCheck(points, count);\n if (count > 0) {\n SkDebugf(\"added: %3g, %g \", points[count - 1].fX, points[count - 1].fY);\n } else {\n SkDebugf(\"%14s\", \" \");\n }\n SkDebugf(\"count: %d rect: %g, %g, %g, %g\\n\", count,\n rect.fLeft, rect.fTop, rect.fRight, rect.fBottom);\n }\n}", + "hash": "be10cb1411dbcf7e38e0198e8a9b8b0e", + "file": "SkRect_Reference", + "name": "SkRect::setBoundsNoCheck", + "stdout": "count: 0 rect: 0, 0, 0, 0\\nadded: 3, 4 count: 1 rect: 3, 4, 3, 4\\nadded: 1, 2 count: 2 rect: 1, 2, 3, 4\\nadded: inf, 6 count: 3 rect: nan, nan, nan, nan\\nadded: nan, 8 count: 4 rect: nan, nan, nan, nan\\n" + }, "SkRect_setEmpty": { "code": "void draw(SkCanvas* canvas) {\n SkRect rect = {3, 4, 1, 2};\n for (int i = 0; i < 2; ++i) {\n SkDebugf(\"rect: {%g, %g, %g, %g} is %s\" \"empty\\n\", rect.fLeft, rect.fTop,\n rect.fRight, rect.fBottom, rect.isEmpty() ? \"\" : \"not \");\n rect.setEmpty();\n }\n}", "hash": "2cf67542d45ef5d7a7efb673b651ff54", @@ -5720,10 +5727,10 @@ "name": "SkMatrix::mapRect_2" }, "SkMatrix_mapRect_3": { - "code": "void draw(SkCanvas* canvas) {\n // incomplete\n}", + "code": "void draw(SkCanvas* canvas) {\n SkRect rect{110, 50, 180, 100};\n SkMatrix matrix;\n matrix.setRotate(50, 28, 28);\n SkRect mapped = matrix.mapRect(rect);\n SkPaint paint;\n paint.setAntiAlias(true);\n paint.setStyle(SkPaint::kStroke_Style);\n canvas->drawRect(rect, paint);\n canvas->drawRect(mapped, paint);\n canvas->concat(matrix);\n canvas->drawRect(rect, paint);\n}", "width": 256, "height": 256, - "hash": "882e8e0103048009a25cfc20400492f7", + "hash": "3b7b1f884437ab450f986234e4aec27f", "file": "SkMatrix_Reference", "name": "SkMatrix::mapRect_3" }, @@ -7167,14 +7174,6 @@ "file": "SkColor_Reference", "name": "SkRGBToHSV" }, - "SkRect_setBoundsNoCheck": { - "code": "void draw(SkCanvas* canvas) {\n // incomplete\n}", - "width": 256, - "height": 256, - "hash": "882e8e0103048009a25cfc20400492f7", - "file": "SkRect_Reference", - "name": "SkRect::setBoundsNoCheck" -}, "SkSurface_MakeFromBackendTexture": { "code": "void draw(SkCanvas* canvas) {\n SkPaint paint;\n paint.setTextSize(32);\n GrContext* context = canvas->getGrContext();\n if (!context) {\n canvas->drawString(\"GPU only!\", 20, 40, paint);\n return;\n }\n sk_sp<SkSurface> gpuSurface = SkSurface::MakeFromBackendTexture(context,\n backEndTexture, kTopLeft_GrSurfaceOrigin, 0,\n kRGBA_8888_SkColorType, nullptr, nullptr);\n auto surfaceCanvas = gpuSurface->getCanvas();\n surfaceCanvas->drawString(\"GPU rocks!\", 20, 40, paint);\n sk_sp<SkImage> image(gpuSurface->makeImageSnapshot());\n canvas->drawImage(image, 0, 0);\n}", "width": 256, |