зеркало из https://github.com/mozilla/moz-skia.git
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
This commit is contained in:
Родитель
a8a3b3d9a0
Коммит
db3f0fda68
|
@ -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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче