From 3920405c4c8598fc10c63c6ac34300fc8f853e0a Mon Sep 17 00:00:00 2001 From: Patrick Vogler Date: Tue, 30 Apr 2024 17:04:30 +0200 Subject: [PATCH] API Clean Up to remove unsupported (de)compression instructions. --- include/library/private/libbwc.h | 8 +-- src/library/codestream.c | 8 +-- src/library/libbwc.c | 10 ++-- src/tools/bwccmdl.c | 90 ++++++++++++++++---------------- 4 files changed, 58 insertions(+), 58 deletions(-) diff --git a/include/library/private/libbwc.h b/include/library/private/libbwc.h index 36d6e92..908c063 100755 --- a/include/library/private/libbwc.h +++ b/include/library/private/libbwc.h @@ -90,16 +90,16 @@ //==========|==========================|======================|======|=======|==================== void bwc_set_error_resilience (bwc_field *const field); //==========|==========================|======================|======|=======|==================== - void bwc_set_quant_style (bwc_field *const field, + void set_quant_style (bwc_field *const field, bwc_quant_st const quantization_style); //==========|==========================|======================|======|=======|==================== - void bwc_set_quant_step_size (bwc_field *const field, + void set_quant_step_size (bwc_field *const field, double const delta); //==========|==========================|======================|======|=======|==================== - void bwc_set_progression (bwc_field *const field, + void set_progression (bwc_field *const field, bwc_prog_ord const progression); //==========|==========================|======================|======|=======|==================== - void bwc_set_kernels (bwc_field *const field, + void set_kernels (bwc_field *const field, bwc_dwt_filter const KernelX, bwc_dwt_filter const KernelY, bwc_dwt_filter const KernelZ, diff --git a/src/library/codestream.c b/src/library/codestream.c index ca96310..2ae6c73 100755 --- a/src/library/codestream.c +++ b/src/library/codestream.c @@ -703,7 +703,7 @@ parse_main_header(bwc_data *const data,bitstream *const stream) if(CSsgc & (0x01 << 1)) { - bwc_set_quant_style(field, (bwc_quant_st)buff_long); + set_quant_style(field, (bwc_quant_st)buff_long); } buff_long = get_symbol(stream, 1); @@ -719,14 +719,14 @@ parse_main_header(bwc_data *const data,bitstream *const stream) buff_long = get_symbol(stream, 1); if(CSsgc & (0x01 << 3)) { - bwc_set_progression(field, (uint8)buff_long); + set_progression(field, (uint8)buff_long); } buff_long = get_symbol(stream, 1); if(CSsgc & (0x01 << 4)) { - bwc_set_kernels(field, (uint8)(0x03 & (buff_long >> 6)), (uint8)(0x03 & (buff_long >> 4)), - (uint8)(0x03 & (buff_long >> 2)), (uint8)(0x03 & buff_long)); + set_kernels(field, (uint8)(0x03 & (buff_long >> 6)), (uint8)(0x03 & (buff_long >> 4)), + (uint8)(0x03 & (buff_long >> 2)), (uint8)(0x03 & buff_long)); } buff_long = get_symbol(stream, 4); diff --git a/src/library/libbwc.c b/src/library/libbwc.c index c0fcf84..d8648bb 100755 --- a/src/library/libbwc.c +++ b/src/library/libbwc.c @@ -2709,7 +2709,7 @@ bwc_set_error_resilience(bwc_field *const field) ! ! \*----------------------------------------------------------------------------------------------------------*/ void -bwc_set_quant_style(bwc_field *const field, bwc_quant_st quantization_style) +set_quant_style(bwc_field *const field, bwc_quant_st quantization_style) { /*-----------------------*\ ! DEFINE STRUCTS: ! @@ -2775,7 +2775,7 @@ bwc_set_quant_style(bwc_field *const field, bwc_quant_st quantization_style) ! ! \*----------------------------------------------------------------------------------------------------------*/ void -bwc_set_quant_step_size(bwc_field *const field, double delta) +set_quant_step_size(bwc_field *const field, double delta) { /*-----------------------*\ ! DEFINE STRUCTS: ! @@ -2880,7 +2880,7 @@ bwc_set_quant_step_size(bwc_field *const field, double delta) ! ! \*----------------------------------------------------------------------------------------------------------*/ void -bwc_set_progression(bwc_field *const field, bwc_prog_ord progression) +set_progression(bwc_field *const field, bwc_prog_ord progression) { /*-----------------------*\ ! DEFINE STRUCTS: ! @@ -2953,8 +2953,8 @@ bwc_set_progression(bwc_field *const field, bwc_prog_ord progression) ! ! \*----------------------------------------------------------------------------------------------------------*/ void -bwc_set_kernels(bwc_field *const field, bwc_dwt_filter KernelX, bwc_dwt_filter KernelY, - bwc_dwt_filter KernelZ, bwc_dwt_filter KernelTS) +set_kernels(bwc_field *const field, bwc_dwt_filter KernelX, bwc_dwt_filter KernelY, + bwc_dwt_filter KernelZ, bwc_dwt_filter KernelTS) { /*-----------------------*\ ! DEFINE STRUCTS: ! diff --git a/src/tools/bwccmdl.c b/src/tools/bwccmdl.c index 672d973..32c928d 100644 --- a/src/tools/bwccmdl.c +++ b/src/tools/bwccmdl.c @@ -2751,38 +2751,38 @@ main(int argc, /*--------------------------------------------------------*\ ! ! \*--------------------------------------------------------*/ - temp = retrieve_arg(args, "wavelet_kernels"); - if((temp != NULL) && (temp->count == 4) && (temp->dim != 0x00)) - { - for(i = 0; i < temp->count; ++i) - { - switch(hash(temp->lit_opt[i])) - { - case 0x000000000B87CF64: - { - filter[i] = bwc_dwt_9_7; - break; - } - case 0x00000652AB15772A: - { - filter[i] = bwc_dwt_5_3; - break; - } - case 0x000000017C858EFF: - { - filter[i] = bwc_dwt_5_3; - break; - } - default: - { - filter[i] = bwc_dwt_9_7; - break; - } - } - } - bwc_set_kernels(field, filter[0], filter[1], - filter[2], filter[3]); - } + // temp = retrieve_arg(args, "wavelet_kernels"); + // if((temp != NULL) && (temp->count == 4) && (temp->dim != 0x00)) + // { + // for(i = 0; i < temp->count; ++i) + // { + // switch(hash(temp->lit_opt[i])) + // { + // case 0x000000000B87CF64: + // { + // filter[i] = bwc_dwt_9_7; + // break; + // } + // case 0x00000652AB15772A: + // { + // filter[i] = bwc_dwt_5_3; + // break; + // } + // case 0x000000017C858EFF: + // { + // filter[i] = bwc_dwt_5_3; + // break; + // } + // default: + // { + // filter[i] = bwc_dwt_9_7; + // break; + // } + // } + // } + // bwc_set_kernels(field, filter[0], filter[1], + // filter[2], filter[3]); + // } /*--------------------------------------------------------*\ ! ! @@ -2827,23 +2827,23 @@ main(int argc, /*--------------------------------------------------------*\ ! ! \*--------------------------------------------------------*/ - temp = retrieve_arg(args, "quantisation_style"); - if((temp != NULL) && (temp->count == 1)) - { - if(strcmp(temp->lit_opt[0], "NONE")) - bwc_set_quant_style(field, bwc_qt_none); - else - bwc_set_quant_style(field, bwc_qt_derived); - } + // temp = retrieve_arg(args, "quantisation_style"); + // if((temp != NULL) && (temp->count == 1)) + // { + // if(strcmp(temp->lit_opt[0], "NONE")) + // bwc_set_quant_style(field, bwc_qt_none); + // else + // bwc_set_quant_style(field, bwc_qt_derived); + // } /*--------------------------------------------------------*\ ! ! \*--------------------------------------------------------*/ - temp = retrieve_arg(args, "quantisation_step_size"); - if((temp != NULL) && (temp->count == 1)) - { - bwc_set_quant_step_size(field, temp->num_opt[0]); - } + // temp = retrieve_arg(args, "quantisation_step_size"); + // if((temp != NULL) && (temp->count == 1)) + // { + // bwc_set_quant_step_size(field, temp->num_opt[0]); + // } /*--------------------------------------------------------*\ ! !