diff --git a/autobuild.xml b/autobuild.xml index 85182dfd0f..714cc5f7db 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1430,9 +1430,9 @@ archive hash - ae5e86bbe3376d107960e1364cada76a + 1310525b07b37fb6c869ba1af24425ce url - file:///opt/firestorm/kdu-7.4.0-linux-20140605.tar.bz2 + file:///opt/firestorm/kdu-7.5.0-linux-20141007.tar.bz2 name linux diff --git a/indra/llkdu/llimagej2ckdu.h b/indra/llkdu/llimagej2ckdu.h index fb1f6535ba..5dce783945 100755 --- a/indra/llkdu/llimagej2ckdu.h +++ b/indra/llkdu/llimagej2ckdu.h @@ -39,6 +39,12 @@ #include "kdu_compressed.h" #include "kdu_sample_processing.h" +// KDU >= 7.5.0 uses namespaces for nicer encapsulation. To avoid cluttering this all over LLs source we're going with this. +#if KDU_MAJOR_VERSION >= 7 && KDU_MINOR_VERSION >= 5 + using namespace kdu_core; +#endif +// + class LLKDUDecodeState; class LLKDUMemSource; diff --git a/indra/llkdu/llkdumem.h b/indra/llkdu/llkdumem.h index 00d2c12cb4..6977013643 100755 --- a/indra/llkdu/llkdumem.h +++ b/indra/llkdu/llkdumem.h @@ -48,6 +48,13 @@ #include "image_local.h" #include "stdtypes.h" +// KDU >= 7.5.0 uses namespaces for nicer encapsulation. To avoid cluttering this all over LLs source we're going with this. +#if KDU_MAJOR_VERSION >= 7 && KDU_MINOR_VERSION >= 5 + using namespace kdu_core; + using namespace kd_supp_image_local; +#endif +// + // Disable warning 4263/4264 #ifdef LL_WINDOWS #pragma warning(pop)