| Index: src/core/SkScan_Antihair.cpp
|
| diff --git a/src/core/SkScan_Antihair.cpp b/src/core/SkScan_Antihair.cpp
|
| index a3305e2dc80bf7feed193b13e79da7376111ba59..97bb6d21989bfd86b6e30e079e09e05492cda2e3 100644
|
| --- a/src/core/SkScan_Antihair.cpp
|
| +++ b/src/core/SkScan_Antihair.cpp
|
| @@ -106,7 +106,7 @@ private:
|
|
|
| class HLine_SkAntiHairBlitter : public SkAntiHairBlitter {
|
| public:
|
| - SkFixed drawCap(int x, SkFixed fy, SkFixed slope, int mod64) SK_OVERRIDE {
|
| + SkFixed drawCap(int x, SkFixed fy, SkFixed slope, int mod64) override {
|
| fy += SK_Fixed1/2;
|
|
|
| int y = fy >> 16;
|
| @@ -128,7 +128,7 @@ public:
|
| }
|
|
|
| virtual SkFixed drawLine(int x, int stopx, SkFixed fy,
|
| - SkFixed slope) SK_OVERRIDE {
|
| + SkFixed slope) override {
|
| SkASSERT(x < stopx);
|
| int count = stopx - x;
|
| fy += SK_Fixed1/2;
|
| @@ -153,7 +153,7 @@ public:
|
|
|
| class Horish_SkAntiHairBlitter : public SkAntiHairBlitter {
|
| public:
|
| - SkFixed drawCap(int x, SkFixed fy, SkFixed dy, int mod64) SK_OVERRIDE {
|
| + SkFixed drawCap(int x, SkFixed fy, SkFixed dy, int mod64) override {
|
| int16_t runs[2];
|
| uint8_t aa[1];
|
|
|
| @@ -186,7 +186,7 @@ public:
|
| return fy - SK_Fixed1/2;
|
| }
|
|
|
| - SkFixed drawLine(int x, int stopx, SkFixed fy, SkFixed dy) SK_OVERRIDE {
|
| + SkFixed drawLine(int x, int stopx, SkFixed fy, SkFixed dy) override {
|
| SkASSERT(x < stopx);
|
|
|
| int16_t runs[2];
|
| @@ -224,7 +224,7 @@ public:
|
|
|
| class VLine_SkAntiHairBlitter : public SkAntiHairBlitter {
|
| public:
|
| - SkFixed drawCap(int y, SkFixed fx, SkFixed dx, int mod64) SK_OVERRIDE {
|
| + SkFixed drawCap(int y, SkFixed fx, SkFixed dx, int mod64) override {
|
| SkASSERT(0 == dx);
|
| fx += SK_Fixed1/2;
|
|
|
| @@ -243,7 +243,7 @@ public:
|
| return fx - SK_Fixed1/2;
|
| }
|
|
|
| - SkFixed drawLine(int y, int stopy, SkFixed fx, SkFixed dx) SK_OVERRIDE {
|
| + SkFixed drawLine(int y, int stopy, SkFixed fx, SkFixed dx) override {
|
| SkASSERT(y < stopy);
|
| SkASSERT(0 == dx);
|
| fx += SK_Fixed1/2;
|
| @@ -265,7 +265,7 @@ public:
|
|
|
| class Vertish_SkAntiHairBlitter : public SkAntiHairBlitter {
|
| public:
|
| - SkFixed drawCap(int y, SkFixed fx, SkFixed dx, int mod64) SK_OVERRIDE {
|
| + SkFixed drawCap(int y, SkFixed fx, SkFixed dx, int mod64) override {
|
| int16_t runs[3];
|
| uint8_t aa[2];
|
|
|
| @@ -289,7 +289,7 @@ public:
|
| return fx - SK_Fixed1/2;
|
| }
|
|
|
| - SkFixed drawLine(int y, int stopy, SkFixed fx, SkFixed dx) SK_OVERRIDE {
|
| + SkFixed drawLine(int y, int stopy, SkFixed fx, SkFixed dx) override {
|
| SkASSERT(y < stopy);
|
| int16_t runs[3];
|
| uint8_t aa[2];
|
|
|