From c2772bc13a9e3e2044706a0e41c7b5c0fe86e9ed Mon Sep 17 00:00:00 2001 From: callum_linden Date: Fri, 17 Oct 2014 15:35:28 -0700 Subject: Update to build on Xcode 6.0: explicitly supress certain warnings in KDU package files --- indra/llkdu/llimagej2ckdu.h | 6 ++++++ indra/llkdu/llkdumem.h | 5 +++++ 2 files changed, 11 insertions(+) (limited to 'indra/llkdu') diff --git a/indra/llkdu/llimagej2ckdu.h b/indra/llkdu/llimagej2ckdu.h index fb1f6535ba..e3b0452293 100755 --- a/indra/llkdu/llimagej2ckdu.h +++ b/indra/llkdu/llimagej2ckdu.h @@ -36,7 +36,13 @@ #include "kdu_elementary.h" #include "kdu_messaging.h" #include "kdu_params.h" + +// don't *really* want to rebuild KDU so turn off specific warnings for this header +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunused-private-field" #include "kdu_compressed.h" +#pragma clang diagnostic pop + #include "kdu_sample_processing.h" class LLKDUDecodeState; diff --git a/indra/llkdu/llkdumem.h b/indra/llkdu/llkdumem.h index dbdf88b2d9..892826f199 100755 --- a/indra/llkdu/llkdumem.h +++ b/indra/llkdu/llkdumem.h @@ -29,7 +29,12 @@ // Support classes for reading and writing from memory buffers in KDU #define KDU_NO_THREADS +// don't *really* want to rebuild KDU so turn off specific warnings for this header +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wself-assign-field" +#pragma clang diagnostic ignored "-Wunused-private-field" #include "kdu_image.h" +#pragma clang diagnostic pop #include "kdu_elementary.h" #include "kdu_messaging.h" #include "kdu_params.h" -- cgit v1.2.3 From f3baf8dc4e900a4e8d4005e31f20be2bae162a56 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Mon, 20 Oct 2014 16:02:03 -0700 Subject: Update to build on Xcode 6.0: remove #pragmas from code to deal with tut warnigs/errors (moved to package) AND bracket clang #pragmas in #if LL_DARWIN --- indra/llkdu/llimagej2ckdu.h | 4 ++++ indra/llkdu/llkdumem.h | 5 +++++ 2 files changed, 9 insertions(+) (limited to 'indra/llkdu') diff --git a/indra/llkdu/llimagej2ckdu.h b/indra/llkdu/llimagej2ckdu.h index e3b0452293..762476ce69 100755 --- a/indra/llkdu/llimagej2ckdu.h +++ b/indra/llkdu/llimagej2ckdu.h @@ -38,10 +38,14 @@ #include "kdu_params.h" // don't *really* want to rebuild KDU so turn off specific warnings for this header +#if LL_DARWIN #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wunused-private-field" #include "kdu_compressed.h" #pragma clang diagnostic pop +#elif +#include "kdu_compressed.h" +#endif #include "kdu_sample_processing.h" diff --git a/indra/llkdu/llkdumem.h b/indra/llkdu/llkdumem.h index 892826f199..a0d304868e 100755 --- a/indra/llkdu/llkdumem.h +++ b/indra/llkdu/llkdumem.h @@ -30,11 +30,16 @@ // Support classes for reading and writing from memory buffers in KDU #define KDU_NO_THREADS // don't *really* want to rebuild KDU so turn off specific warnings for this header +#if LL_DARWIN #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wself-assign-field" #pragma clang diagnostic ignored "-Wunused-private-field" #include "kdu_image.h" #pragma clang diagnostic pop +#elif +#include "kdu_image.h" +#endif + #include "kdu_elementary.h" #include "kdu_messaging.h" #include "kdu_params.h" -- cgit v1.2.3 From d7990bc9b2d906b18ee2b861fc0f0344147cfa05 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Tue, 21 Oct 2014 17:50:31 -0700 Subject: Update to build on Xcode 6.0 (fix unit tests): turn off warnings for multiple unused private members --- indra/llkdu/tests/llimagej2ckdu_test.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'indra/llkdu') diff --git a/indra/llkdu/tests/llimagej2ckdu_test.cpp b/indra/llkdu/tests/llimagej2ckdu_test.cpp index 3f627b65e1..8ee6b16b92 100755 --- a/indra/llkdu/tests/llimagej2ckdu_test.cpp +++ b/indra/llkdu/tests/llimagej2ckdu_test.cpp @@ -28,7 +28,16 @@ #include "linden_common.h" // Class to test #include "llimagej2ckdu.h" + +#if LL_DARWIN +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunused-private-field" +#include "llkdumem.h" +#pragma clang diagnostic pop +#elif #include "llkdumem.h" +#endif + #include "kdu_block_coding.h" // Tut header #include "lltut.h" -- cgit v1.2.3 From b6c6feda4cd9387034880b29051a189eccb4e020 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Wed, 22 Oct 2014 09:25:19 -0700 Subject: Update to build on Xcode 6.0 (fix unit tests): fix function stubbing in KDU --- indra/llkdu/tests/llimagej2ckdu_test.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'indra/llkdu') diff --git a/indra/llkdu/tests/llimagej2ckdu_test.cpp b/indra/llkdu/tests/llimagej2ckdu_test.cpp index 8ee6b16b92..1c9969a5df 100755 --- a/indra/llkdu/tests/llimagej2ckdu_test.cpp +++ b/indra/llkdu/tests/llimagej2ckdu_test.cpp @@ -123,7 +123,6 @@ kdu_block_encoder::kdu_block_encoder() { } kdu_block_decoder::kdu_block_decoder() { } void kdu_block::set_max_passes(int , bool ) { } void kdu_block::set_max_bytes(int , bool ) { } -void kdu_block::set_max_samples(int ) { } void kdu_tile::close(kdu_thread_env* ) { } int kdu_tile::get_num_components() { return 0; } bool kdu_tile::get_ycc() { return false; } @@ -166,7 +165,7 @@ void kdu_codestream::get_valid_tiles(kdu_dims& ) { } void kdu_codestream::create(kdu_compressed_source*, kdu_thread_env*) { } void kdu_codestream::apply_input_restrictions( int, int, int, int, kdu_dims*, kdu_component_access_mode ) { } void kdu_codestream::get_subsampling(int , kdu_coords&, bool ) { } -void kdu_codestream::flush(kdu_long *, int , kdu_uint16 *, bool, bool, double, kdu_thread_env*) { } +void kdu_codestream::flush(kdu_long *, int, kdu_uint16 *, bool, bool, double, kdu_thread_env*, int) { } void kdu_codestream::set_resilient(bool ) { } int kdu_codestream::get_num_components(bool ) { return 0; } kdu_long kdu_codestream::get_total_bytes(bool ) { return 0; } @@ -184,8 +183,7 @@ kdu_block* kdu_subband::open_block(kdu_coords, int*, kdu_thread_env*) { return N bool kdu_codestream_comment::put_text(const char*) { return false; } void kdu_customize_warnings(kdu_message*) { } void kdu_customize_errors(kdu_message*) { } - -kdu_long kdu_multi_analysis::create(kdu_codestream, kdu_tile, bool, kdu_roi_image*, bool, int, kdu_thread_env*, kdu_thread_queue*, bool ) { kdu_long a = 0; return a; } +kdu_long kdu_multi_analysis::create(kdu_codestream, kdu_tile, kdu_thread_env*, kdu_thread_queue*, int, kdu_roi_image*, int) { kdu_long a = 0; return a; } siz_params::siz_params() : kdu_params(NULL, false, false, false, false, false) { } void siz_params::finalize(bool ) { } void siz_params::copy_with_xforms(kdu_params*, int, int, bool, bool, bool) { } -- cgit v1.2.3 From 6bb3fc93926e93154d9651e16e131ffa4c805a2e Mon Sep 17 00:00:00 2001 From: callum_linden Date: Wed, 10 Dec 2014 13:02:36 -0800 Subject: Fix for incorrectly formatted #if statements (worked on clang FWIW!) --- indra/llkdu/llimagej2ckdu.h | 2 +- indra/llkdu/llkdumem.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/llkdu') diff --git a/indra/llkdu/llimagej2ckdu.h b/indra/llkdu/llimagej2ckdu.h index 762476ce69..02281152bf 100755 --- a/indra/llkdu/llimagej2ckdu.h +++ b/indra/llkdu/llimagej2ckdu.h @@ -43,7 +43,7 @@ #pragma clang diagnostic ignored "-Wunused-private-field" #include "kdu_compressed.h" #pragma clang diagnostic pop -#elif +#else #include "kdu_compressed.h" #endif diff --git a/indra/llkdu/llkdumem.h b/indra/llkdu/llkdumem.h index a0d304868e..fab913d93b 100755 --- a/indra/llkdu/llkdumem.h +++ b/indra/llkdu/llkdumem.h @@ -36,7 +36,7 @@ #pragma clang diagnostic ignored "-Wunused-private-field" #include "kdu_image.h" #pragma clang diagnostic pop -#elif +#else #include "kdu_image.h" #endif -- cgit v1.2.3 From 6793fa569b9f4eec11b4df6de1fec61e3207fe4a Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 16 Dec 2014 13:55:15 -0500 Subject: Fix another empty #elif to plain #else. --- indra/llkdu/tests/llimagej2ckdu_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llkdu') diff --git a/indra/llkdu/tests/llimagej2ckdu_test.cpp b/indra/llkdu/tests/llimagej2ckdu_test.cpp index 1c9969a5df..dd20ac295d 100755 --- a/indra/llkdu/tests/llimagej2ckdu_test.cpp +++ b/indra/llkdu/tests/llimagej2ckdu_test.cpp @@ -34,7 +34,7 @@ #pragma clang diagnostic ignored "-Wunused-private-field" #include "llkdumem.h" #pragma clang diagnostic pop -#elif +#else #include "llkdumem.h" #endif -- cgit v1.2.3 From 4a67d99e86569ddd3bbd5162598962548788db0a Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 16 Jan 2015 22:02:09 +0000 Subject: Linux llimagej2ckdu_test.cpp no longer needs obsolete stubs. Use the same signatures as for the other platforms. --- indra/llkdu/tests/llimagej2ckdu_test.cpp | 8 -------- 1 file changed, 8 deletions(-) (limited to 'indra/llkdu') diff --git a/indra/llkdu/tests/llimagej2ckdu_test.cpp b/indra/llkdu/tests/llimagej2ckdu_test.cpp index dd20ac295d..0605fad068 100755 --- a/indra/llkdu/tests/llimagej2ckdu_test.cpp +++ b/indra/llkdu/tests/llimagej2ckdu_test.cpp @@ -191,20 +191,12 @@ int siz_params::write_marker_segment(kdu_output*, kdu_params*, int) { return 0; bool siz_params::check_marker_segment(kdu_uint16, int, kdu_byte a[], int&) { return false; } bool siz_params::read_marker_segment(kdu_uint16, int, kdu_byte a[], int) { return false; } -#ifdef LL_LINUX -// Linux use the old pre KDU v7.0.0 -// *TODO: Supress this legacy stubbs once Linux migrates to v7.0.0 -kdu_decoder::kdu_decoder(kdu_subband , kdu_sample_allocator*, bool , float, int, kdu_thread_env*, kdu_thread_queue*) { } -void kdu_codestream::create(siz_params*, kdu_compressed_target*, kdu_dims*, int, kdu_long ) { } -void kdu_convert_ycc_to_rgb(kdu_line_buf&, kdu_line_buf&, kdu_line_buf&, int) { } -#else kdu_decoder::kdu_decoder(kdu_subband , kdu_sample_allocator*, bool , float, int, kdu_thread_env*, kdu_thread_queue*, int) { } void kdu_codestream::create(siz_params*, kdu_compressed_target*, kdu_dims*, int, kdu_long, kdu_thread_env* ) { } void (*kdu_convert_ycc_to_rgb_rev16)(kdu_int16*,kdu_int16*,kdu_int16*,int); void (*kdu_convert_ycc_to_rgb_irrev16)(kdu_int16*,kdu_int16*,kdu_int16*,int); void (*kdu_convert_ycc_to_rgb_rev32)(kdu_int32*,kdu_int32*,kdu_int32*,int); void (*kdu_convert_ycc_to_rgb_irrev32)(float*,float*,float*,int); -#endif // ------------------------------------------------------------------------------------------- // TUT -- cgit v1.2.3