diff options
author | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-12-04 02:01:25 +0000 |
---|---|---|
committer | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-12-04 02:01:25 +0000 |
commit | e659c2e820de0b8d12d81247ed4430022ded0a90 (patch) | |
tree | ba9373b0f5e094c78cee6deb3faa72cdcd3e68f4 /src | |
parent | b8b8ba01f0d52d598e88798f7f90ed3bcc648e23 (diff) |
Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@6660 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
-rw-r--r-- | src/core/SkTLList.h | 2 | ||||
-rw-r--r-- | src/utils/SkMatrix44.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/core/SkTLList.h b/src/core/SkTLList.h index bf7c93b781..87fd52d32e 100644 --- a/src/core/SkTLList.h +++ b/src/core/SkTLList.h @@ -62,7 +62,7 @@ public: } } } - + void addToHead(const T& t) { this->validate(); Node* node = this->createNode(); diff --git a/src/utils/SkMatrix44.cpp b/src/utils/SkMatrix44.cpp index 489a550ed7..7982c3088b 100644 --- a/src/utils/SkMatrix44.cpp +++ b/src/utils/SkMatrix44.cpp @@ -62,7 +62,7 @@ bool SkMatrix44::operator==(const SkMatrix44& other) const { int SkMatrix44::computeTypeMask() const { unsigned mask = 0; - + if (0 != perspX() || 0 != perspY() || 0 != perspZ() || 1 != fMat[3][3]) { return kTranslate_Mask | kScale_Mask | kAffine_Mask | kPerspective_Mask; } @@ -214,7 +214,7 @@ void SkMatrix44::setTranslate(SkMScalar tx, SkMScalar ty, SkMScalar tz) { fMat[3][1] = ty; fMat[3][2] = tz; fMat[3][3] = 1; - + int mask = kIdentity_Mask; if (0 != tx || 0 != ty || 0 != tz) { mask |= kTranslate_Mask; @@ -243,7 +243,7 @@ void SkMatrix44::setScale(SkMScalar sx, SkMScalar sy, SkMScalar sz) { fMat[1][1] = sy; fMat[2][2] = sz; fMat[3][3] = 1; - + int mask = kIdentity_Mask; if (0 != sx || 0 != sy || 0 != sz) { mask |= kScale_Mask; @@ -485,7 +485,7 @@ void SkMatrix44::mapScalars(const SkScalar src[4], SkScalar dst[4]) const { } result[i] = SkMScalarToScalar(value); } - + if (storage == result) { memcpy(dst, storage, sizeof(storage)); } @@ -496,7 +496,7 @@ void SkMatrix44::mapScalars(const SkScalar src[4], SkScalar dst[4]) const { void SkMatrix44::mapMScalars(const SkMScalar src[4], SkMScalar dst[4]) const { SkMScalar storage[4]; SkMScalar* result = (src == dst) ? storage : dst; - + for (int i = 0; i < 4; i++) { SkMScalar value = 0; for (int j = 0; j < 4; j++) { @@ -504,7 +504,7 @@ void SkMatrix44::mapMScalars(const SkMScalar src[4], SkMScalar dst[4]) const { } result[i] = value; } - + if (storage == result) { memcpy(dst, storage, sizeof(storage)); } |