diff options
| -rw-r--r-- | gm/shadertext2.cpp | 4 | ||||
| -rw-r--r-- | include/core/SkCanvas.h | 2 | ||||
| -rw-r--r-- | include/core/SkDevice.h | 2 | ||||
| -rw-r--r-- | samplecode/TransitionView.cpp | 4 | ||||
| -rw-r--r-- | src/core/SkDraw.cpp | 2 | ||||
| -rw-r--r-- | src/core/SkImageFilter.cpp | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/gm/shadertext2.cpp b/gm/shadertext2.cpp index 519e41f4c3..387bd498b0 100644 --- a/gm/shadertext2.cpp +++ b/gm/shadertext2.cpp @@ -23,7 +23,7 @@ static void makebm(SkBitmap* bm, SkBitmap::Config config, int w, int h) { static const SkScalar kPos[] = { 0, SK_Scalar1/2, SK_Scalar1 }; static const SkColor kColors0[] = {0x40FF00FF, 0xF0FFFF00, 0x4000FFFF }; static const SkColor kColors1[] = {0xF0FF00FF, 0x80FFFF00, 0xF000FFFF }; - + SkPaint paint; @@ -95,7 +95,7 @@ protected: if (bmp.isNull()) { makebm(&bmp, SkBitmap::kARGB_8888_Config, kPointSize / 2, kPointSize / 2); } - + SkAutoTUnref<SkShader> shader(SkShader::CreateBitmapShader(bmp, SkShader::kMirror_TileMode, SkShader::kRepeat_TileMode)); diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index 178364cb43..0d7b899c73 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -988,7 +988,7 @@ private: fSurfaceBase = sb; } friend class SkSurface_Base; - + bool fDeviceCMDirty; // cleared by updateDeviceCMCache() void updateDeviceCMCache(); diff --git a/include/core/SkDevice.h b/include/core/SkDevice.h index 0873742d7a..33be2f672a 100644 --- a/include/core/SkDevice.h +++ b/include/core/SkDevice.h @@ -204,7 +204,7 @@ protected: * passed in). */ virtual void setMatrixClip(const SkMatrix&, const SkRegion&, - const SkClipStack&); + const SkClipStack&); /** Clears the entire device to the specified color (including alpha). * Ignores the clip. diff --git a/samplecode/TransitionView.cpp b/samplecode/TransitionView.cpp index 4f15bd310a..1caff13c9c 100644 --- a/samplecode/TransitionView.cpp +++ b/samplecode/TransitionView.cpp @@ -190,8 +190,8 @@ private: SkView* create_transition(SkView* prev, SkView* next, int direction) { #ifdef SK_BUILD_FOR_ANDROID - // Disable transitions for Android - return next; + // Disable transitions for Android + return next; #else return SkNEW_ARGS(TransitionView, (prev, next, direction)); #endif diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp index 17d29b6f1f..cdd59c1cdb 100644 --- a/src/core/SkDraw.cpp +++ b/src/core/SkDraw.cpp @@ -1541,7 +1541,7 @@ void SkDraw::drawText(const char text[], size_t byteLength, // SkScalarRec doesn't currently have a way of representing hairline stroke and // will fill if its frame-width is 0. if (/*paint.isLinearText() ||*/ - (fMatrix->hasPerspective()) || + (fMatrix->hasPerspective()) || (0 == paint.getStrokeWidth() && SkPaint::kStroke_Style == paint.getStyle())) { this->drawText_asPaths(text, byteLength, x, y, paint); return; diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp index 573d49d1ef..c688310111 100644 --- a/src/core/SkImageFilter.cpp +++ b/src/core/SkImageFilter.cpp @@ -40,7 +40,7 @@ SkImageFilter::~SkImageFilter() { delete[] fInputs; } -SkImageFilter::SkImageFilter(SkFlattenableReadBuffer& buffer) +SkImageFilter::SkImageFilter(SkFlattenableReadBuffer& buffer) : fNumInputs(buffer.readInt()), fInputs(new SkImageFilter*[fNumInputs]) { for (int i = 0; i < fNumInputs; i++) { if (buffer.readBool()) { |