aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-03-15 07:05:19 +0000
committerGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-03-15 07:05:19 +0000
commitc49cabfe5cddc1691a00f713ae1b077d9409389f (patch)
tree3af07b65a50ff28073c8ca6bcbb9fc5f7ecf6395 /src
parent2bbc0e11824df0ddf04b5cab65707f267a7168e3 (diff)
Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@8168 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
-rw-r--r--src/core/SkTypefacePriv.h2
-rw-r--r--src/images/SkImageDecoder.cpp4
-rw-r--r--src/images/SkImageDecoder_libgif.cpp2
-rw-r--r--src/images/SkImageDecoder_wbmp.cpp2
-rw-r--r--src/ports/SkFontHost_win_dw.cpp2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/core/SkTypefacePriv.h b/src/core/SkTypefacePriv.h
index 2f48372b0e..dc993d0890 100644
--- a/src/core/SkTypefacePriv.h
+++ b/src/core/SkTypefacePriv.h
@@ -27,7 +27,7 @@ static inline SkTypeface* ref_or_default(SkTypeface* face) {
class SkAutoResolveDefaultTypeface : public SkAutoTUnref<SkTypeface> {
public:
SkAutoResolveDefaultTypeface() : INHERITED(SkTypeface::RefDefault()) {}
-
+
SkAutoResolveDefaultTypeface(SkTypeface* face)
: INHERITED(ref_or_default(face)) {}
diff --git a/src/images/SkImageDecoder.cpp b/src/images/SkImageDecoder.cpp
index 1e3b03929f..3999dcc2d6 100644
--- a/src/images/SkImageDecoder.cpp
+++ b/src/images/SkImageDecoder.cpp
@@ -188,8 +188,8 @@ bool SkImageDecoder::buildTileIndex(SkStream* stream,
}
void SkImageDecoder::cropBitmap(SkBitmap *dst, SkBitmap *src, int sampleSize,
- int dstX, int dstY, int width, int height,
- int srcX, int srcY) {
+ int dstX, int dstY, int width, int height,
+ int srcX, int srcY) {
int w = width / sampleSize;
int h = height / sampleSize;
// if the destination has no pixels then we must allocate them.
diff --git a/src/images/SkImageDecoder_libgif.cpp b/src/images/SkImageDecoder_libgif.cpp
index 02bc67b7de..3e4cda8a0b 100644
--- a/src/images/SkImageDecoder_libgif.cpp
+++ b/src/images/SkImageDecoder_libgif.cpp
@@ -204,7 +204,7 @@ bool SkGIFImageDecoder::onDecode(SkStream* sk_stream, SkBitmap* bm, Mode mode) {
width, height)) {
return error_return(gif, *bm, "chooseFromOneChoice");
}
-
+
if (SkImageDecoder::kDecodeBounds_Mode == mode) {
bm->setConfig(SkBitmap::kIndex8_Config, width, height);
return true;
diff --git a/src/images/SkImageDecoder_wbmp.cpp b/src/images/SkImageDecoder_wbmp.cpp
index 5e395e592f..96677ccafc 100644
--- a/src/images/SkImageDecoder_wbmp.cpp
+++ b/src/images/SkImageDecoder_wbmp.cpp
@@ -110,7 +110,7 @@ bool SkWBMPImageDecoder::onDecode(SkStream* stream, SkBitmap* decodedBitmap,
int width = head.fWidth;
int height = head.fHeight;
-
+
if (SkImageDecoder::kDecodeBounds_Mode == mode) {
decodedBitmap->setConfig(SkBitmap::kIndex8_Config, width, height);
decodedBitmap->setIsOpaque(true);
diff --git a/src/ports/SkFontHost_win_dw.cpp b/src/ports/SkFontHost_win_dw.cpp
index ebc4815184..f0e2002d68 100644
--- a/src/ports/SkFontHost_win_dw.cpp
+++ b/src/ports/SkFontHost_win_dw.cpp
@@ -1161,7 +1161,7 @@ SkStream* SkFontHost::OpenStream(SkFontID uniqueID) {
size_t SkFontHost::GetFileName(SkFontID fontID, char path[], size_t length, int32_t* index) {
return 0;
}
-
+
SkScalerContext* SkFontHost::CreateScalerContext(const SkDescriptor* desc) {
return SkNEW_ARGS(SkScalerContext_Windows, (desc));
}