From 708ec81d7a9bba12cd7e574b5c5ae80b2ad77919 Mon Sep 17 00:00:00 2001 From: Cary Clark Date: Thu, 12 Oct 2017 15:33:28 -0400 Subject: move SkMatrix anonymous affine enum to private enum members aren't used by SkMatrix.h or by clients outside of Skia. R: reed@google.com, bungeman@google.com Bug: skia:6898 Change-Id: I6873b4106e5ffe354caf5ec18cc613910304fa13 Reviewed-on: https://skia-review.googlesource.com/59160 Reviewed-by: Mike Reed Reviewed-by: Ben Wagner Commit-Queue: Cary Clark --- src/xps/SkXPSDevice.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/xps') diff --git a/src/xps/SkXPSDevice.cpp b/src/xps/SkXPSDevice.cpp index 801b80c0b0..6f62f89b45 100644 --- a/src/xps/SkXPSDevice.cpp +++ b/src/xps/SkXPSDevice.cpp @@ -35,6 +35,7 @@ #include "SkImageEncoder.h" #include "SkImagePriv.h" #include "SkMaskFilter.h" +#include "SkMatrixPriv.h" #include "SkPaint.h" #include "SkPathEffect.h" #include "SkPathOps.h" @@ -519,12 +520,12 @@ HRESULT SkXPSDevice::createXpsTransform(const SkMatrix& matrix, return S_FALSE; } XPS_MATRIX rawXpsMatrix = { - SkScalarToFLOAT(affine[SkMatrix::kAScaleX]), - SkScalarToFLOAT(affine[SkMatrix::kASkewY]), - SkScalarToFLOAT(affine[SkMatrix::kASkewX]), - SkScalarToFLOAT(affine[SkMatrix::kAScaleY]), - SkScalarToFLOAT(affine[SkMatrix::kATransX]), - SkScalarToFLOAT(affine[SkMatrix::kATransY]), + SkScalarToFLOAT(affine[SkMatrixPriv::kAScaleX]), + SkScalarToFLOAT(affine[SkMatrixPriv::kASkewY]), + SkScalarToFLOAT(affine[SkMatrixPriv::kASkewX]), + SkScalarToFLOAT(affine[SkMatrixPriv::kAScaleY]), + SkScalarToFLOAT(affine[SkMatrixPriv::kATransX]), + SkScalarToFLOAT(affine[SkMatrixPriv::kATransY]), }; HRM(this->fXpsFactory->CreateMatrixTransform(&rawXpsMatrix, xpsTransform), "Could not create transform."); -- cgit v1.2.3