diff options
| -rw-r--r-- | docs/SkBitmap_Reference.bmh | 6 | ||||
| -rw-r--r-- | docs/SkCanvas_Reference.bmh | 5 | ||||
| -rw-r--r-- | docs/SkMatrix_Reference.bmh | 47 | ||||
| -rw-r--r-- | docs/SkRRect_Reference.bmh | 18 | ||||
| -rw-r--r-- | docs/SkSurface_Reference.bmh | 3 | ||||
| -rw-r--r-- | docs/status.json | 12 | ||||
| -rw-r--r-- | site/user/api/SkBitmap_Reference.md | 12 | ||||
| -rw-r--r-- | site/user/api/SkCanvas_Reference.md | 10 | ||||
| -rw-r--r-- | site/user/api/SkMatrix_Reference.md | 94 | ||||
| -rw-r--r-- | site/user/api/SkSurface_Reference.md | 6 | ||||
| -rw-r--r-- | tools/bookmaker/bookmaker.h | 1 | ||||
| -rw-r--r-- | tools/bookmaker/definition.cpp | 23 | ||||
| -rw-r--r-- | tools/bookmaker/includeParser.cpp | 9 | ||||
| -rw-r--r-- | tools/bookmaker/includeWriter.cpp | 11 |
14 files changed, 46 insertions, 211 deletions
diff --git a/docs/SkBitmap_Reference.bmh b/docs/SkBitmap_Reference.bmh index d57f0b85b8..1fd2b520de 100644 --- a/docs/SkBitmap_Reference.bmh +++ b/docs/SkBitmap_Reference.bmh @@ -1404,7 +1404,6 @@ Calls reset() and returns false if: # imageInfo.height() is negative ## # rowBytes is positive and less than imageInfo.width() times imageInfo.bytesPerPixel ## ## -. #Param imageInfo contains width, height, Alpha_Type, Color_Type, Color_Space ## #Param rowBytes imageInfo.minRowBytes or larger; or zero ## @@ -2573,7 +2572,6 @@ Input is not validated. Triggers an assert() if built with SK_DEBUG defined and: # x is negative, or not less than width() ## # y is negative, or not less than height() ## ## -. #Param x column index, zero or greater, and less than width() ## #Param y row index, zero or greater, and less than height() ## @@ -2609,7 +2607,6 @@ Input is not validated. Triggers an assert() if built with SK_DEBUG defined and: # x is negative, or not less than width() ## # y is negative, or not less than height() ## ## -. #Param x column index, zero or greater, and less than width() ## #Param y row index, zero or greater, and less than height() ## @@ -2651,7 +2648,6 @@ Input is not validated. Triggers an assert() if built with SK_DEBUG defined and: # x is negative, or not less than width() ## # y is negative, or not less than height() ## ## -. #Param x column index, zero or greater, and less than width() ## #Param y row index, zero or greater, and less than height() ## @@ -2697,7 +2693,6 @@ Return false if: # Pixel_Ref is nullptr ## # subset does not intersect bounds() ## ## -. #Param dst Bitmap set to subset ## #Param subset rectangle of pixels to reference ## @@ -2763,7 +2758,6 @@ row to the next. Returns true if pixels are copied. Returns false if: # dstRowBytes is less than dstInfo.minRowBytes ## # Pixel_Ref is nullptr ## ## -. Pixels are copied only if pixel conversion is possible. If Bitmap colorType is kGray_8_SkColorType, or kAlpha_8_SkColorType; dstInfo.colorType must match. diff --git a/docs/SkCanvas_Reference.bmh b/docs/SkCanvas_Reference.bmh index e91aee56da..32dee8193f 100644 --- a/docs/SkCanvas_Reference.bmh +++ b/docs/SkCanvas_Reference.bmh @@ -943,7 +943,6 @@ Does not copy, and returns false if: # Canvas pixels are not readable; for instance, Canvas is document-based. ## # dstRowBytes is too small to contain one row of pixels. ## ## -. #Param dstInfo width, height, Color_Type, and Alpha_Type of dstPixels ## #Param dstPixels storage for pixels; dstInfo.height() times dstRowBytes, or larger ## @@ -1037,7 +1036,6 @@ Does not copy, and returns false if: # Pixmap pixels could not be allocated. ## # pixmap.rowBytes() is too small to contain one row of pixels. ## ## -. #Param pixmap storage for pixels copied from Canvas ## #Param srcX offset into readable pixels on x-axis; may be negative ## @@ -1101,7 +1099,6 @@ Does not copy, and returns false if: # bitmap pixels could not be allocated. ## # bitmap.rowBytes() is too small to contain one row of pixels. ## ## -. #Param bitmap storage for pixels copied from Canvas ## #Param srcX offset into readable pixels on x-axis; may be negative ## @@ -1165,7 +1162,6 @@ Does not copy, and returns false if: # Canvas pixels are not writable; for instance, Canvas is document-based. ## # rowBytes is too small to contain one row of pixels. ## ## -. #Param info width, height, Color_Type, and Alpha_Type of pixels ## #Param pixels pixels to copy, of size info.height() times rowBytes, or larger ## @@ -1225,7 +1221,6 @@ Does not copy, and returns false if: # Canvas pixels are not writable; for instance, Canvas is document based. ## # bitmap pixels are inaccessible; for instance, bitmap wraps a texture. ## ## -. #Param bitmap contains pixels copied to Canvas ## #Param x offset into Canvas writable pixels in x; may be negative ## diff --git a/docs/SkMatrix_Reference.bmh b/docs/SkMatrix_Reference.bmh index 6f37e7856a..7a17e42eda 100644 --- a/docs/SkMatrix_Reference.bmh +++ b/docs/SkMatrix_Reference.bmh @@ -44,7 +44,6 @@ Sets Matrix to scale by (sx, sy). Returned matrix is: | 0 sy 0 | | 0 0 1 | ## -. #Param sx horizontal scale factor ## #Param sy vertical scale factor ## @@ -73,7 +72,6 @@ Sets Matrix to scale by (scale, scale). Returned matrix is: | 0 scale 0 | | 0 0 1 | ## -. #Param scale horizontal and vertical scale factor ## @@ -102,7 +100,6 @@ Sets Matrix to translate by (dx, dy). Returned matrix is: | 0 1 dy | | 0 0 1 | ## -. #Param dx horizontal translation ## #Param dy vertical translation ## @@ -139,7 +136,6 @@ Sets Matrix to: | skewY scaleY transY | | pers0 pers1 pers2 | ## -. #Param scaleX horizontal scale factor ## #Param skewX horizontal skew factor ## @@ -292,7 +288,6 @@ Returns true if Matrix is identity. Identity matrix is: | 0 1 0 | | 0 0 1 | ## -. #Return true if Matrix has no effect ## @@ -326,7 +321,6 @@ contain only scale elements, only translate elements, or both. Matrix form is: | 0 scale-y translate-y | | 0 0 1 | ## -. #Return true if Matrix is identity; or scales, translates, or both ## @@ -363,7 +357,6 @@ Returns true if Matrix is identity, or translates. Matrix form is: | 0 1 translate-y | | 0 0 1 | ## -. #Return true if Matrix is identity, or translates ## @@ -1315,7 +1308,6 @@ Sets all values from parameters. Sets matrix to: | skewY scaleY transY | | persp0 persp1 persp2 | ## -. #Param scaleX horizontal scale factor to store ## #Param skewX horizontal skew factor to store ## @@ -1394,7 +1386,6 @@ Sets matrix to: | buffer[3] buffer[4] buffer[5] | | buffer[6] buffer[7] buffer[8] | ## -. In the future, set9 followed by get9 may not return the same values. Since Matrix maps non-homogeneous coordinates, scaling all nine values produces an equivalent @@ -1429,7 +1420,6 @@ Sets Matrix to identity; which has no effect on mapped Points. Sets Matrix to: | 0 1 0 | | 0 0 1 | ## -. Also called setIdentity(); use the one that provides better inline documentation. @@ -1461,7 +1451,6 @@ Sets Matrix to identity; which has no effect on mapped Points. Sets Matrix to: | 0 1 0 | | 0 0 1 | ## -. Also called reset(); use the one that provides better inline documentation. @@ -1853,7 +1842,6 @@ sets Matrix to: a * b = | D E F | * | M N O | = | DJ+EM+FP DK+EN+FQ DL+EO+FR | | G H I | | P Q R | | GJ+HM+IP GK+HN+IQ GL+HO+IR | ## -. #Param a Matrix on left side of multiply expression ## #Param b Matrix on right side of multiply expression ## @@ -1904,7 +1892,6 @@ sets Matrix to: Matrix * T(dx, dy) = | D E F | | 0 1 dy | = | D E D*dx+E*dy+F | | G H I | | 0 0 1 | | G H G*dx+H*dy+I | ## -. #Param dx x-axis translation before applying Matrix ## #Param dy y-axis translation before applying Matrix ## @@ -1972,7 +1959,6 @@ sets Matrix to: Matrix * S(sx, sy, px, py) = | D E F | | 0 sy dy | = | D*sx E*sy D*dx+E*dy+F | | G H I | | 0 0 1 | | G*sx H*sy G*dx+H*dy+I | ## -. #Param sx horizontal scale factor ## #Param sy vertical scale factor ## @@ -2020,7 +2006,6 @@ sets Matrix to: Matrix * S(sx, sy) = | D E F | | 0 sy 0 | = | D*sx E*sy F | | G H I | | 0 0 1 | | G*sx H*sy I | ## -. #Param sx horizontal scale factor ## #Param sy vertical scale factor ## @@ -2079,7 +2064,6 @@ sets Matrix to: Matrix * R(degrees, px, py) = | D E F | | s c dy | = | Dc+Es -Ds+Ec D*dx+E*dy+F | | G H I | | 0 0 1 | | Gc+Hs -Gs+Hc G*dx+H*dy+I | ## -. #Param degrees angle of axes relative to upright axes ## #Param px pivot x ## @@ -2135,7 +2119,6 @@ sets Matrix to: Matrix * R(degrees, px, py) = | D E F | | s c 0 | = | Dc+Es -Ds+Ec F | | G H I | | 0 0 1 | | Gc+Hs -Gs+Hc I | ## -. #Param degrees angle of axes relative to upright axes ## @@ -2189,7 +2172,6 @@ sets Matrix to: Matrix * K(kx, ky, px, py) = | D E F | | ky 1 dy | = | D+E*ky D*kx+E D*dx+E*dy+F | | G H I | | 0 0 1 | | G+H*ky G*kx+H G*dx+H*dy+I | ## -. #Param kx horizontal skew factor ## #Param ky vertical skew factor ## @@ -2236,7 +2218,6 @@ sets Matrix to: Matrix * K(kx, ky) = | D E F | | ky 1 0 | = | D+E*ky D*kx+E F | | G H I | | 0 0 1 | | G+H*ky G*kx+H I | ## -. #Param kx horizontal skew factor ## #Param ky vertical skew factor ## @@ -2282,7 +2263,6 @@ sets Matrix to: Matrix * other = | D E F | * | M N O | = | DJ+EM+FP DK+EN+FQ DL+EO+FR | | G H I | | P Q R | | GJ+HM+IP GK+HN+IQ GL+HO+IR | ## -. #Param other Matrix on right side of multiply expression ## @@ -2332,7 +2312,6 @@ sets Matrix to: T(dx, dy) * Matrix = | 0 1 dy | | M N O | = | M+dy*P N+dy*Q O+dy*R | | 0 0 1 | | P Q R | | P Q R | ## -. #Param dx x-axis translation after applying Matrix ## #Param dy y-axis translation after applying Matrix ## @@ -2403,7 +2382,6 @@ sets Matrix to: S(sx, sy, px, py) * Matrix = | 0 sy dy | | M N O | = | sy*M+dy*P sy*N+dy*Q sy*O+dy*R | | 0 0 1 | | P Q R | | P Q R | ## -. #Param sx horizontal scale factor ## #Param sy vertical scale factor ## @@ -2450,7 +2428,6 @@ sets Matrix to: S(sx, sy) * Matrix = | 0 sy 0 | | M N O | = | sy*M sy*N sy*O | | 0 0 1 | | P Q R | | P Q R | ## -. #Param sx horizontal scale factor ## #Param sy vertical scale factor ## @@ -2509,7 +2486,6 @@ sets Matrix to: I(divx, divy) * Matrix = | 0 sy 0 | | M N O | = | sy*M sy*N sy*O | | 0 0 1 | | P Q R | | P Q R | ## -. #Param divx integer divisor for inverse scale in x ## #Param divy integer divisor for inverse scale in y ## @@ -2570,7 +2546,6 @@ sets Matrix to: R(degrees, px, py) * Matrix = |s c dy| |M N O| = |sJ+cM+dy*P sK+cN+dy*Q sL+cO+dy*R| |0 0 1| |P Q R| | P Q R| ## -. #Param degrees angle of axes relative to upright axes ## #Param px pivot x ## @@ -2626,7 +2601,6 @@ sets Matrix to: R(degrees, px, py) * Matrix = | s c dy | | M N O | = | sJ+cM sK+cN sL+cO | | 0 0 1 | | P Q R | | P Q R | ## -. #Param degrees angle of axes relative to upright axes ## @@ -2680,7 +2654,6 @@ sets Matrix to: K(kx, ky, px, py) * Matrix = |ky 1 dy| |M N O| = |ky*J+M+dy*P ky*K+N+dy*Q ky*L+O+dy*R| | 0 0 1| |P Q R| | P Q R| ## -. #Param kx horizontal skew factor ## #Param ky vertical skew factor ## @@ -2727,7 +2700,6 @@ sets Matrix to: K(kx, ky) * Matrix = | ky 1 0 | | M N O | = | ky*J+M ky*K+N ky*L+O | | 0 0 1 | | P Q R | | P Q R | ## -. #Param kx horizontal skew factor ## #Param ky vertical skew factor ## @@ -2773,7 +2745,6 @@ sets Matrix to: other * Matrix = | D E F | * | M N O | = | DJ+EM+FP DK+EN+FQ DL+EO+FR | | G H I | | P Q R | | GJ+HM+IP GK+HN+IQ GL+HO+IR | ## -. #Param other Matrix on left side of multiply expression ## @@ -2880,7 +2851,6 @@ Returns true if dst is empty, and sets Matrix to: | 0 0 0 | | 0 0 1 | ## -. #Param src Rect to map from ## #Param dst Rect to map to ## @@ -2936,7 +2906,6 @@ empty, returns Matrix set to: | 0 0 0 | | 0 0 1 | ## -. #Param src Rect to map from ## #Param dst Rect to map to ## @@ -3076,7 +3045,6 @@ Sets affine to: | 1 0 0 | | 0 1 0 | ## -. Affine 3x2 matrices in column major order are used by OpenGL and XPS. @@ -3111,7 +3079,6 @@ Fills affine in column major order. Sets affine to: | scale-x skew-x translate-x | | skew-y scale-y translate-y | ## -. If Matrix contains perspective, returns false and leaves affine unchanged. @@ -3162,7 +3129,6 @@ Matrix is set, row, then column, to: | skew-y scale-y translate-y | | 0 0 1 | ## -. #Param affine 3x2 affine matrix ## @@ -3227,7 +3193,6 @@ each dst Point is computed as: Matrix * pt = |D E F| |y| = |Ax+By+C Dx+Ey+F Gx+Hy+I| = ------- , ------- |G H I| |1| Gx+Hy+I Gx+Hy+I ## -. src and dst may point to the same storage. @@ -3287,7 +3252,6 @@ each resulting pts Point is computed as: Matrix * pt = |D E F| |y| = |Ax+By+C Dx+Ey+F Gx+Hy+I| = ------- , ------- |G H I| |1| Gx+Hy+I Gx+Hy+I ## -. #Param pts storage for mapped Points ## #Param count number of Points to transform ## @@ -3333,7 +3297,6 @@ each resulting dst Point is computed as: Matrix * src = |D E F| |y| = |Ax+By+Cz Dx+Ey+Fz Gx+Hy+Iz| |G H I| |z| ## -. #Param dst storage for mapped Point3 array ## #Param src Point3 array to transform ## @@ -3391,7 +3354,6 @@ result is computed as: Matrix * pt = |D E F| |y| = |Ax+By+C Dx+Ey+F Gx+Hy+I| = ------- , ------- |G H I| |1| Gx+Hy+I Gx+Hy+I ## -. #Param x x-axis value of Point to map ## #Param y y-axis value of Point to map ## @@ -3437,7 +3399,6 @@ result is computed as: Matrix * pt = |D E F| |y| = |Ax+By+C Dx+Ey+F Gx+Hy+I| = ------- , ------- |G H I| |1| Gx+Hy+I Gx+Hy+I ## -. #Param x x-axis value of Point to map ## #Param y y-axis value of Point to map ## @@ -3561,7 +3522,6 @@ each result Vector is computed as: Matrix * vec = |D E 0| |y| = |Ax+By Dx+Ey Gx+Hy+I| = ------- , ------- |G H I| |1| Gx+Hy+I Gx+Hy+I ## -. #Param vecs Vectors to transform, and storage for mapped Vectors ## #Param count number of Vectors to transform ## @@ -3610,7 +3570,6 @@ each result Vector is computed as: Matrix * vec = |D E 0| |dy| = |A*dx+B*dy D*dx+E*dy G*dx+H*dy+I| = ----------- , ----------- |G H I| | 1| G*dx+H*dy+I G*dx+*dHy+I ## -. #Param dx x-axis value of Vector to map ## #Param dy y-axis value of Vector to map ## @@ -3660,7 +3619,6 @@ each result Vector is computed as: Matrix * vec = |D E 0| |dy| = |A*dx+B*dy D*dx+E*dy G*dx+H*dy+I| = ----------- , ----------- |G H I| | 1| G*dx+H*dy+I G*dx+*dHy+I ## -. #Param dx x-axis value of Vector to map ## #Param dy y-axis value of Vector to map ## @@ -3810,7 +3768,6 @@ each dst Point is computed as: Matrix * pt = |D E F| |y| = |Ax+By+C Dx+Ey+F Gx+Hy+I| = ------- , ------- |G H I| |1| Gx+Hy+I Gx+Hy+I ## -. #Param dst storage for mapped corner Points ## #Param rect Rect to map ## @@ -4302,7 +4259,6 @@ Returns reference to const identity Matrix. Returned Matrix is set to: | 0 1 0 | | 0 0 1 | ## -. #Return const identity Matrix ## @@ -4337,7 +4293,6 @@ to: | SK_ScalarMax SK_ScalarMax SK_ScalarMax | | SK_ScalarMax SK_ScalarMax SK_ScalarMax | ## -. #Return const invalid Matrix ## @@ -4376,7 +4331,6 @@ sets Matrix to: a * b = | D E F | * | M N O | = | DJ+EM+FP DK+EN+FQ DL+EO+FR | | G H I | | P Q R | | GJ+HM+IP GK+HN+IQ GL+HO+IR | ## -. #Param a Matrix on left side of multiply expression ## #Param b Matrix on right side of multiply expression ## @@ -4449,7 +4403,6 @@ Initializes Matrix with scale and translate elements. | 0 sy ty | | 0 0 1 | ## -. #Param sx horizontal scale factor to store ## #Param sy vertical scale factor to store ## diff --git a/docs/SkRRect_Reference.bmh b/docs/SkRRect_Reference.bmh index 638e356a6b..4b1a403e14 100644 --- a/docs/SkRRect_Reference.bmh +++ b/docs/SkRRect_Reference.bmh @@ -4,24 +4,6 @@ #Class SkRRect -#Private -Path forward: - core work - add contains(SkRect&) - for clip stack - add contains(SkRRect&) - for clip stack - add heart rect computation (max rect inside RR) - add 9patch rect computation - add growToInclude(SkPath&) - analysis - use growToInclude to fit skp round rects & generate stats (RRs vs. real paths) - check on # of rectorus's the RRs could handle - rendering work - update SkPath.addRRect() to only use quads - add GM and bench - further out - detect and triangulate RRectorii rather than falling back to SW in Ganesh -## - SkRRect describes a rounded rectangle with a bounds and a pair of radii for each corner. The bounds and radii can be set so that SkRRect describes a rectangle with sharp corners, a Circle, an Oval, or a rectangle with one or more rounded corners. diff --git a/docs/SkSurface_Reference.bmh b/docs/SkSurface_Reference.bmh index a84a6dd1c2..1fc212264f 100644 --- a/docs/SkSurface_Reference.bmh +++ b/docs/SkSurface_Reference.bmh @@ -1250,7 +1250,6 @@ Does not copy, and returns false if: # Pixmap pixels could not be allocated. ## # dst.rowBytes() is too small to contain one row of pixels. ## ## -. #Param dst storage for pixels copied from Surface ## #Param srcX offset into readable pixels on x-axis; may be negative ## @@ -1310,7 +1309,6 @@ Does not copy, and returns false if: # Surface pixels could not be converted to dstInfo.colorType() or dstInfo.alphaType(). ## # dstRowBytes is too small to contain one row of pixels. ## ## -. #Param dstInfo width, height, Color_Type, and Alpha_Type of dstPixels ## #Param dstPixels storage for pixels; dstInfo.height() times dstRowBytes, or larger ## @@ -1377,7 +1375,6 @@ Does not copy, and returns false if: # dst pixels could not be allocated. ## # dst.rowBytes() is too small to contain one row of pixels. ## ## -. #Param dst storage for pixels copied from Surface ## #Param srcX offset into readable pixels on x-axis; may be negative ## diff --git a/docs/status.json b/docs/status.json index 2cdd6a5b05..6814f9cf88 100644 --- a/docs/status.json +++ b/docs/status.json @@ -3,6 +3,7 @@ "include": { "core": [ "SkBitmap.h", + "SkBlendMode.h", "SkCanvas.h", "SkColor.h", "SkImage.h", @@ -10,14 +11,17 @@ "SkMatrix.h", "SkPaint.h", "SkPath.h", + "SkPicture.h", "SkPixmap.h", "SkPoint.h", + "SkRRect.h", "SkRect.h", "SkSurface.h" ] }, "docs": [ "SkAutoCanvasRestore_Reference.bmh", + "SkBlendMode_Reference.bmh", "SkCanvas_Reference.bmh", "SkColor_Reference.bmh", "SkColor4f_Reference.bmh", @@ -27,6 +31,8 @@ "SkImage_Reference.bmh", "SkImageInfo_Reference.bmh", "SkPath_Reference.bmh", + "SkPicture_Reference.bmh", + "SkRRect_Reference.bmh", "SkRect_Reference.bmh", "SkBitmap_Reference.bmh", "SkIPoint_Reference.bmh", @@ -40,15 +46,9 @@ "InProgress": { "include": { "core": [ - "SkBlendMode.h", - "SkPicture.h", - "SkRRect.h" ] }, "docs": [ - "SkBlendMode_Reference.bmh", - "SkPicture_Reference.bmh", - "SkRRect_Reference.bmh", "overview.bmh", "usingBookmaker.bmh" ] diff --git a/site/user/api/SkBitmap_Reference.md b/site/user/api/SkBitmap_Reference.md index 625fdfbadf..8273397001 100644 --- a/site/user/api/SkBitmap_Reference.md +++ b/site/user/api/SkBitmap_Reference.md @@ -2058,8 +2058,6 @@ Calls <a href='#SkBitmap_reset'>reset</a> and returns false if: </tr> </table> -. - ### Parameters <table> <tr> <td><a name='SkBitmap_setInfo_imageInfo'><code><strong>imageInfo</strong></code></a></td> @@ -3400,8 +3398,6 @@ Input is not validated. Triggers an assert() if built with SK_DEBUG defined and: </tr> </table> -. - ### Parameters <table> <tr> <td><a name='SkBitmap_getAddr32_x'><code><strong>x</strong></code></a></td> @@ -3456,8 +3452,6 @@ Input is not validated. Triggers an assert() if built with SK_DEBUG defined and: </tr> </table> -. - ### Parameters <table> <tr> <td><a name='SkBitmap_getAddr16_x'><code><strong>x</strong></code></a></td> @@ -3512,8 +3506,6 @@ Input is not validated. Triggers an assert() if built with SK_DEBUG defined and: </tr> </table> -. - ### Parameters <table> <tr> <td><a name='SkBitmap_getAddr8_x'><code><strong>x</strong></code></a></td> @@ -3573,8 +3565,6 @@ Return false if: </tr> </table> -. - ### Parameters <table> <tr> <td><a name='SkBitmap_extractSubset_dst'><code><strong>dst</strong></code></a></td> @@ -3643,8 +3633,6 @@ row to the next. Returns true if pixels are copied. Returns false if: </tr> </table> -. - <a href='#Pixels'>Pixels</a> are copied only if pixel conversion is possible. If <a href='#Bitmap'>Bitmap</a> <a href='#SkBitmap_colorType'>colorType</a> is <a href='SkImageInfo_Reference#kGray_8_SkColorType'>kGray_8_SkColorType</a>, or <a href='SkImageInfo_Reference#kAlpha_8_SkColorType'>kAlpha_8_SkColorType</a>; <a href='#SkBitmap_readPixels_dstInfo'>dstInfo</a>.<a href='#SkBitmap_colorType'>colorType</a> must match. If <a href='#Bitmap'>Bitmap</a> <a href='#SkBitmap_colorType'>colorType</a> is <a href='SkImageInfo_Reference#kGray_8_SkColorType'>kGray_8_SkColorType</a>, <a href='#SkBitmap_readPixels_dstInfo'>dstInfo</a>.<a href='#SkBitmap_colorSpace'>colorSpace</a> must match. diff --git a/site/user/api/SkCanvas_Reference.md b/site/user/api/SkCanvas_Reference.md index c418c50897..75bf7645f8 100644 --- a/site/user/api/SkCanvas_Reference.md +++ b/site/user/api/SkCanvas_Reference.md @@ -1497,8 +1497,6 @@ Does not copy, and returns false if: </tr> </table> -. - ### Parameters <table> <tr> <td><a name='SkCanvas_readPixels_dstInfo'><code><strong>dstInfo</strong></code></a></td> @@ -1595,8 +1593,6 @@ Does not copy, and returns false if: </tr> </table> -. - ### Parameters <table> <tr> <td><a name='SkCanvas_readPixels_2_pixmap'><code><strong>pixmap</strong></code></a></td> @@ -1677,8 +1673,6 @@ Does not copy, and returns false if: </tr> </table> -. - ### Parameters <table> <tr> <td><a name='SkCanvas_readPixels_3_bitmap'><code><strong>bitmap</strong></code></a></td> @@ -1758,8 +1752,6 @@ Does not copy, and returns false if: </tr> </table> -. - ### Parameters <table> <tr> <td><a name='SkCanvas_writePixels_info'><code><strong>info</strong></code></a></td> @@ -1836,8 +1828,6 @@ Does not copy, and returns false if: </tr> </table> -. - ### Parameters <table> <tr> <td><a name='SkCanvas_writePixels_2_bitmap'><code><strong>bitmap</strong></code></a></td> diff --git a/site/user/api/SkMatrix_Reference.md b/site/user/api/SkMatrix_Reference.md index 617ccc8915..b780eb27e1 100644 --- a/site/user/api/SkMatrix_Reference.md +++ b/site/user/api/SkMatrix_Reference.md @@ -680,8 +680,6 @@ Sets <a href='#Matrix'>Matrix</a> to scale by (<a href='#SkMatrix_MakeScale_sx'> | 0 0 1 | </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_MakeScale_sx'><code><strong>sx</strong></code></a></td> @@ -720,8 +718,6 @@ Sets <a href='#Matrix'>Matrix</a> to <a href='#SkMatrix_MakeScale_2_scale'>scale | 0 0 1 | </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_MakeScale_2_scale'><code><strong>scale</strong></code></a></td> @@ -758,8 +754,6 @@ Sets <a href='#Matrix'>Matrix</a> to translate by (<a href='#SkMatrix_MakeTrans_ | 0 0 1 | </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_MakeTrans_dx'><code><strong>dx</strong></code></a></td> @@ -801,8 +795,6 @@ Sets <a href='#Matrix'>Matrix</a> to: | pers0 pers1 pers2 | </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_MakeAll_scaleX'><code><strong>scaleX</strong></code></a></td> @@ -1084,8 +1076,6 @@ Returns true if <a href='#Matrix'>Matrix</a> is identity. Identity matrix is: | 0 0 1 | </pre> -. - ### Return Value true if <a href='#Matrix'>Matrix</a> has no effect @@ -1125,8 +1115,6 @@ contain only scale elements, only translate elements, or both. <a href='#Matrix' | 0 0 1 | </pre> -. - ### Return Value true if <a href='#Matrix'>Matrix</a> is identity; or scales, translates, or both @@ -1167,8 +1155,6 @@ Returns true if <a href='#Matrix'>Matrix</a> is identity, or translates. <a href | 0 0 1 | </pre> -. - ### Return Value true if <a href='#Matrix'>Matrix</a> is identity, or translates @@ -2486,8 +2472,6 @@ Sets all values from parameters. Sets matrix to: | persp0 persp1 persp2 | </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_setAll_scaleX'><code><strong>scaleX</strong></code></a></td> @@ -2586,8 +2570,6 @@ Sets matrix to: | buffer[6] buffer[7] buffer[8] | </pre> -. - In the future, <a href='#SkMatrix_set9'>set9</a> followed by <a href='#SkMatrix_get9'>get9</a> may not return the same values. Since <a href='#Matrix'>Matrix</a> maps non-homogeneous coordinates, scaling all nine values produces an equivalent transformation, possibly improving precision. @@ -2624,8 +2606,6 @@ Sets <a href='#Matrix'>Matrix</a> to identity; which has no effect on mapped <a | 0 0 1 | </pre> -. - Also called <a href='#SkMatrix_setIdentity'>setIdentity</a>; use the one that provides better inline documentation. @@ -2662,8 +2642,6 @@ Sets <a href='#Matrix'>Matrix</a> to identity; which has no effect on mapped <a | 0 0 1 | </pre> -. - Also called <a href='#SkMatrix_reset'>reset</a>; use the one that provides better inline documentation. @@ -3059,8 +3037,6 @@ a * b = | D E F | * | M N O | = | DJ+EM+FP DK+EN+FQ DL+EO+FR | | G H I | | P Q R | | GJ+HM+IP GK+HN+IQ GL+HO+IR | </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_setConcat_a'><code><strong>a</strong></code></a></td> @@ -3109,8 +3085,6 @@ Matrix * T(dx, dy) = | D E F | | 0 1 dy | = | D E D*dx+E*dy+F | | G H I | | 0 0 1 | | G H G*dx+H*dy+I | </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_preTranslate_dx'><code><strong>dx</strong></code></a></td> @@ -3165,8 +3139,6 @@ Matrix * S(sx, sy, px, py) = | D E F | | 0 sy dy | = | D*sx E*sy D*dx+E*dy+F | | G H I | | 0 0 1 | | G*sx H*sy G*dx+H*dy+I | </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_preScale_sx'><code><strong>sx</strong></code></a></td> @@ -3219,8 +3191,6 @@ Matrix * S(sx, sy) = | D E F | | 0 sy 0 | = | D*sx E*sy F | | G H I | | 0 0 1 | | G*sx H*sy I | </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_preScale_2_sx'><code><strong>sx</strong></code></a></td> @@ -3279,8 +3249,6 @@ Matrix * R(degrees, px, py) = | D E F | | s c dy | = | Dc+Es -Ds+Ec D*dx+E*dy+F | G H I | | 0 0 1 | | Gc+Hs -Gs+Hc G*dx+H*dy+I | </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_preRotate_degrees'><code><strong>degrees</strong></code></a></td> @@ -3339,8 +3307,6 @@ Matrix * R(degrees, px, py) = | D E F | | s c 0 | = | Dc+Es -Ds+Ec F | | G H I | | 0 0 1 | | Gc+Hs -Gs+Hc I | </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_preRotate_2_degrees'><code><strong>degrees</strong></code></a></td> @@ -3392,8 +3358,6 @@ Matrix * K(kx, ky, px, py) = | D E F | | ky 1 dy | = | D+E*ky D*kx+E D*dx+E*dy+ | G H I | | 0 0 1 | | G+H*ky G*kx+H G*dx+H*dy+I | </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_preSkew_kx'><code><strong>kx</strong></code></a></td> @@ -3446,8 +3410,6 @@ Matrix * K(kx, ky) = | D E F | | ky 1 0 | = | D+E*ky D*kx+E F | | G H I | | 0 0 1 | | G+H*ky G*kx+H I | </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_preSkew_2_kx'><code><strong>kx</strong></code></a></td> @@ -3494,8 +3456,6 @@ Matrix * other = | D E F | * | M N O | = | DJ+EM+FP DK+EN+FQ DL+EO+FR | | G H I | | P Q R | | GJ+HM+IP GK+HN+IQ GL+HO+IR | </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_preConcat_other'><code><strong>other</strong></code></a></td> @@ -3541,8 +3501,6 @@ T(dx, dy) * Matrix = | 0 1 dy | | M N O | = | M+dy*P N+dy*Q O+dy*R | | 0 0 1 | | P Q R | | P Q R | </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_postTranslate_dx'><code><strong>dx</strong></code></a></td> @@ -3598,8 +3556,6 @@ S(sx, sy, px, py) * Matrix = | 0 sy dy | | M N O | = | sy*M+dy*P sy*N+dy*Q sy*O | 0 0 1 | | P Q R | | P Q R | </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_postScale_sx'><code><strong>sx</strong></code></a></td> @@ -3652,8 +3608,6 @@ S(sx, sy) * Matrix = | 0 sy 0 | | M N O | = | sy*M sy*N sy*O | | 0 0 1 | | P Q R | | P Q R | </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_postScale_2_sx'><code><strong>sx</strong></code></a></td> @@ -3709,8 +3663,6 @@ I(divx, divy) * Matrix = | 0 sy 0 | | M N O | = | sy*M sy*N sy*O | | 0 0 1 | | P Q R | | P Q R | </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_postIDiv_divx'><code><strong>divx</strong></code></a></td> @@ -3773,8 +3725,6 @@ R(degrees, px, py) * Matrix = |s c dy| |M N O| = |sJ+cM+dy*P sK+cN+dy*Q sL+cO+d |0 0 1| |P Q R| | P Q R| </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_postRotate_degrees'><code><strong>degrees</strong></code></a></td> @@ -3833,8 +3783,6 @@ R(degrees, px, py) * Matrix = | s c dy | | M N O | = | sJ+cM sK+cN sL+cO | | 0 0 1 | | P Q R | | P Q R | </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_postRotate_2_degrees'><code><strong>degrees</strong></code></a></td> @@ -3886,8 +3834,6 @@ K(kx, ky, px, py) * Matrix = |ky 1 dy| |M N O| = |ky*J+M+dy*P ky*K+N+dy*Q ky*L+ | 0 0 1| |P Q R| | P Q R| </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_postSkew_kx'><code><strong>kx</strong></code></a></td> @@ -3940,8 +3886,6 @@ K(kx, ky) * Matrix = | ky 1 0 | | M N O | = | ky*J+M ky*K+N ky*L+O | | 0 0 1 | | P Q R | | P Q R | </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_postSkew_2_kx'><code><strong>kx</strong></code></a></td> @@ -3988,8 +3932,6 @@ other * Matrix = | D E F | * | M N O | = | DJ+EM+FP DK+EN+FQ DL+EO+FR | | G H I | | P Q R | | GJ+HM+IP GK+HN+IQ GL+HO+IR | </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_postConcat_other'><code><strong>other</strong></code></a></td> @@ -4093,8 +4035,6 @@ Returns true if <a href='#SkMatrix_setRectToRect_dst'>dst</a> is empty, and sets | 0 0 1 | </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_setRectToRect_src'><code><strong>src</strong></code></a></td> @@ -4156,8 +4096,6 @@ empty, returns <a href='#Matrix'>Matrix</a> set to: | 0 0 1 | </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_MakeRectToRect_src'><code><strong>src</strong></code></a></td> @@ -4291,8 +4229,6 @@ Sets <a href='#SkMatrix_SetAffineIdentity_affine'>affine</a> to: | 0 1 0 | </pre> -. - Affine 3x2 matrices in column major order are used by OpenGL and XPS. ### Parameters @@ -4334,8 +4270,6 @@ Fills <a href='#SkMatrix_asAffine_affine'>affine</a> in column major order. Sets | skew-y scale-y translate-y | </pre> -. - If <a href='#Matrix'>Matrix</a> contains perspective, returns false and leaves <a href='#SkMatrix_asAffine_affine'>affine</a> unchanged. ### Parameters @@ -4390,8 +4324,6 @@ column, then row, as: | 0 0 1 | </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_setAffine_affine'><code><strong>affine</strong></code></a></td> @@ -4539,8 +4471,6 @@ Matrix * pt = |D E F| |y| = |Ax+By+C Dx+Ey+F Gx+Hy+I| = ------- , ------- |G H I| |1| Gx+Hy+I Gx+Hy+I </pre> -. - <a href='#SkMatrix_mapPoints_src'>src</a> and <a href='#SkMatrix_mapPoints_dst'>dst</a> may point to the same storage. ### Parameters @@ -4598,8 +4528,6 @@ Matrix * pt = |D E F| |y| = |Ax+By+C Dx+Ey+F Gx+Hy+I| = ------- , ------- |G H I| |1| Gx+Hy+I Gx+Hy+I </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_mapPoints_2_pts'><code><strong>pts</strong></code></a></td> @@ -4644,8 +4572,6 @@ Matrix * src = |D E F| |y| = |Ax+By+Cz Dx+Ey+Fz Gx+Hy+Iz| |G H I| |z| </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_mapHomogeneousPoints_dst'><code><strong>dst</strong></code></a></td> @@ -4692,8 +4618,6 @@ Matrix * pt = |D E F| |y| = |Ax+By+C Dx+Ey+F Gx+Hy+I| = ------- , ------- |G H I| |1| Gx+Hy+I Gx+Hy+I </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_mapXY_x'><code><strong>x</strong></code></a></td> @@ -4739,8 +4663,6 @@ Matrix * pt = |D E F| |y| = |Ax+By+C Dx+Ey+F Gx+Hy+I| = ------- , ------- |G H I| |1| Gx+Hy+I Gx+Hy+I </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_mapXY_2_x'><code><strong>x</strong></code></a></td> @@ -4856,8 +4778,6 @@ Matrix * vec = |D E 0| |y| = |Ax+By Dx+Ey Gx+Hy+I| = ------- , ------- |G H I| |1| Gx+Hy+I Gx+Hy+I </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_mapVectors_2_vecs'><code><strong>vecs</strong></code></a></td> @@ -4902,8 +4822,6 @@ Matrix * vec = |D E 0| |dy| = |A*dx+B*dy D*dx+E*dy G*dx+H*dy+I| = ----------- , |G H I| | 1| G*dx+H*dy+I G*dx+*dHy+I </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_mapVector_dx'><code><strong>dx</strong></code></a></td> @@ -4950,8 +4868,6 @@ Matrix * vec = |D E 0| |dy| = |A*dx+B*dy D*dx+E*dy G*dx+H*dy+I| = ----------- , |G H I| | 1| G*dx+H*dy+I G*dx+*dHy+I </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_mapVector_2_dx'><code><strong>dx</strong></code></a></td> @@ -5106,8 +5022,6 @@ Matrix * pt = |D E F| |y| = |Ax+By+C Dx+Ey+F Gx+Hy+I| = ------- , ------- |G H I| |1| Gx+Hy+I Gx+Hy+I </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_mapRectToQuad_dst'><code><strong>dst</strong></code></a></td> @@ -5629,8 +5543,6 @@ Returns reference to const identity <a href='#Matrix'>Matrix</a>. Returned <a hr | 0 0 1 | </pre> -. - ### Return Value const identity <a href='#Matrix'>Matrix</a> @@ -5670,8 +5582,6 @@ to: | SK_ScalarMax SK_ScalarMax SK_ScalarMax | </pre> -. - ### Return Value const invalid <a href='#Matrix'>Matrix</a> @@ -5719,8 +5629,6 @@ a * b = | D E F | * | M N O | = | DJ+EM+FP DK+EN+FQ DL+EO+FR | | G H I | | P Q R | | GJ+HM+IP GK+HN+IQ GL+HO+IR | </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_Concat_a'><code><strong>a</strong></code></a></td> @@ -5793,8 +5701,6 @@ Initializes <a href='#Matrix'>Matrix</a> with scale and translate elements. | 0 0 1 | </pre> -. - ### Parameters <table> <tr> <td><a name='SkMatrix_setScaleTranslate_sx'><code><strong>sx</strong></code></a></td> diff --git a/site/user/api/SkSurface_Reference.md b/site/user/api/SkSurface_Reference.md index c1fbe929dc..387c6cbae6 100644 --- a/site/user/api/SkSurface_Reference.md +++ b/site/user/api/SkSurface_Reference.md @@ -1627,8 +1627,6 @@ Does not copy, and returns false if: </tr> </table> -. - ### Parameters <table> <tr> <td><a name='SkSurface_readPixels_dst'><code><strong>dst</strong></code></a></td> @@ -1690,8 +1688,6 @@ Does not copy, and returns false if: </tr> </table> -. - ### Parameters <table> <tr> <td><a name='SkSurface_readPixels_2_dstInfo'><code><strong>dstInfo</strong></code></a></td> @@ -1764,8 +1760,6 @@ Does not copy, and returns false if: </tr> </table> -. - ### Parameters <table> <tr> <td><a name='SkSurface_readPixels_3_dst'><code><strong>dst</strong></code></a></td> diff --git a/tools/bookmaker/bookmaker.h b/tools/bookmaker/bookmaker.h index 24d56176aa..c695cff0e8 100644 --- a/tools/bookmaker/bookmaker.h +++ b/tools/bookmaker/bookmaker.h @@ -920,6 +920,7 @@ public: return (int) (fContentEnd - fContentStart); } + const char* methodEnd() const; bool methodHasReturn(string name, TextParser* methodParser) const; string methodName() const; bool nextMethodParam(TextParser* methodParser, const char** nextEndPtr, diff --git a/tools/bookmaker/definition.cpp b/tools/bookmaker/definition.cpp index 056e4f7fe4..228f898fe1 100644 --- a/tools/bookmaker/definition.cpp +++ b/tools/bookmaker/definition.cpp @@ -533,11 +533,14 @@ bool Definition::checkMethod() const { // check after end of #Line and before next child for description const char* descStart = fContentStart; const char* descEnd = nullptr; + const Definition* defEnd = nullptr; + const Definition* priorDef = nullptr; for (auto& child : fChildren) { if (MarkType::kAnchor == child->fMarkType) { continue; } if (MarkType::kCode == child->fMarkType) { + priorDef = child; continue; } if (MarkType::kDeprecated == child->fMarkType) { @@ -550,6 +553,7 @@ bool Definition::checkMethod() const { continue; } if (MarkType::kList == child->fMarkType) { + priorDef = child; continue; } if (MarkType::kMarkChar == child->fMarkType) { @@ -565,10 +569,12 @@ bool Definition::checkMethod() const { if (!emptyCheck.eof() && emptyCheck.skipWhiteSpace()) { descStart = emptyCheck.fChar; emptyCheck.trimEnd(); + defEnd = priorDef; descEnd = emptyCheck.fEnd; break; } descStart = child->fTerminator; + priorDef = nullptr; } if (!descEnd) { return methodParser.reportError<bool>("missing description"); @@ -579,7 +585,9 @@ bool Definition::checkMethod() const { if (!isupper(descStart[0])) { description.reportWarning("expected capital"); } else if ('.' != descEnd[-1]) { - description.reportWarning("expected period"); + if (!defEnd || defEnd->fTerminator != descEnd) { + description.reportWarning("expected period"); + } } else { if (!description.startsWith("For use by Android")) { description.skipToSpace(); @@ -619,10 +627,21 @@ bool Definition::crossCheck(const Definition& includeToken) const { return crossCheckInside(fContentStart, fContentEnd, includeToken); } +const char* Definition::methodEnd() const { + const char defaultTag[] = " = default"; + size_t tagSize = sizeof(defaultTag) - 1; + const char* tokenEnd = fContentEnd - tagSize; + if (tokenEnd <= fContentStart || strncmp(tokenEnd, defaultTag, tagSize)) { + tokenEnd = fContentEnd; + } + return tokenEnd; +} + bool Definition::crossCheckInside(const char* start, const char* end, const Definition& includeToken) const { TextParser def(fFileName, start, end, fLineCount); - TextParser inc("", includeToken.fContentStart, includeToken.fContentEnd, 0); + const char* tokenEnd = includeToken.methodEnd(); + TextParser inc("", includeToken.fContentStart, tokenEnd, 0); if (inc.startsWith("SK_API")) { inc.skipWord("SK_API"); } diff --git a/tools/bookmaker/includeParser.cpp b/tools/bookmaker/includeParser.cpp index 238fcf5109..fc378ddb45 100644 --- a/tools/bookmaker/includeParser.cpp +++ b/tools/bookmaker/includeParser.cpp @@ -305,9 +305,10 @@ bool IncludeParser::crossCheck(BmhParser& bmhParser) { if (!def) { int skip = !strncmp(token.fContentStart, "explicit ", 9) ? 9 : 0; skip = !strncmp(token.fContentStart, "virtual ", 8) ? 8 : skip; + const char* tokenEnd = token.methodEnd(); string constructorName = className + "::"; constructorName += string(token.fContentStart + skip, - token.fContentEnd - token.fContentStart - skip); + tokenEnd - token.fContentStart - skip); def = root->find(constructorName, RootDefinition::AllowParens::kYes); } if (!def && 0 == token.fName.find("SK_")) { @@ -1860,6 +1861,9 @@ bool IncludeParser::parseMethod(Definition* child, Definition* markupDef) { tokenIter = operatorCheck; } string nameStr(tokenIter->fStart, nameEnd - tokenIter->fStart); + if (string::npos != nameStr.find("sizeof")) { + SkDebugf(""); + } if (addConst) { nameStr += "_const"; } @@ -2077,6 +2081,9 @@ bool IncludeParser::parseObject(Definition* child, Definition* markupDef) { break; } } + if (previousToken.startsWith("sizeof") && 6 == previousToken.lineLength()) { + break; + } } if (fPriorObject && MarkType::kConst == fPriorObject->fMarkType) { break; diff --git a/tools/bookmaker/includeWriter.cpp b/tools/bookmaker/includeWriter.cpp index e16da320eb..922f2200a9 100644 --- a/tools/bookmaker/includeWriter.cpp +++ b/tools/bookmaker/includeWriter.cpp @@ -436,6 +436,9 @@ void IncludeWriter::enumHeaderOut(RootDefinition* root, const Definition& child) enumDef = &mapEntry->second; } } + if (!enumDef && enumName == root->fName) { + enumDef = root; + } SkASSERT(enumDef); // child[0] should be #Code comment starts at child[0].fTerminator // though skip until #Code is found (in case there's a #ToDo, etc) @@ -1464,7 +1467,13 @@ bool IncludeWriter::populate(Definition* def, ParentPair* prevPair, RootDefiniti while (continueEnd > fContinuation && isspace(continueEnd[-1])) { --continueEnd; } - methodName += string(fContinuation, continueEnd - fContinuation); + const char defaultTag[] = " = default"; + size_t tagSize = sizeof(defaultTag) - 1; + const char* tokenEnd = continueEnd - tagSize; + if (tokenEnd <= fContinuation || strncmp(tokenEnd, defaultTag, tagSize)) { + tokenEnd = continueEnd; + } + methodName += string(fContinuation, tokenEnd - fContinuation); if (string::npos != methodName.find('\n')) { methodName.erase(std::remove(methodName.begin(), methodName.end(), '\n'), methodName.end()); |