diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-11-26 20:18:00 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-11-26 20:18:00 +0000 |
| commit | db3f0fda6899b11e3213c1213165f2d22ad0fb83 (patch) | |
| tree | 0c10a344c6a774599ce9eaa552befee11ab04d9e /include/core/SkSize.h | |
| parent | a8a3b3d9a027ad54ce20f8b4ed7c577a176b31ca (diff) | |
must always include another skia header (unless you're SkTypes.h). In this case,
we need SkScalar.h earlier so we can be sure to have int32_t defined.
inspired by https://codereview.appspot.com/6782122/
git-svn-id: http://skia.googlecode.com/svn/trunk@6548 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkSize.h')
| -rw-r--r-- | include/core/SkSize.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/core/SkSize.h b/include/core/SkSize.h index 808583f3e8..01c6e35083 100644 --- a/include/core/SkSize.h +++ b/include/core/SkSize.h @@ -1,4 +1,3 @@ - /* * Copyright 2011 Google Inc. * @@ -6,10 +5,11 @@ * found in the LICENSE file. */ - #ifndef SkSize_DEFINED #define SkSize_DEFINED +#include "SkScalar.h" + template <typename T> struct SkTSize { T fWidth; T fHeight; @@ -74,8 +74,6 @@ static inline bool operator!=(const SkTSize<T>& a, const SkTSize<T>& b) { typedef SkTSize<int32_t> SkISize; -#include "SkScalar.h" - struct SkSize : public SkTSize<SkScalar> { static SkSize Make(SkScalar w, SkScalar h) { SkSize s; |