diff options
author | elektrahesse | 2010-10-09 19:05:40 +0200 |
---|---|---|
committer | elektrahesse | 2010-10-09 19:07:11 +0200 |
commit | 565d2e1389b0a72e6eca7068988a9312991abfb1 (patch) | |
tree | 7103015e3c024cbeb48ff1e7c89dd14bb6ce12ff /linden/indra/llcommon | |
parent | Changed version to Experimental 2010.10.09 (diff) | |
download | meta-impy-565d2e1389b0a72e6eca7068988a9312991abfb1.zip meta-impy-565d2e1389b0a72e6eca7068988a9312991abfb1.tar.gz meta-impy-565d2e1389b0a72e6eca7068988a9312991abfb1.tar.bz2 meta-impy-565d2e1389b0a72e6eca7068988a9312991abfb1.tar.xz |
Mac Only: Implemented initial CoreGraphics image decoding to support uploads, both single and bulk, bypassing viewer's internal decoding classes and using osx native frameworks. Also pushing non-fully-working-yet (and thus disabled) code for native j2c decoding.
Diffstat (limited to 'linden/indra/llcommon')
-rw-r--r-- | linden/indra/llcommon/stdtypes.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/linden/indra/llcommon/stdtypes.h b/linden/indra/llcommon/stdtypes.h index af0b4dd..aed1e46 100644 --- a/linden/indra/llcommon/stdtypes.h +++ b/linden/indra/llcommon/stdtypes.h | |||
@@ -64,10 +64,17 @@ typedef long long unsigned int U64; | |||
64 | #endif | 64 | #endif |
65 | #endif | 65 | #endif |
66 | 66 | ||
67 | #ifdef LL_DARWIN | ||
68 | #ifndef BOOL | ||
69 | #define BOOL S32 | ||
70 | #endif | ||
71 | #else | ||
72 | typedef S32 BOOL; | ||
73 | #endif | ||
74 | |||
67 | typedef float F32; | 75 | typedef float F32; |
68 | typedef double F64; | 76 | typedef double F64; |
69 | 77 | ||
70 | typedef S32 BOOL; | ||
71 | typedef U8 KEY; | 78 | typedef U8 KEY; |
72 | typedef U32 MASK; | 79 | typedef U32 MASK; |
73 | typedef U32 TPACKETID; | 80 | typedef U32 TPACKETID; |