diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:41:05 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:41:05 -0500 |
| commit | e4591a85182133811e327b579c558bb3db80d79e (patch) | |
| tree | 13c4847d919939c9b50386d1dfcbc5837201c60e /indra/llimagej2coj/llimagej2coj.h | |
| parent | d420ca89b438ebfb15dd3be8f5ec427361dfddaa (diff) | |
| parent | 67ced403e624599f23020c8b8bd802947e602d31 (diff) | |
merge changes for storm-466
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 |