diff options
| author | Wolfpup Lowenhar <wolfpup67@earthlink.net> | 2010-12-30 16:40:10 -0500 |
|---|---|---|
| committer | Wolfpup Lowenhar <wolfpup67@earthlink.net> | 2010-12-30 16:40:10 -0500 |
| commit | df0a0312fb1923164c6d693c675a365bb8cef1df (patch) | |
| tree | 9c9f97e065dc23c803b9adbfabd015613277c50a /indra/llimagej2coj/llimagej2coj.h | |
| parent | 44e6327674bbe45d92e3411c24ff51b5c4318bbb (diff) | |
| parent | cc3f0d287c7edb9e4cfe18985f2758e815502440 (diff) | |
STORM-825 : update Merge from viewer-development
Diffstat (limited to 'indra/llimagej2coj/llimagej2coj.h')
| -rw-r--r-- | indra/llimagej2coj/llimagej2coj.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/llimagej2coj/llimagej2coj.h b/indra/llimagej2coj/llimagej2coj.h index 7edacbe97c..9476665ccb 100644 --- a/indra/llimagej2coj/llimagej2coj.h +++ b/indra/llimagej2coj/llimagej2coj.h @@ -34,17 +34,11 @@ class LLImageJ2COJ : public LLImageJ2CImpl 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); - int ceildivpow2(int a, int b) - { - // Divide a by b to the power of 2 and round upwards. - return (a + (1 << b) - 1) >> b; - } }; #endif |