diff options
-rw-r--r-- | samplecode/SampleAll.cpp | 2 | ||||
-rw-r--r-- | samplecode/SampleCode.h | 2 | ||||
-rw-r--r-- | samplecode/SampleTextEffects.cpp | 2 | ||||
-rw-r--r-- | src/animator/SkPaintParts.h | 2 | ||||
-rw-r--r-- | src/ports/SkFontHost_fontconfig.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp index 03940566c0..748c4bccc4 100644 --- a/samplecode/SampleAll.cpp +++ b/samplecode/SampleAll.cpp @@ -257,7 +257,7 @@ protected: } } - Line2DPathEffect::Line2DPathEffect(SkFlattenableReadBuffer& buffer) : Sk2DPathEffect(buffer) + Line2DPathEffect(SkFlattenableReadBuffer& buffer) : Sk2DPathEffect(buffer) { fWidth = buffer.readScalar(); } diff --git a/samplecode/SampleCode.h b/samplecode/SampleCode.h index ff660f220c..fd3ed2adc9 100644 --- a/samplecode/SampleCode.h +++ b/samplecode/SampleCode.h @@ -20,7 +20,7 @@ typedef SkView* (*SkViewFactory)(); class SkViewRegister : SkNoncopyable { public: - SkViewRegister(SkViewFactory); + explicit SkViewRegister(SkViewFactory); static const SkViewRegister* Head() { return gHead; } diff --git a/samplecode/SampleTextEffects.cpp b/samplecode/SampleTextEffects.cpp index f64e18755d..cd18006d97 100644 --- a/samplecode/SampleTextEffects.cpp +++ b/samplecode/SampleTextEffects.cpp @@ -245,7 +245,7 @@ protected: } } - Line2DPathEffect::Line2DPathEffect(SkFlattenableReadBuffer& buffer) : Sk2DPathEffect(buffer) + Line2DPathEffect(SkFlattenableReadBuffer& buffer) : Sk2DPathEffect(buffer) { fWidth = buffer.readScalar(); } diff --git a/src/animator/SkPaintParts.h b/src/animator/SkPaintParts.h index a8bb8bdb0e..c8c978fe71 100644 --- a/src/animator/SkPaintParts.h +++ b/src/animator/SkPaintParts.h @@ -73,7 +73,7 @@ class SkDrawTypeface : public SkPaintPart { virtual void dump(SkAnimateMaker *); #endif SkTypeface* getTypeface() { - return SkTypeface::Create(fontName.c_str(), style); } + return SkTypeface::CreateFromName(fontName.c_str(), style); } protected: virtual bool add(); SkString fontName; diff --git a/src/ports/SkFontHost_fontconfig.cpp b/src/ports/SkFontHost_fontconfig.cpp index a52747ab65..d3a32119c5 100644 --- a/src/ports/SkFontHost_fontconfig.cpp +++ b/src/ports/SkFontHost_fontconfig.cpp @@ -119,7 +119,7 @@ static FcPattern* FontMatch(const char* type, FcType vtype, const void* value, fcvalue.u.s = (FcChar8*) value; break; case FcTypeInteger: - fcvalue.u.i = (int) value; + fcvalue.u.i = (int)(intptr_t)value; break; default: SkASSERT(!"FontMatch unhandled type"); |