diff options
| author |  mike@reedtribe.org <mike@reedtribe.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-06 03:02:37 +0000 |
|---|---|---|
| committer | mike@reedtribe.org <mike@reedtribe.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-06 03:02:37 +0000 |
| commit | 9fb00413ec55deb3a4953d4dff2dba3ec5cdb645 (patch) | |
| tree | edf566ac7328d438455a3f3a8c4e6bc7f2f117d9 /include/core/SkFixed.h | |
| parent | 4e4b09a44e202215ba60f71235388694f4b352d8 (diff) | |
SK_SUPPORTED_DEPRECATED_FIXEDROUND around deprecated fixed[round,ceil,floor]
git-svn-id: http://skia.googlecode.com/svn/trunk@12903 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkFixed.h')
| -rw-r--r-- | include/core/SkFixed.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/include/core/SkFixed.h b/include/core/SkFixed.h index e63794e862..ac16b3d759 100644 --- a/include/core/SkFixed.h +++ b/include/core/SkFixed.h @@ -1,4 +1,3 @@ - /* * Copyright 2006 The Android Open Source Project * @@ -6,12 +5,13 @@ * found in the LICENSE file. */ - #ifndef SkFixed_DEFINED #define SkFixed_DEFINED #include "SkTypes.h" +//#define SK_SUPPORTED_DEPRECATED_FIXEDROUND + /** \file SkFixed.h Types and macros for 16.16 fixed point @@ -77,10 +77,11 @@ typedef int32_t SkFixed; #define SkFixedCeilToFixed(x) (((x) + SK_Fixed1 - 1) & 0xFFFF0000) #define SkFixedFloorToFixed(x) ((x) & 0xFFFF0000) -// DEPRECATED -#define SkFixedFloor(x) SkFixedFloorToInt(x) -#define SkFixedCeil(x) SkFixedCeilToInt(x) -#define SkFixedRound(x) SkFixedRoundToInt(x) +#ifdef SK_SUPPORTED_DEPRECATED_FIXEDROUND +# define SkFixedFloor(x) SkFixedFloorToInt(x) +# define SkFixedCeil(x) SkFixedCeilToInt(x) +# define SkFixedRound(x) SkFixedRoundToInt(x) +#endif #define SkFixedAbs(x) SkAbs32(x) #define SkFixedAve(a, b) (((a) + (b)) >> 1) |