diff --git a/debugger/QT/moc_4.8.1_SkCanvasWidget.cpp b/debugger/QT/moc_4.8.1_SkCanvasWidget.cpp index 145ad9f54c..8187549fe2 100644 --- a/debugger/QT/moc_4.8.1_SkCanvasWidget.cpp +++ b/debugger/QT/moc_4.8.1_SkCanvasWidget.cpp @@ -64,7 +64,7 @@ void SkCanvasWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _ } const QMetaObjectExtraData SkCanvasWidget::staticMetaObjectExtraData = { - 0, qt_static_metacall + 0, qt_static_metacall }; const QMetaObject SkCanvasWidget::staticMetaObject = { diff --git a/debugger/QT/moc_4.8.1_SkDebuggerGUI.cpp b/debugger/QT/moc_4.8.1_SkDebuggerGUI.cpp index 0e18eeb229..46d9f7081b 100644 --- a/debugger/QT/moc_4.8.1_SkDebuggerGUI.cpp +++ b/debugger/QT/moc_4.8.1_SkDebuggerGUI.cpp @@ -128,7 +128,7 @@ void SkDebuggerGUI::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _i } const QMetaObjectExtraData SkDebuggerGUI::staticMetaObjectExtraData = { - 0, qt_static_metacall + 0, qt_static_metacall }; const QMetaObject SkDebuggerGUI::staticMetaObject = { diff --git a/debugger/QT/moc_4.8.1_SkGLWidget.cpp b/debugger/QT/moc_4.8.1_SkGLWidget.cpp index 5019f7336d..fccde24d6f 100644 --- a/debugger/QT/moc_4.8.1_SkGLWidget.cpp +++ b/debugger/QT/moc_4.8.1_SkGLWidget.cpp @@ -54,7 +54,7 @@ void SkGLWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, } const QMetaObjectExtraData SkGLWidget::staticMetaObjectExtraData = { - 0, qt_static_metacall + 0, qt_static_metacall }; const QMetaObject SkGLWidget::staticMetaObject = { diff --git a/debugger/QT/moc_4.8.1_SkInspectorWidget.cpp b/debugger/QT/moc_4.8.1_SkInspectorWidget.cpp index e1da956203..236768dd6f 100644 --- a/debugger/QT/moc_4.8.1_SkInspectorWidget.cpp +++ b/debugger/QT/moc_4.8.1_SkInspectorWidget.cpp @@ -46,7 +46,7 @@ void SkInspectorWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, in } const QMetaObjectExtraData SkInspectorWidget::staticMetaObjectExtraData = { - 0, qt_static_metacall + 0, qt_static_metacall }; const QMetaObject SkInspectorWidget::staticMetaObject = { diff --git a/debugger/QT/moc_4.8.1_SkRasterWidget.cpp b/debugger/QT/moc_4.8.1_SkRasterWidget.cpp index 94d1a22925..1036986ce8 100644 --- a/debugger/QT/moc_4.8.1_SkRasterWidget.cpp +++ b/debugger/QT/moc_4.8.1_SkRasterWidget.cpp @@ -54,7 +54,7 @@ void SkRasterWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _ } const QMetaObjectExtraData SkRasterWidget::staticMetaObjectExtraData = { - 0, qt_static_metacall + 0, qt_static_metacall }; const QMetaObject SkRasterWidget::staticMetaObject = { diff --git a/debugger/QT/moc_4.8.1_SkSettingsWidget.cpp b/debugger/QT/moc_4.8.1_SkSettingsWidget.cpp index 382023a7ed..e5c89bc25f 100644 --- a/debugger/QT/moc_4.8.1_SkSettingsWidget.cpp +++ b/debugger/QT/moc_4.8.1_SkSettingsWidget.cpp @@ -67,7 +67,7 @@ void SkSettingsWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int } const QMetaObjectExtraData SkSettingsWidget::staticMetaObjectExtraData = { - 0, qt_static_metacall + 0, qt_static_metacall }; const QMetaObject SkSettingsWidget::staticMetaObject = { diff --git a/src/gpu/SkGrFontScaler.cpp b/src/gpu/SkGrFontScaler.cpp index 42774f5c1a..dc637a8176 100644 --- a/src/gpu/SkGrFontScaler.cpp +++ b/src/gpu/SkGrFontScaler.cpp @@ -172,8 +172,8 @@ bool SkGrFontScaler::getPackedGlyphImage(GrGlyph::PackedID packed, expand_bits(rgba8888, bits, width, height, dstRB, srcRB); break; } - default: - GrCrash("Unknown GrMaskFormat"); + default: + GrCrash("Unknown GrMaskFormat"); } } else if (srcRB == dstRB) { memcpy(dst, src, dstRB * height);