| 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 |
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 222 SK_ ## C1 ## 32_SHIFT == 16 && \ | 222 SK_ ## C1 ## 32_SHIFT == 16 && \ |
| 223 SK_ ## C0 ## 32_SHIFT == 24) | 223 SK_ ## C0 ## 32_SHIFT == 24) |
| 224 #else | 224 #else |
| 225 # define SK_PMCOLOR_BYTE_ORDER(C0, C1, C2, C3) \ | 225 # define SK_PMCOLOR_BYTE_ORDER(C0, C1, C2, C3) \ |
| 226 (SK_ ## C0 ## 32_SHIFT == 0 && \ | 226 (SK_ ## C0 ## 32_SHIFT == 0 && \ |
| 227 SK_ ## C1 ## 32_SHIFT == 8 && \ | 227 SK_ ## C1 ## 32_SHIFT == 8 && \ |
| 228 SK_ ## C2 ## 32_SHIFT == 16 && \ | 228 SK_ ## C2 ## 32_SHIFT == 16 && \ |
| 229 SK_ ## C3 ## 32_SHIFT == 24) | 229 SK_ ## C3 ## 32_SHIFT == 24) |
| 230 #endif | 230 #endif |
| 231 | 231 |
| 232 ////////////////////////////////////////////////////////////////////// | |
| 233 | |
| 234 // TODO: rebaseline as needed so we can remove this flag entirely. | |
| 235 // - all platforms have int64_t now | |
| 236 // - we have slightly different fixed math results because of this check | |
| 237 // since we don't define this for linux/android | |
| 238 #if defined(SK_BUILD_FOR_WIN32) || defined(SK_BUILD_FOR_MAC) | |
| 239 # ifndef SkLONGLONG | |
| 240 # define SkLONGLONG int64_t | |
| 241 # endif | |
| 242 #endif | |
| 243 | |
| 244 ////////////////////////////////////////////////////////////////////////////////
////////////// | 232 ////////////////////////////////////////////////////////////////////////////////
////////////// |
| 245 #ifndef SK_BUILD_FOR_WINCE | 233 #ifndef SK_BUILD_FOR_WINCE |
| 246 # include <string.h> | 234 # include <string.h> |
| 247 # include <stdlib.h> | 235 # include <stdlib.h> |
| 248 #else | 236 #else |
| 249 # define _CMNINTRIN_DECLARE_ONLY | 237 # define _CMNINTRIN_DECLARE_ONLY |
| 250 # include "cmnintrin.h" | 238 # include "cmnintrin.h" |
| 251 #endif | 239 #endif |
| 252 | 240 |
| 253 #if defined SK_DEBUG && defined SK_BUILD_FOR_WIN32 | 241 #if defined SK_DEBUG && defined SK_BUILD_FOR_WIN32 |
| (...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 416 | 404 |
| 417 #if defined(SK_GAMMA_EXPONENT) && defined(SK_GAMMA_SRGB) | 405 #if defined(SK_GAMMA_EXPONENT) && defined(SK_GAMMA_SRGB) |
| 418 # error "cannot define both SK_GAMMA_EXPONENT and SK_GAMMA_SRGB" | 406 # error "cannot define both SK_GAMMA_EXPONENT and SK_GAMMA_SRGB" |
| 419 #elif defined(SK_GAMMA_SRGB) | 407 #elif defined(SK_GAMMA_SRGB) |
| 420 # define SK_GAMMA_EXPONENT (0.0f) | 408 # define SK_GAMMA_EXPONENT (0.0f) |
| 421 #elif !defined(SK_GAMMA_EXPONENT) | 409 #elif !defined(SK_GAMMA_EXPONENT) |
| 422 # define SK_GAMMA_EXPONENT (2.2f) | 410 # define SK_GAMMA_EXPONENT (2.2f) |
| 423 #endif | 411 #endif |
| 424 | 412 |
| 425 #endif // SkPostConfig_DEFINED | 413 #endif // SkPostConfig_DEFINED |
| OLD | NEW |