diff options
| -rw-r--r-- | include/core/SkMatrix.h | 16 | ||||
| -rw-r--r-- | include/core/SkRect.h | 10 |
2 files changed, 16 insertions, 10 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]; diff --git a/include/core/SkRect.h b/include/core/SkRect.h index ea09c6bcba..bd496e304d 100644 --- a/include/core/SkRect.h +++ b/include/core/SkRect.h @@ -19,7 +19,10 @@ struct SkRect; SkIRect holds four 32 bit integer coordinates for a rectangle */ struct SK_API SkIRect { - int32_t fLeft, fTop, fRight, fBottom; + int32_t fLeft; + int32_t fTop; + int32_t fRight; + int32_t fBottom; static SkIRect SK_WARN_UNUSED_RESULT MakeEmpty() { SkIRect r; @@ -403,7 +406,10 @@ struct SK_API SkIRect { /** \struct SkRect */ struct SK_API SkRect { - SkScalar fLeft, fTop, fRight, fBottom; + SkScalar fLeft; + SkScalar fTop; + SkScalar fRight; + SkScalar fBottom; static constexpr SkRect SK_WARN_UNUSED_RESULT MakeEmpty() { return SkRect{0, 0, 0, 0}; |