diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-12-24 11:36:15 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-12-24 11:36:15 -0800 |
| commit | 0c5bd3675babb0cbe6f3c7312350b71b8229e5d3 (patch) | |
| tree | f5827f0e6d0222c2cc7d9ef908a6106f603a8ca3 /indra/llimagej2coj/llimagej2coj.h | |
| parent | e874b156c5861226fcca9d7bfa7f6131790eaf0d (diff) | |
STORM-744 : Took code review into account, moving stuff back in protected or even private, fix things to work in debug mode, some clean up in j2coj also
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 |