diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-10-18 15:38:33 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-10-18 15:38:33 -0400 |
| commit | 8e30a2f06dd1ce407fcb2399823efed883b317d2 (patch) | |
| tree | e5b22fb9fd2b5e99cf195d00338da57ecdade0d4 /indra/llimagej2coj/llimagej2coj.h | |
| parent | 7df153e352ce50ded382df020cc3696b8c1b9325 (diff) | |
| parent | 086c1342152895da28d2e0130d09432152604ca8 (diff) | |
merge changes for 4.1.1-release
Diffstat (limited to 'indra/llimagej2coj/llimagej2coj.h')
| -rw-r--r-- | indra/llimagej2coj/llimagej2coj.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/indra/llimagej2coj/llimagej2coj.h b/indra/llimagej2coj/llimagej2coj.h index 40ad4edb00..5c6193944e 100644 --- a/indra/llimagej2coj/llimagej2coj.h +++ b/indra/llimagej2coj/llimagej2coj.h @@ -35,12 +35,13 @@ public: LLImageJ2COJ(); virtual ~LLImageJ2COJ(); protected: - /*virtual*/ BOOL getMetadata(LLImageJ2C &base); - /*virtual*/ BOOL decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decode_time, S32 first_channel, S32 max_channel_count); - /*virtual*/ BOOL encodeImpl(LLImageJ2C &base, const LLImageRaw &raw_image, const char* comment_text, F32 encode_time=0.0, - BOOL reversible = FALSE); - /*virtual*/ BOOL initDecode(LLImageJ2C &base, LLImageRaw &raw_image, int discard_level = -1, int* region = NULL); - /*virtual*/ BOOL initEncode(LLImageJ2C &base, LLImageRaw &raw_image, int blocks_size = -1, int precincts_size = -1, int levels = 0); + virtual bool getMetadata(LLImageJ2C &base); + virtual bool decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decode_time, S32 first_channel, S32 max_channel_count); + virtual bool encodeImpl(LLImageJ2C &base, const LLImageRaw &raw_image, const char* comment_text, F32 encode_time=0.0, + bool reversible = false); + virtual bool initDecode(LLImageJ2C &base, LLImageRaw &raw_image, int discard_level = -1, int* region = NULL); + virtual bool initEncode(LLImageJ2C &base, LLImageRaw &raw_image, int blocks_size = -1, int precincts_size = -1, int levels = 0); + virtual std::string getEngineInfo() const; }; #endif |