diff options
Diffstat (limited to 'linden/indra/llimagej2coj/llimagej2coj.cpp')
-rw-r--r-- | linden/indra/llimagej2coj/llimagej2coj.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/linden/indra/llimagej2coj/llimagej2coj.cpp b/linden/indra/llimagej2coj/llimagej2coj.cpp index be6a087..7a323c8 100644 --- a/linden/indra/llimagej2coj/llimagej2coj.cpp +++ b/linden/indra/llimagej2coj/llimagej2coj.cpp | |||
@@ -2,6 +2,8 @@ | |||
2 | * @file llimagej2coj.cpp | 2 | * @file llimagej2coj.cpp |
3 | * @brief This is an implementation of JPEG2000 encode/decode using OpenJPEG. | 3 | * @brief This is an implementation of JPEG2000 encode/decode using OpenJPEG. |
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2006&license=viewergpl$ | ||
6 | * | ||
5 | * Copyright (c) 2006-2007, Linden Research, Inc. | 7 | * Copyright (c) 2006-2007, Linden Research, Inc. |
6 | * | 8 | * |
7 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
@@ -24,18 +26,24 @@ | |||
24 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO | 26 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO |
25 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, | 27 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, |
26 | * COMPLETENESS OR PERFORMANCE. | 28 | * COMPLETENESS OR PERFORMANCE. |
29 | * $/LicenseInfo$ | ||
27 | */ | 30 | */ |
28 | 31 | ||
29 | #include "linden_common.h" | 32 | #include "linden_common.h" |
30 | #include "llimagej2coj.h" | 33 | #include "llimagej2coj.h" |
31 | 34 | ||
32 | // this is defined so that we get static linking. | 35 | // this is defined so that we get static linking. |
33 | #define OPJ_STATIC | ||
34 | #include "openjpeg/openjpeg.h" | 36 | #include "openjpeg/openjpeg.h" |
35 | 37 | ||
36 | #include "lltimer.h" | 38 | #include "lltimer.h" |
37 | #include "llmemory.h" | 39 | #include "llmemory.h" |
38 | 40 | ||
41 | const char* fallbackEngineInfoLLImageJ2CImpl() | ||
42 | { | ||
43 | return (std::string("OpenJPEG: " OPENJPEG_VERSION ", Runtime: ") | ||
44 | + opj_version()).c_str(); | ||
45 | } | ||
46 | |||
39 | LLImageJ2CImpl* fallbackCreateLLImageJ2CImpl() | 47 | LLImageJ2CImpl* fallbackCreateLLImageJ2CImpl() |
40 | { | 48 | { |
41 | return new LLImageJ2COJ(); | 49 | return new LLImageJ2COJ(); |