AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sanitizing source files in Housekeeper-Nightly

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@11017 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2013-08-30 07:01:34 +00:00
parent e029440758
commit 772c4e6d09
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/core/SkDevice.h
View File

@ -89,7 +89,7 @@ public:
implicitly opaque.
*/
virtual bool isOpaque() const = 0;
/** DEPRECATED - Return the bitmap config of the device's pixels
*/
virtual SkBitmap::Config config() const = 0;
@ -316,7 +316,7 @@ protected:
///////////////////////////////////////////////////////////////////////////
/** Update as needed the pixel value in the bitmap, so that the caller can
access the pixels directly.
access the pixels directly.
@return The device contents as a bitmap
*/
virtual const SkBitmap& onAccessBitmap() = 0;

6
src/core/SkDevice.cpp
View File

@ -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()));
}

36
src/utils/SkMatrix44.cpp
View File

@ -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];
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;

2
tests/ReadPixelsTest.cpp
View File

@ -313,7 +313,7 @@ void ReadPixelsTest(skiatest::Reporter* reporter, GrContextFactory* factory) {
for (int glCtxType = 0; glCtxType < glCtxTypeCnt; ++glCtxType) {
SkAutoTUnref<SkBaseDevice> device;
if (0 == dtype) {
device.reset(new SkBitmapDevice(SkBitmap::kARGB_8888_Config,
device.reset(new SkBitmapDevice(SkBitmap::kARGB_8888_Config,
DEV_W, DEV_H, false));
} else {
#if SK_SUPPORT_GPU