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/llwindow/llwindowmacosx-objc.h | |
| 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 '')
| -rw-r--r-- | linden/indra/llwindow/llwindowmacosx-objc.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/linden/indra/llwindow/llwindowmacosx-objc.h b/linden/indra/llwindow/llwindowmacosx-objc.h index 14cddaa..14c9c92 100644 --- a/linden/indra/llwindow/llwindowmacosx-objc.h +++ b/linden/indra/llwindow/llwindowmacosx-objc.h | |||
| @@ -31,6 +31,14 @@ | |||
| 31 | * $/LicenseInfo$ | 31 | * $/LicenseInfo$ |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include "llimagej2c.h" | ||
| 35 | #include <Carbon/Carbon.h> | ||
| 36 | |||
| 37 | #ifdef __OBJC__ | ||
| 38 | #ifdef BOOL | ||
| 39 | #undef BOOL | ||
| 40 | #endif | ||
| 41 | #endif // __OBJC__ | ||
| 34 | 42 | ||
| 35 | // This will actually hold an NSCursor*, but that type is only available in objective C. | 43 | // This will actually hold an NSCursor*, but that type is only available in objective C. |
| 36 | typedef void *CursorRef; | 44 | typedef void *CursorRef; |
| @@ -40,3 +48,5 @@ void setupCocoa(); | |||
| 40 | CursorRef createImageCursor(const char *fullpath, int hotspotX, int hotspotY); | 48 | CursorRef createImageCursor(const char *fullpath, int hotspotX, int hotspotY); |
| 41 | OSErr releaseImageCursor(CursorRef ref); | 49 | OSErr releaseImageCursor(CursorRef ref); |
| 42 | OSErr setImageCursor(CursorRef ref); | 50 | OSErr setImageCursor(CursorRef ref); |
| 51 | BOOL decodeImageQuartz(std::string filename, LLImageRaw *raw_image); | ||
| 52 | BOOL decodeImageQuartz(const UInt8* data, int len, LLImageRaw *raw_image); | ||