summaryrefslogtreecommitdiff
path: root/indra/llkdu/llimagej2ckdu.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-08-04 16:20:39 -0400
committerNat Goodspeed <nat@lindenlab.com>2016-08-04 16:20:39 -0400
commit2ce38c3c9890f6cf65238e125a78cdc57841f3bd (patch)
tree9a6c219da7fed754ff4e9e2c3cd57654c6c4c57d /indra/llkdu/llimagej2ckdu.h
parent2339e759fc2d6f36a4b9425022a22a747ec55dad (diff)
MAINT-6584: Comment out completely unused LLImageJ2CKDU code.
The only call to the findDiscardLevelsBoundaries() method was commented out inside initDecode(), with a comment: // Merov : Test!! DO NOT COMMIT!! This was the only caller of copy_tile(), which was the only caller of copy_block(). Commented out all three of these (biggish!) functions, since I have no idea what any of them were supposed to do or when it might be useful to call them. In other words, I can't yet rule out the possibility that I might have to uncomment them.
Diffstat (limited to 'indra/llkdu/llimagej2ckdu.h')
-rw-r--r--indra/llkdu/llimagej2ckdu.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llkdu/llimagej2ckdu.h b/indra/llkdu/llimagej2ckdu.h
index 5fb093826e..7d234435a4 100644
--- a/indra/llkdu/llimagej2ckdu.h
+++ b/indra/llkdu/llimagej2ckdu.h
@@ -74,13 +74,18 @@ protected:
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;
- void findDiscardLevelsBoundaries(LLImageJ2C &base);
private:
bool initDecode(LLImageJ2C &base, LLImageRaw &raw_image, F32 decode_time, ECodeStreamMode mode, S32 first_channel, S32 max_channel_count, int discard_level = -1, int* region = NULL);
void setupCodeStream(LLImageJ2C &base, bool keep_codestream, ECodeStreamMode mode);
void cleanupCodeStream();
+ // This method was public, but the only call to it is commented out in our
+ // own initDecode() method. I (nat 2016-08-04) don't know what it does or
+ // why. Even if it should be uncommented, it should probably still be
+ // private.
+// void findDiscardLevelsBoundaries(LLImageJ2C &base);
+
// Helper class to hold a kdu_codestream, which is a handle to the
// underlying implementation object. When CodeStreamHolder is reset() or
// destroyed, it calls kdu_codestream::destroy() -- which kdu_codestream