Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk/src@11017 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/core/SkDevice.cpp b/core/SkDevice.cpp
index 69b0f6a..ff2f1cf 100644
--- a/core/SkDevice.cpp
+++ b/core/SkDevice.cpp
@@ -26,13 +26,13 @@
///////////////////////////////////////////////////////////////////////////////
-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 @@
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/utils/SkMatrix44.cpp b/utils/SkMatrix44.cpp
index 82b171b..1e48f39 100644
--- a/utils/SkMatrix44.cpp
+++ b/utils/SkMatrix44.cpp
@@ -491,26 +491,26 @@
return false;
}
- 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;
+ if (inverse) {
+ double invXScale = 1 / fMat[0][0];
+ double invYScale = 1 / fMat[1][1];
+ double invZScale = 1 / fMat[2][2];
- 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][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[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;
