aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-08-30 07:01:34 +0000
committerGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-08-30 07:01:34 +0000
commit772c4e6d09f5e0971a584d2035ee789483d6f47a (patch)
tree3442e426b82d65475b7c4a1de619afe6fa9cd171 /src
parente02944075840d672bd1797f3d945ff82d302282f (diff)
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@11017 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
-rw-r--r--src/core/SkDevice.cpp6
-rw-r--r--src/utils/SkMatrix44.cpp36
2 files changed, 21 insertions, 21 deletions
diff --git a/src/core/SkDevice.cpp b/src/core/SkDevice.cpp
index 69b0f6afa1..ff2f1cf227 100644
--- a/src/core/SkDevice.cpp
+++ b/src/core/SkDevice.cpp
@@ -26,13 +26,13 @@ SK_DEFINE_INST_COUNT(SkBitmapDevice)
///////////////////////////////////////////////////////////////////////////////
-SkBitmapDevice::SkBitmapDevice(const SkBitmap& bitmap)
+SkBitmapDevice::SkBitmapDevice(const SkBitmap& bitmap)
: fBitmap(bitmap) {
SkASSERT(SkBitmap::kARGB_4444_Config != bitmap.config());
}
SkBaseDevice::SkBaseDevice()
- : fLeakyProperties(SkDeviceProperties::MakeDefault())
+ : fLeakyProperties(SkDeviceProperties::MakeDefault())
#ifdef SK_DEBUG
, fAttachedToCanvas(false)
#endif
@@ -109,7 +109,7 @@ SkBaseDevice* SkBitmapDevice::onCreateCompatibleDevice(SkBitmap::Config config,
int width, int height,
bool isOpaque,
Usage usage) {
- return SkNEW_ARGS(SkBitmapDevice,(config, width, height, isOpaque,
+ return SkNEW_ARGS(SkBitmapDevice,(config, width, height, isOpaque,
this->getDeviceProperties()));
}
diff --git a/src/utils/SkMatrix44.cpp b/src/utils/SkMatrix44.cpp
index 82b171ba2d..1e48f393ac 100644
--- a/src/utils/SkMatrix44.cpp
+++ b/src/utils/SkMatrix44.cpp
@@ -491,26 +491,26 @@ bool SkMatrix44::invert(SkMatrix44* inverse) const {
return false;
}
- if (inverse) {
- double invXScale = 1 / fMat[0][0];
- double invYScale = 1 / fMat[1][1];
- double invZScale = 1 / fMat[2][2];
-
+ if (inverse) {
+ double invXScale = 1 / fMat[0][0];
+ double invYScale = 1 / fMat[1][1];
+ double invZScale = 1 / fMat[2][2];
+
inverse->fMat[0][0] = invXScale;
- inverse->fMat[0][1] = 0;
- inverse->fMat[0][2] = 0;
- inverse->fMat[0][3] = 0;
-
- inverse->fMat[1][0] = 0;
- inverse->fMat[1][1] = invYScale;
- inverse->fMat[1][2] = 0;
- inverse->fMat[1][3] = 0;
-
- inverse->fMat[2][0] = 0;
+ inverse->fMat[0][1] = 0;
+ inverse->fMat[0][2] = 0;
+ inverse->fMat[0][3] = 0;
+
+ inverse->fMat[1][0] = 0;
+ inverse->fMat[1][1] = invYScale;
+ inverse->fMat[1][2] = 0;
+ inverse->fMat[1][3] = 0;
+
+ inverse->fMat[2][0] = 0;
inverse->fMat[2][1] = 0;
- inverse->fMat[2][2] = invZScale;
- inverse->fMat[2][3] = 0;
-
+ inverse->fMat[2][2] = invZScale;
+ inverse->fMat[2][3] = 0;
+
inverse->fMat[3][0] = -fMat[3][0] * invXScale;
inverse->fMat[3][1] = -fMat[3][1] * invYScale;
inverse->fMat[3][2] = -fMat[3][2] * invZScale;