From 04adbdad4bb13cb98c77bba17fcc9a16e0f44203 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 12 Nov 2010 16:37:42 -0800 Subject: STORM-151 : Got decompression to work, compression disabled, simplified llkdu building --- indra/llkdu/llkdumem.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'indra/llkdu/llkdumem.h') diff --git a/indra/llkdu/llkdumem.h b/indra/llkdu/llkdumem.h index fecb4653db..f0580cf84f 100644 --- a/indra/llkdu/llkdumem.h +++ b/indra/llkdu/llkdumem.h @@ -30,11 +30,11 @@ // Support classes for reading and writing from memory buffers // for KDU #include "kdu_image.h" -#include "kdu/kdu_elementary.h" -#include "kdu/kdu_messaging.h" -#include "kdu/kdu_params.h" -#include "kdu/kdu_compressed.h" -#include "kdu/kdu_sample_processing.h" +#include "kdu_elementary.h" +#include "kdu_messaging.h" +#include "kdu_params.h" +#include "kdu_compressed.h" +#include "kdu_sample_processing.h" #include "kdu_image_local.h" #include "stdtypes.h" @@ -142,6 +142,7 @@ private: // Data U32 mDataSize; }; +/* class LLKDUMemOut : public kdu_image_out_base { public: // Member functions @@ -163,5 +164,5 @@ private: // Data U32 mCurPos; U32 mDataSize; }; - +*/ #endif -- cgit v1.2.3 From e3d95ddb9a3e6abc8e800edf77cf3b0e4f5c4b8f Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Mon, 15 Nov 2010 21:28:16 -0800 Subject: STORM-151 : Make kdu decompression work without ugly hack in library header names --- indra/llkdu/llkdumem.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llkdu/llkdumem.h') diff --git a/indra/llkdu/llkdumem.h b/indra/llkdu/llkdumem.h index f0580cf84f..b1b2516095 100644 --- a/indra/llkdu/llkdumem.h +++ b/indra/llkdu/llkdumem.h @@ -35,7 +35,7 @@ #include "kdu_params.h" #include "kdu_compressed.h" #include "kdu_sample_processing.h" -#include "kdu_image_local.h" +#include "image_local.h" #include "stdtypes.h" class LLKDUMemSource: public kdu_compressed_source -- cgit v1.2.3 From 71fa0894981bacd26ed07b8a8ab542dcaf2e7ae2 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Wed, 15 Dec 2010 20:54:25 -0800 Subject: STORM-151 : Suppress unused code, clean up code formating, fix typos --- indra/llkdu/llkdumem.h | 33 +++++---------------------------- 1 file changed, 5 insertions(+), 28 deletions(-) (limited to 'indra/llkdu/llkdumem.h') diff --git a/indra/llkdu/llkdumem.h b/indra/llkdu/llkdumem.h index b1b2516095..7064de4408 100644 --- a/indra/llkdu/llkdumem.h +++ b/indra/llkdu/llkdumem.h @@ -27,8 +27,7 @@ #ifndef LL_LLKDUMEM_H #define LL_LLKDUMEM_H -// Support classes for reading and writing from memory buffers -// for KDU +// Support classes for reading and writing from memory buffers in KDU #include "kdu_image.h" #include "kdu_elementary.h" #include "kdu_messaging.h" @@ -70,6 +69,7 @@ public: // Member functions { mCurPos = 0; } + private: // Data U8 *mData; U32 mSize; @@ -107,6 +107,7 @@ public: // Member functions *mOutputSize = mCurPos; return true; } + private: // Data U8 *mData; U32 mSize; @@ -114,7 +115,6 @@ private: // Data U32 *mOutputSize; }; - class LLKDUMemIn : public kdu_image_in_base { public: // Member functions @@ -125,10 +125,11 @@ public: // Member functions U8 in_num_components, siz_params *siz); ~LLKDUMemIn(); + bool get(int comp_idx, kdu_line_buf &line, int x_tnum); - const U8 *mData; private: // Data + const U8 *mData; int first_comp_idx; int num_components; int rows, cols; @@ -141,28 +142,4 @@ private: // Data U32 mCurPos; U32 mDataSize; }; - -/* -class LLKDUMemOut : public kdu_image_out_base -{ -public: // Member functions - LLKDUMemOut(U8 *data, siz_params *siz, U8 in_num_components); - LLKDUMemOut(siz_params *siz, U8 in_num_components); - ~LLKDUMemOut(); - void put(int comp_idx, kdu_line_buf &line, int x_tnum); - - U8 *mData; -private: // Data - int first_comp_idx; - int num_components; - int rows, cols; - int precision[3]; - image_line_buf *incomplete_lines; // Each "sample" represents a full pixel - image_line_buf *free_lines; - int num_unwritten_rows; - - U32 mCurPos; - U32 mDataSize; -}; -*/ #endif -- cgit v1.2.3