diff options
| author |  halcanary <halcanary@google.com> | 2016-10-13 08:44:11 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-10-13 08:44:11 -0700 |
| commit | a634b742320ae1c14ddb296e45569947daced9fc (patch) | |
| tree | 4156ace4f81c38b9c2ada05574bfe6da9a5ac9c0 /src/xps | |
| parent | 1eab4426021134b874a09ccf404c2f1a35c6c363 (diff) | |
SkXPS: compile under clang on win
BUG=chromium:616763
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2408133006
Review-Url: https://codereview.chromium.org/2408133006
Diffstat (limited to 'src/xps')
| -rw-r--r-- | src/xps/SkXPSDevice.cpp | 10 | ||||
| -rw-r--r-- | src/xps/SkXPSDevice.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/xps/SkXPSDevice.cpp b/src/xps/SkXPSDevice.cpp index 5db644c30a..946566c1b3 100644 --- a/src/xps/SkXPSDevice.cpp +++ b/src/xps/SkXPSDevice.cpp @@ -644,11 +644,11 @@ static const XPS_TILE_MODE XTM_XY = XPS_TILE_MODE_FLIPXY; //None is currently an internal hack so masks don't repeat (None+None only). static XPS_TILE_MODE SkToXpsTileMode[SkShader::kTileModeCount+1] [SkShader::kTileModeCount+1] = { - //Clamp //Repeat //Mirror //None -/*Clamp */ XTM_N, XTM_T, XTM_Y, XTM_N, -/*Repeat*/ XTM_T, XTM_T, XTM_Y, XTM_N, -/*Mirror*/ XTM_X, XTM_X, XTM_XY, XTM_X, -/*None */ XTM_N, XTM_N, XTM_Y, XTM_N, + //Clamp //Repeat //Mirror //None + /*Clamp */ {XTM_N, XTM_T, XTM_Y, XTM_N}, + /*Repeat*/ {XTM_T, XTM_T, XTM_Y, XTM_N}, + /*Mirror*/ {XTM_X, XTM_X, XTM_XY, XTM_X}, + /*None */ {XTM_N, XTM_N, XTM_Y, XTM_N}, }; HRESULT SkXPSDevice::createXpsImageBrush( diff --git a/src/xps/SkXPSDevice.h b/src/xps/SkXPSDevice.h index 57f314851e..9f660a7536 100644 --- a/src/xps/SkXPSDevice.h +++ b/src/xps/SkXPSDevice.h @@ -149,7 +149,7 @@ private: explicit TypefaceUse(); ~TypefaceUse(); }; - friend static HRESULT subset_typeface(TypefaceUse* current); + friend HRESULT subset_typeface(TypefaceUse* current); SkXPSDevice(IXpsOMObjectFactory* xpsFactory); |