| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * Copyright 2006 The Android Open Source Project | 2 * Copyright 2006 The Android Open Source Project |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #ifndef SkScalar_DEFINED | 8 #ifndef SkScalar_DEFINED |
| 9 #define SkScalar_DEFINED | 9 #define SkScalar_DEFINED |
| 10 | 10 |
| 11 #include "SkFixed.h" | 11 #include "SkFixed.h" |
| 12 #include "SkFloatingPoint.h" | 12 #include "../private/SkFloatingPoint.h" |
| 13 | 13 |
| 14 // TODO: move this sort of check into SkPostConfig.h | 14 // TODO: move this sort of check into SkPostConfig.h |
| 15 #define SK_SCALAR_IS_DOUBLE 0 | 15 #define SK_SCALAR_IS_DOUBLE 0 |
| 16 #undef SK_SCALAR_IS_FLOAT | 16 #undef SK_SCALAR_IS_FLOAT |
| 17 #define SK_SCALAR_IS_FLOAT 1 | 17 #define SK_SCALAR_IS_FLOAT 1 |
| 18 | 18 |
| 19 | 19 |
| 20 #if SK_SCALAR_IS_FLOAT | 20 #if SK_SCALAR_IS_FLOAT |
| 21 | 21 |
| 22 typedef float SkScalar; | 22 typedef float SkScalar; |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 260 SkASSERT(n >= 0); | 260 SkASSERT(n >= 0); |
| 261 for (int i = 0; i < n; ++i) { | 261 for (int i = 0; i < n; ++i) { |
| 262 if (a[i] != b[i]) { | 262 if (a[i] != b[i]) { |
| 263 return false; | 263 return false; |
| 264 } | 264 } |
| 265 } | 265 } |
| 266 return true; | 266 return true; |
| 267 } | 267 } |
| 268 | 268 |
| 269 #endif | 269 #endif |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1291613007:
Revert[4] "move some public headers into private" (Closed)
Base URL: https://skia.googlesource.com/skia.git@master