diff options
| -rw-r--r-- | docs/SkIRect_Reference.bmh | 8 | ||||
| -rw-r--r-- | site/user/api/SkIRect_Reference.md | 12 | ||||
| -rw-r--r-- | tools/bookmaker/includeWriter.cpp | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/docs/SkIRect_Reference.bmh b/docs/SkIRect_Reference.bmh index bdaa4a69d4..0d7924ce07 100644 --- a/docs/SkIRect_Reference.bmh +++ b/docs/SkIRect_Reference.bmh @@ -1182,7 +1182,7 @@ rect (7, 11, 13, 17) test(12, 16, 14, 18) quickReject false; intersects true #Method bool contains(int32_t x, int32_t y) const #In Intersection -#Line # returns true if points are equal or inside ## +#Line # returns true if IPoint (x, y) is equal or inside ## Returns true if: #Formula fLeft <= x < fRight && fTop <= y < fBottom @@ -1197,8 +1197,8 @@ Considers input to describe constructed IRect: and returns true if constructed area is completely enclosed by IRect area. -#Param x test Point x-coordinate ## -#Param y test Point y-coordinate ## +#Param x test IPoint x-coordinate ## +#Param y test IPoint y-coordinate ## #Return true if (x, y) is inside IRect ## @@ -1334,7 +1334,7 @@ rect: (30, 50, 40, 60) does not contain (29, 59, 30, 60) #Method bool containsNoEmptyCheck(int32_t left, int32_t top, int32_t right, int32_t bottom) const #In Intersection -#Line # returns true if points are equal or inside skips empty check ## +#Line # returns true if contains unsorted IRect ## Constructs IRect from (left, top, right, bottom). Does not sort construction. diff --git a/site/user/api/SkIRect_Reference.md b/site/user/api/SkIRect_Reference.md index 2f510925fc..a8c52b625f 100644 --- a/site/user/api/SkIRect_Reference.md +++ b/site/user/api/SkIRect_Reference.md @@ -48,8 +48,8 @@ its top, it is considered empty. | <a href="#SkIRect_bottom">bottom</a> | returns larger bounds in y, if sorted | | <a href="#SkIRect_centerX">centerX</a> | returns midpoint in x | | <a href="#SkIRect_centerY">centerY</a> | returns midpoint in y | -| <a href="#SkIRect_contains">contains</a> | returns true if points are equal or inside | -| <a href="#SkIRect_containsNoEmptyCheck">containsNoEmptyCheck</a> | returns true if points are equal or inside skips empty check | +| <a href="#SkIRect_contains">contains</a> | returns true if <a href="SkIPoint_Reference#IPoint">IPoint</a> (x, y) is equal or inside | +| <a href="#SkIRect_containsNoEmptyCheck">containsNoEmptyCheck</a> | returns true if contains unsorted <a href="#IRect">IRect</a> | | <a href="#SkIRect_height">height</a> | returns span in y | | <a href="#SkIRect_height64">height64</a> | returns span in y as int64_t | | <a href="#SkIRect_inset">inset</a> | moves the sides symmetrically about the center | @@ -1507,9 +1507,9 @@ describes an area: <a href="#SkIRect_fLeft">fLeft</a> is less than <a href="#SkI | --- | --- | | <a href="#SkIRect_Intersects">Intersects</a> | returns true if areas overlap | | <a href="#SkIRect_IntersectsNoEmptyCheck">IntersectsNoEmptyCheck</a> | returns true if areas overlap skips empty check | -| <a href="#SkIRect_contains">contains</a> | returns true if points are equal or inside | +| <a href="#SkIRect_contains">contains</a> | returns true if <a href="SkIPoint_Reference#IPoint">IPoint</a> (x, y) is equal or inside | | | <a href="#SkIRect_contains">contains(int32 t x, int32 t y)</a> const | -| <a href="#SkIRect_containsNoEmptyCheck">containsNoEmptyCheck</a> | returns true if points are equal or inside skips empty check | +| <a href="#SkIRect_containsNoEmptyCheck">containsNoEmptyCheck</a> | returns true if contains unsorted <a href="#IRect">IRect</a> | | | <a href="#SkIRect_containsNoEmptyCheck">containsNoEmptyCheck(int32 t left, int32 t top, int32 t right, int32 t bottom)</a> const | | <a href="#SkIRect_intersect">intersect</a> | sets to shared area; returns true if not empty | | | <a href="#SkIRect_intersect">intersect(const SkIRect& r)</a> | @@ -1585,9 +1585,9 @@ returns true if constructed area is completely enclosed by <a href="#IRect">IRec ### Parameters <table> <tr> <td><a name="SkIRect_contains_x"> <code><strong>x </strong></code> </a></td> <td> -test <a href="SkPoint_Reference#Point">Point</a> x-coordinate</td> +test <a href="SkIPoint_Reference#IPoint">IPoint</a> x-coordinate</td> </tr> <tr> <td><a name="SkIRect_contains_y"> <code><strong>y </strong></code> </a></td> <td> -test <a href="SkPoint_Reference#Point">Point</a> y-coordinate</td> +test <a href="SkIPoint_Reference#IPoint">IPoint</a> y-coordinate</td> </tr> </table> diff --git a/tools/bookmaker/includeWriter.cpp b/tools/bookmaker/includeWriter.cpp index 66b8b08081..0b77cface0 100644 --- a/tools/bookmaker/includeWriter.cpp +++ b/tools/bookmaker/includeWriter.cpp @@ -737,7 +737,7 @@ Definition* IncludeWriter::findMemberCommentBlock(const vector<Definition*>& bmh } string match = memberDef->fName; // if match.endsWith(name) ... - if (match.length() >= name.length() && + if (match.length() >= name.length() && 0 == match.compare(match.length() - name.length(), name.length(), name)) { return memberDef; } |