diff options
Diffstat (limited to 'src/core/SkMatrix.cpp')
| -rw-r--r-- | src/core/SkMatrix.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/core/SkMatrix.cpp b/src/core/SkMatrix.cpp index cb4b792a6b..3d50659e08 100644 --- a/src/core/SkMatrix.cpp +++ b/src/core/SkMatrix.cpp @@ -16,7 +16,9 @@ #include "SkRSXform.h" #include "SkString.h" #include "SkTo.h" -#include <stddef.h> + +#include <cstddef> +#include <utility> static void normalize_perspective(SkScalar mat[9]) { // If it was interesting to never store the last element, we could divide all 8 other @@ -1488,7 +1490,8 @@ template <MinMaxOrBoth MIN_MAX_OR_BOTH> bool get_scale_factor(SkMatrix::TypeMask results[0] = SkScalarAbs(m[SkMatrix::kMScaleX]); results[1] = SkScalarAbs(m[SkMatrix::kMScaleY]); if (results[0] > results[1]) { - SkTSwap(results[0], results[1]); + using std::swap; + swap(results[0], results[1]); } } return true; @@ -1518,7 +1521,8 @@ template <MinMaxOrBoth MIN_MAX_OR_BOTH> bool get_scale_factor(SkMatrix::TypeMask results[0] = a; results[1] = c; if (results[0] > results[1]) { - SkTSwap(results[0], results[1]); + using std::swap; + swap(results[0], results[1]); } } } else { |