| Index: gm/image.cpp
|
| diff --git a/gm/image.cpp b/gm/image.cpp
|
| index ca28dd11195e63e7fca7641fee18062314a09b42..c420c95eef5834977521bf533a71f2c2ba1fde51 100644
|
| --- a/gm/image.cpp
|
| +++ b/gm/image.cpp
|
| @@ -122,15 +122,15 @@ public:
|
| }
|
|
|
| protected:
|
| - SkString onShortName() SK_OVERRIDE {
|
| + SkString onShortName() override {
|
| return SkString("image-surface");
|
| }
|
|
|
| - SkISize onISize() SK_OVERRIDE {
|
| + SkISize onISize() override {
|
| return SkISize::Make(960, 1200);
|
| }
|
|
|
| - void onDraw(SkCanvas* canvas) SK_OVERRIDE {
|
| + void onDraw(SkCanvas* canvas) override {
|
| drawJpeg(canvas, this->getISize());
|
|
|
| canvas->scale(2, 2);
|
| @@ -202,9 +202,9 @@ public:
|
| ImageResizeGM() {}
|
|
|
| protected:
|
| - SkString onShortName() SK_OVERRIDE { return SkString("image-resize"); }
|
| + SkString onShortName() override { return SkString("image-resize"); }
|
|
|
| - SkISize onISize() SK_OVERRIDE { return SkISize::Make(510, 480); }
|
| + SkISize onISize() override { return SkISize::Make(510, 480); }
|
|
|
| void drawIntoImage(SkCanvas* canvas) {
|
| SkPaint paint;
|
| @@ -260,7 +260,7 @@ protected:
|
| this->drawResized(canvas, image, W, H, &subset, fq);
|
| }
|
|
|
| - void onDraw(SkCanvas* canvas) SK_OVERRIDE {
|
| + void onDraw(SkCanvas* canvas) override {
|
| canvas->translate(10, 10);
|
|
|
| SkAutoTUnref<SkImage> image(this->makeImage(canvas));
|
|
|