From 0fe36daf5636db0e3d1efad7824419924704eaf0 Mon Sep 17 00:00:00 2001 From: Jon Wolk Date: Wed, 10 Jan 2007 21:54:56 +0000 Subject: svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56631 svn+ssh://svn.lindenlab.com/svn/linden/branches/abstract-kdu@56647 --ignore-ancestry --- indra/llimage/llimagej2c.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'indra/llimage/llimagej2c.h') diff --git a/indra/llimage/llimagej2c.h b/indra/llimage/llimagej2c.h index ee73612bc7..4a3b017a55 100644 --- a/indra/llimage/llimagej2c.h +++ b/indra/llimage/llimagej2c.h @@ -13,7 +13,6 @@ #include "llassettype.h" class LLImageJ2CImpl; - class LLImageJ2C : public LLImageFormatted { protected: @@ -46,6 +45,9 @@ public: static S32 calcHeaderSizeJ2C(); static S32 calcDataSizeJ2C(S32 w, S32 h, S32 comp, S32 discard_level, F32 rate = 0.f); + + static void openDSO(); + static void closeDSO(); protected: friend class LLImageJ2CImpl; @@ -63,8 +65,9 @@ protected: // Derive from this class to implement JPEG2000 decoding class LLImageJ2CImpl { -protected: +public: virtual ~LLImageJ2CImpl(); +protected: virtual BOOL getMetadata(LLImageJ2C &base) = 0; virtual BOOL decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decode_time, S32 first_channel, S32 max_channel_count) = 0; virtual BOOL encodeImpl(LLImageJ2C &base, const LLImageRaw &raw_image, const char* comment_text, F32 encode_time=0.0) = 0; -- cgit v1.2.3