Do not use SkTDS32Array when building for 64 bit.
This class is used for pointers, which won't work on 64 bit. Fixes SampleApp on Mac debug 64 bit. BUG=https://code.google.com/p/skia/issues/detail?id=1169 Review URL: https://codereview.chromium.org/12919014 git-svn-id: http://skia.googlecode.com/svn/trunk@8203 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
parent
1311f7e7f4
commit
a6c76db94c
@ -16,7 +16,7 @@
|
||||
#define SK_BUILD_FOR_ADS_12
|
||||
#endif
|
||||
|
||||
#ifndef SK_BUILD_FOR_ADS_12
|
||||
#if !defined(SK_BUILD_FOR_ADS_12) && !defined(__x86_64__)
|
||||
#define SK_SMALLER_ARRAY_TEMPLATE_EXPERIMENT 1
|
||||
#else
|
||||
#define SK_SMALLER_ARRAY_TEMPLATE_EXPERIMENT 0
|
||||
@ -135,7 +135,7 @@ private:
|
||||
};
|
||||
|
||||
#define SkIntArray(type) SkTDS32Array<type> // holds 32 bit data types
|
||||
#define SkLongArray(type) SkTDS32Array<type> // holds 32/64 bit data types depending on pointer size
|
||||
#define SkLongArray(type) SkTDS32Array<type>
|
||||
|
||||
#endif // SK_SMALLER_ARRAY_TEMPLATE_EXPERIMENT
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user