| 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 SkPostConfig_DEFINED | 8 #ifndef SkPostConfig_DEFINED |
| 9 #define SkPostConfig_DEFINED | 9 #define SkPostConfig_DEFINED |
| 10 | 10 |
| 11 #if defined(SK_BUILD_FOR_WIN32) || defined(SK_BUILD_FOR_WINCE) | 11 #if defined(SK_BUILD_FOR_WIN32) || defined(SK_BUILD_FOR_WINCE) |
| 12 # define SK_BUILD_FOR_WIN | 12 # define SK_BUILD_FOR_WIN |
| 13 #endif | 13 #endif |
| 14 | 14 |
| 15 #if defined(SK_DEBUG) && defined(SK_RELEASE) | 15 #if defined(SK_DEBUG) && defined(SK_RELEASE) |
| 16 # error "cannot define both SK_DEBUG and SK_RELEASE" | 16 # error "cannot define both SK_DEBUG and SK_RELEASE" |
| 17 #elif !defined(SK_DEBUG) && !defined(SK_RELEASE) | 17 #elif !defined(SK_DEBUG) && !defined(SK_RELEASE) |
| 18 # error "must define either SK_DEBUG or SK_RELEASE" | 18 # error "must define either SK_DEBUG or SK_RELEASE" |
| 19 #endif | 19 #endif |
| 20 | 20 |
| 21 #if defined(SK_SUPPORT_UNITTEST) && !defined(SK_DEBUG) | 21 #if defined(SK_SUPPORT_UNITTEST) && !defined(SK_DEBUG) |
| 22 # error "can't have unittests without debug" | 22 # error "can't have unittests without debug" |
| 23 #endif | 23 #endif |
| 24 | 24 |
| 25 #if defined(SK_SCALAR_IS_FIXED) && defined(SK_SCALAR_IS_FLOAT) | |
| 26 # error "cannot define both SK_SCALAR_IS_FIXED and SK_SCALAR_IS_FLOAT" | |
| 27 #elif !defined(SK_SCALAR_IS_FIXED) && !defined(SK_SCALAR_IS_FLOAT) | |
| 28 # define SK_SCALAR_IS_FLOAT | |
| 29 #endif | |
| 30 | |
| 31 /** | 25 /** |
| 32 * Matrix calculations may be float or double. | 26 * Matrix calculations may be float or double. |
| 33 * The default is double, as that is faster given our impl uses doubles | 27 * The default is double, as that is faster given our impl uses doubles |
| 34 * for intermediate calculations. | 28 * for intermediate calculations. |
| 35 */ | 29 */ |
| 36 #if defined(SK_MSCALAR_IS_DOUBLE) && defined(SK_MSCALAR_IS_FLOAT) | 30 #if defined(SK_MSCALAR_IS_DOUBLE) && defined(SK_MSCALAR_IS_FLOAT) |
| 37 # error "cannot define both SK_MSCALAR_IS_DOUBLE and SK_MSCALAR_IS_FLOAT" | 31 # error "cannot define both SK_MSCALAR_IS_DOUBLE and SK_MSCALAR_IS_FLOAT" |
| 38 #elif !defined(SK_MSCALAR_IS_DOUBLE) && !defined(SK_MSCALAR_IS_FLOAT) | 32 #elif !defined(SK_MSCALAR_IS_DOUBLE) && !defined(SK_MSCALAR_IS_FLOAT) |
| 39 # define SK_MSCALAR_IS_DOUBLE | 33 # define SK_MSCALAR_IS_DOUBLE |
| 40 #endif | 34 #endif |
| (...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 371 # endif | 365 # endif |
| 372 #endif | 366 #endif |
| 373 | 367 |
| 374 ////////////////////////////////////////////////////////////////////// | 368 ////////////////////////////////////////////////////////////////////// |
| 375 | 369 |
| 376 #ifndef SK_ALLOW_STATIC_GLOBAL_INITIALIZERS | 370 #ifndef SK_ALLOW_STATIC_GLOBAL_INITIALIZERS |
| 377 # define SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 1 | 371 # define SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 1 |
| 378 #endif | 372 #endif |
| 379 | 373 |
| 380 #endif // SkPostConfig_DEFINED | 374 #endif // SkPostConfig_DEFINED |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 117053002:
remove SK_SCALAR_IS_[FLOAT,FIXED] and assume floats (Closed)
Base URL: https://skia.googlecode.com/svn/trunk