diff options
| author |  Cary Clark <caryclark@skia.org> | 2017-09-19 08:34:12 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-19 13:54:59 +0000 |
| commit | 721aed27ac31a5171dca5609b962efe7b59a0649 (patch) | |
| tree | bf624881d92da8cb6b3fbf1fe02d2d02f5dc0a32 /include/core/SkMatrix.h | |
| parent | 4e8dc171f6dfc31547f7a8b057c7d90571d77b8d (diff) | |
minor changes to SkMatrix.h and SkRect.h
Add missing param names so doxygen comments have
something to reference.
Add commas for all members in enums for
consistency across includes.
TBR=reed@google.com
Bug: skia: 6898
Change-Id: Ida92ed6144430072d52846001b2f618043b5b480
Reviewed-on: https://skia-review.googlesource.com/48046
Commit-Queue: Cary Clark <caryclark@skia.org>
Reviewed-by: Cary Clark <caryclark@skia.org>
Diffstat (limited to 'include/core/SkMatrix.h')
| -rw-r--r-- | include/core/SkMatrix.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/core/SkMatrix.h b/include/core/SkMatrix.h index e6a957689e..2e09f4d37c 100644 --- a/include/core/SkMatrix.h +++ b/include/core/SkMatrix.h @@ -53,7 +53,7 @@ public: kTranslate_Mask = 0x01, //!< set if the matrix has translation kScale_Mask = 0x02, //!< set if the matrix has X or Y scale kAffine_Mask = 0x04, //!< set if the matrix skews or rotates - kPerspective_Mask = 0x08 //!< set if the matrix is in perspective + kPerspective_Mask = 0x08, //!< set if the matrix is in perspective }; /** Returns a bitfield describing the transformations the matrix may @@ -123,7 +123,7 @@ public: kMTransY, kMPersp0, kMPersp1, - kMPersp2 + kMPersp2, }; /** Affine arrays are in column major order @@ -135,7 +135,7 @@ public: kASkewX, kAScaleY, kATransX, - kATransY + kATransY, }; SkScalar operator[](int index) const { @@ -251,7 +251,7 @@ public: */ void setSinCos(SkScalar sinValue, SkScalar cosValue); - SkMatrix& setRSXform(const SkRSXform&); + SkMatrix& setRSXform(const SkRSXform& rsxForm); /** Set the matrix to skew by sx and sy, with a pivot point at (px, py). The pivot point is the coordinate that should remain unchanged by the @@ -362,7 +362,7 @@ public: * axis (X or Y) will fit exactly. kEnd aligns the result to the * right and bottom edges of dst. */ - kEnd_ScaleToFit + kEnd_ScaleToFit, }; /** Set the matrix to the scale and translate values that map the source @@ -631,7 +631,7 @@ public: enum { // writeTo/readFromMemory will never return a value larger than this - kMaxFlattenSize = 9 * sizeof(SkScalar) + sizeof(uint32_t) + kMaxFlattenSize = 9 * sizeof(SkScalar) + sizeof(uint32_t), }; // return the number of bytes written, whether or not buffer is null size_t writeToMemory(void* buffer) const; @@ -646,7 +646,7 @@ public: size_t readFromMemory(const void* buffer, size_t length); void dump() const; - void toString(SkString*) const; + void toString(SkString* str) const; /** * Calculates the minimum scaling factor of the matrix as computed from the SVD of the upper @@ -771,7 +771,7 @@ private: kScale_Mask | kAffine_Mask | kPerspective_Mask | - kRectStaysRect_Mask + kRectStaysRect_Mask, }; SkScalar fMat[9]; |