STORM-151 : Got decompression to work, compression disabled, simplified llkdu building

9 files changed, 46 insertions, 60 deletions

diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake
index 25703ee785..0c103e89d2 100644
--- a/indra/cmake/LLKDU.cmake
+++ b/indra/cmake/LLKDU.cmake
@@ -15,10 +15,8 @@ if (USE_KDU)
     set(KDU_LIBRARY kdu)
   endif (WINDOWS)
 
-  set(KDU_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
+  set(KDU_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/kdu)
 
   set(LLKDU_LIBRARY llkdu)
-  set(LLKDU_STATIC_LIBRARY llkdu_static)
   set(LLKDU_LIBRARIES ${LLKDU_LIBRARY})
-  set(LLKDU_STATIC_LIBRARIES ${LLKDU_STATIC_LIBRARY})
 endif (USE_KDU)
diff --git a/indra/llkdu/CMakeLists.txt b/indra/llkdu/CMakeLists.txt
index 2806af26c3..0932d368b5 100644
--- a/indra/llkdu/CMakeLists.txt
+++ b/indra/llkdu/CMakeLists.txt
@@ -25,26 +25,12 @@ include_directories(
     )
 
 set(llkdu_SOURCE_FILES
-    kdc_flow_control.cpp
-    kde_flow_control.cpp
-    kdu_image.cpp
-    llblockdata.cpp
-    llblockdecoder.cpp
-    llblockencoder.cpp
     llimagej2ckdu.cpp
     llkdumem.cpp
     )
 
 set(llkdu_HEADER_FILES
     CMakeLists.txt
-
-    kdc_flow_control.h
-    kde_flow_control.h
-    kdu_image.h
-    kdu_image_local.h
-    llblockdata.h
-    llblockdecoder.h
-    llblockencoder.h
     llimagej2ckdu.h
     llkdumem.h
     )
@@ -71,15 +57,11 @@ if (WINDOWS)
 endif (WINDOWS)
 
 if (LLKDU_LIBRARY)
-  add_library (${LLKDU_STATIC_LIBRARY} ${llkdu_SOURCE_FILES})
+  add_library (${LLKDU_LIBRARY} ${llkdu_SOURCE_FILES})
   
   target_link_libraries(
-        ${LLKDU_STATIC_LIBRARY}
-#        ${LLIMAGE_LIBRARIES}
-#        ${LLVFS_LIBRARIES}
+        ${LLKDU_LIBRARY}
         ${LLMATH_LIBRARIES}
-#        ${LLCOMMON_LIBRARIES}
         ${KDU_LIBRARY}
-#        ${WINDOWS_LIBRARIES}
         )
 endif (LLKDU_LIBRARY)
diff --git a/indra/llkdu/llblockdecoder.cpp b/indra/llkdu/llblockdecoder.cpp
index b4ddb2fba2..3daa016591 100644
--- a/indra/llkdu/llblockdecoder.cpp
+++ b/indra/llkdu/llblockdecoder.cpp
@@ -29,14 +29,11 @@
 #include "llblockdecoder.h"
 
 // KDU core header files
-#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"
-
-// KDU utility functions.
-#include "kde_flow_control.h"
+#include "kdu_elementary.h"
+#include "kdu_messaging.h"
+#include "kdu_params.h"
+#include "kdu_compressed.h"
+#include "kdu_sample_processing.h"
 
 #include "llkdumem.h"
 
diff --git a/indra/llkdu/llblockencoder.cpp b/indra/llkdu/llblockencoder.cpp
index f19841e36f..759eaf65f9 100644
--- a/indra/llkdu/llblockencoder.cpp
+++ b/indra/llkdu/llblockencoder.cpp
@@ -29,14 +29,11 @@
 #include "llblockencoder.h"
 
 // KDU core header files
-#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"
-
-// KDU utility functions.
-#include "kdc_flow_control.h"
+#include "kdu_elementary.h"
+#include "kdu_messaging.h"
+#include "kdu_params.h"
+#include "kdu_compressed.h"
+#include "kdu_sample_processing.h"
 
 #include "llkdumem.h"
 
diff --git a/indra/llkdu/llimagej2ckdu.cpp b/indra/llkdu/llimagej2ckdu.cpp
index 1785aa111d..147b9829c5 100644
--- a/indra/llkdu/llimagej2ckdu.cpp
+++ b/indra/llkdu/llimagej2ckdu.cpp
@@ -27,15 +27,10 @@
 #include "linden_common.h"
 #include "llimagej2ckdu.h"
 
-// KDU utility functions.
-#include "kde_flow_control.h"
-#include "kdc_flow_control.h"
-
 #include "lltimer.h"
 #include "llpointer.h"
 #include "llkdumem.h"
 
-
 //
 // Kakadu specific implementation
 //
@@ -113,7 +108,8 @@ void ll_kdu_error( void )
 class LLKDUMessageWarning : public kdu_message
 {
 public:
-	/*virtual*/ void put_text(const char *string);
+	/*virtual*/ void put_text(const char *s);
+	/*virtual*/ void put_text(const kdu_uint16 *s);
 
 	static LLKDUMessageWarning sDefaultMessage;
 };
@@ -121,7 +117,8 @@ public:
 class LLKDUMessageError : public kdu_message
 {
 public:
-	/*virtual*/ void put_text(const char *string);
+	/*virtual*/ void put_text(const char *s);
+	/*virtual*/ void put_text(const kdu_uint16 *s);
 	/*virtual*/ void flush(bool end_of_message=false);
 	static LLKDUMessageError sDefaultMessage;
 };
@@ -131,11 +128,21 @@ void LLKDUMessageWarning::put_text(const char *s)
 	llinfos << "KDU Warning: " << s << llendl;
 }
 
+void LLKDUMessageWarning::put_text(const kdu_uint16 *s)
+{
+	llinfos << "KDU Warning: " << s << llendl;
+}
+
 void LLKDUMessageError::put_text(const char *s)
 {
 	llinfos << "KDU Error: " << s << llendl;
 }
 
+void LLKDUMessageError::put_text(const kdu_uint16 *s)
+{
+	llinfos << "KDU Error: " << s << llendl;
+}
+
 void LLKDUMessageError::flush(bool end_of_message)
 {
 	if( end_of_message ) 
@@ -467,7 +474,7 @@ BOOL LLImageJ2CKDU::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 deco
 BOOL LLImageJ2CKDU::encodeImpl(LLImageJ2C &base, const LLImageRaw &raw_image, const char* comment_text, F32 encode_time, BOOL reversible)
 {
 	// Collect simple arguments.
-
+/*
 	bool transpose, vflip, hflip;
 	bool allow_rate_prediction, allow_shorts, mem, quiet, no_weights;
 	int cpu_iterations;
@@ -685,6 +692,9 @@ BOOL LLImageJ2CKDU::encodeImpl(LLImageJ2C &base, const LLImageRaw &raw_image, co
 	}
 
 	return TRUE;
+ */
+	// Compression not implemented yet
+	return FALSE;
 }
 
 BOOL LLImageJ2CKDU::getMetadata(LLImageJ2C &base)
diff --git a/indra/llkdu/llimagej2ckdu.h b/indra/llkdu/llimagej2ckdu.h
index 5794ebdc68..ac0443d8fc 100644
--- a/indra/llkdu/llimagej2ckdu.h
+++ b/indra/llkdu/llimagej2ckdu.h
@@ -33,11 +33,11 @@
 // 
 //
 // KDU core header files
-#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"
 
 class LLKDUDecodeState;
 class LLKDUMemSource;
diff --git a/indra/llkdu/llkdumem.cpp b/indra/llkdu/llkdumem.cpp
index 80f4c444d1..811c5b52bb 100644
--- a/indra/llkdu/llkdumem.cpp
+++ b/indra/llkdu/llkdumem.cpp
@@ -199,7 +199,7 @@ bool LLKDUMemIn::get(int comp_idx, kdu_line_buf &line, int x_tnum)
 }
 
 
-
+/*
 LLKDUMemOut::LLKDUMemOut(U8 *data, siz_params *siz, U8 in_num_components)
 {
 	int is_signed = 0;
@@ -390,3 +390,4 @@ void LLKDUMemOut::put(int comp_idx, kdu_line_buf &line, int x_tnum)
 		free_lines = scan;
     }
 }
+*/
\ No newline at end of file
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
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 2515321a6c..8d6c9d7f7b 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1675,7 +1675,7 @@ target_link_libraries(${VIEWER_BINARY_NAME}
 
 if (LLKDU_LIBRARY)
     target_link_libraries(${VIEWER_BINARY_NAME}
-        ${LLKDU_STATIC_LIBRARIES}
+        ${LLKDU_LIBRARIES}
         ${KDU_LIBRARY}
         )
 else (LLKDU_LIBRARY)