Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(61)

Side by Side Diff: include/core/SkPostConfig.h

Issue 1000933003: Remove SkLONGLONG. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « include/core/SkFixed.h ('k') | src/core/SkMath.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 SK_ ## C1 ## 32_SHIFT == 16 && \ 225 SK_ ## C1 ## 32_SHIFT == 16 && \
226 SK_ ## C0 ## 32_SHIFT == 24) 226 SK_ ## C0 ## 32_SHIFT == 24)
227 #else 227 #else
228 # define SK_PMCOLOR_BYTE_ORDER(C0, C1, C2, C3) \ 228 # define SK_PMCOLOR_BYTE_ORDER(C0, C1, C2, C3) \
229 (SK_ ## C0 ## 32_SHIFT == 0 && \ 229 (SK_ ## C0 ## 32_SHIFT == 0 && \
230 SK_ ## C1 ## 32_SHIFT == 8 && \ 230 SK_ ## C1 ## 32_SHIFT == 8 && \
231 SK_ ## C2 ## 32_SHIFT == 16 && \ 231 SK_ ## C2 ## 32_SHIFT == 16 && \
232 SK_ ## C3 ## 32_SHIFT == 24) 232 SK_ ## C3 ## 32_SHIFT == 24)
233 #endif 233 #endif
234 234
235 //////////////////////////////////////////////////////////////////////
236
237 // TODO: rebaseline as needed so we can remove this flag entirely.
238 // - all platforms have int64_t now
239 // - we have slightly different fixed math results because of this check
240 // since we don't define this for linux/android
241 #if defined(SK_BUILD_FOR_WIN32) || defined(SK_BUILD_FOR_MAC)
242 # ifndef SkLONGLONG
243 # define SkLONGLONG int64_t
244 # endif
245 #endif
246
247 //////////////////////////////////////////////////////////////////////////////// ////////////// 235 //////////////////////////////////////////////////////////////////////////////// //////////////
248 #ifndef SK_BUILD_FOR_WINCE 236 #ifndef SK_BUILD_FOR_WINCE
249 # include <string.h> 237 # include <string.h>
250 # include <stdlib.h> 238 # include <stdlib.h>
251 #else 239 #else
252 # define _CMNINTRIN_DECLARE_ONLY 240 # define _CMNINTRIN_DECLARE_ONLY
253 # include "cmnintrin.h" 241 # include "cmnintrin.h"
254 #endif 242 #endif
255 243
256 #if defined SK_DEBUG && defined SK_BUILD_FOR_WIN32 244 #if defined SK_DEBUG && defined SK_BUILD_FOR_WIN32
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 391
404 #if defined(SK_GAMMA_EXPONENT) && defined(SK_GAMMA_SRGB) 392 #if defined(SK_GAMMA_EXPONENT) && defined(SK_GAMMA_SRGB)
405 # error "cannot define both SK_GAMMA_EXPONENT and SK_GAMMA_SRGB" 393 # error "cannot define both SK_GAMMA_EXPONENT and SK_GAMMA_SRGB"
406 #elif defined(SK_GAMMA_SRGB) 394 #elif defined(SK_GAMMA_SRGB)
407 # define SK_GAMMA_EXPONENT (0.0f) 395 # define SK_GAMMA_EXPONENT (0.0f)
408 #elif !defined(SK_GAMMA_EXPONENT) 396 #elif !defined(SK_GAMMA_EXPONENT)
409 # define SK_GAMMA_EXPONENT (2.2f) 397 # define SK_GAMMA_EXPONENT (2.2f)
410 #endif 398 #endif
411 399
412 #endif // SkPostConfig_DEFINED 400 #endif // SkPostConfig_DEFINED
OLDNEW
« no previous file with comments | « include/core/SkFixed.h ('k') | src/core/SkMath.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698