diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-06-26 16:43:58 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-06-26 16:43:58 -0400 |
commit | 74d4f8af01358c0975351f90f044c03bc9c50c4c (patch) | |
tree | 72b8f043cd5787409718d1ca7be21ec32cf10657 /indra/llkdu/tests/llimagej2ckdu_test.cpp | |
parent | 52411f83a1e92d8449f68a6528f5b78e7c391553 (diff) | |
parent | 90547ff411db177bf6424ca553449a81a808fc0f (diff) |
v-r to drano merge conflicts wip
Diffstat (limited to 'indra/llkdu/tests/llimagej2ckdu_test.cpp')
-rwxr-xr-x[-rw-r--r--] | indra/llkdu/tests/llimagej2ckdu_test.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llkdu/tests/llimagej2ckdu_test.cpp b/indra/llkdu/tests/llimagej2ckdu_test.cpp index e66476a913..b675153b2e 100644..100755 --- a/indra/llkdu/tests/llimagej2ckdu_test.cpp +++ b/indra/llkdu/tests/llimagej2ckdu_test.cpp @@ -127,7 +127,6 @@ kdu_subband kdu_resolution::access_subband(int ) { kdu_subband a; return a; } void kdu_resolution::get_dims(kdu_dims& ) { } int kdu_resolution::which() { return 0; } int kdu_resolution::get_valid_band_indices(int &) { return 1; } -//kdu_decoder::kdu_decoder(kdu_subband , kdu_sample_allocator*, bool , float, int, kdu_thread_env*, kdu_thread_queue*) { } kdu_synthesis::kdu_synthesis(kdu_resolution, kdu_sample_allocator*, bool, float, kdu_thread_env*, kdu_thread_queue*) { } kdu_params::kdu_params(const char*, bool, bool, bool, bool, bool) { } kdu_params::~kdu_params() { } |