Skip to content

Added new HTjpeg2000 0.7.3 #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Added new HTjpeg2000 0.7.3 #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1527533
Added new HTjpeg2000 0.7.3
Jamaika1 Mar 13, 2021
42c8dbf
Added new HTjpeg2000 0.7.3
Jamaika1 Mar 13, 2021
26aa19a
Added new HTjpeg2000 0.7.3
Jamaika1 Mar 13, 2021
175d4a8
Added new HTjpeg2000 0.7.3
Jamaika1 Mar 13, 2021
ffa7a7b
Added new HTjpeg2000 0.7.3
Jamaika1 Mar 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/lib/jp2/grok.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,6 @@ bool GRK_CALLCONV grk_initialize(const char *pluginPath, uint32_t numthreads) {
info.pluginPath = pluginPath;
is_plugin_initialized = grk_plugin_load(info);
}
ojph::local::decode_vlc_init_tables();
ojph::local::encode_vlc_init_tables();
ojph::local::encode_uvlc_init_tables();

return is_plugin_initialized;
}
Expand Down
6 changes: 3 additions & 3 deletions src/lib/jp2/t1/t1_ht/T1HT.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ bool T1HT::compress(CompressBlockExec *block) {
uint16_t w = (uint16_t)cblk->width();
uint16_t h = (uint16_t)cblk->height();

uint32_t pass_length[2] = {0,0};
ojph_encode_codeblock((uint32_t*)unencoded_data, block->k_msbs,1,
int pass_length[2] = {0,0};
ojph_encode_codeblock((ojph::si32*)unencoded_data, block->k_msbs,1,
w, h, w,
pass_length,
elastic_alloc,
Expand Down Expand Up @@ -156,7 +156,7 @@ bool T1HT::decompress(DecompressBlockExec *block) {
bool rc = false;
if (num_passes && offset) {
rc = ojph_decode_codeblock(actual_coded_data,
(uint32_t*)unencoded_data,
(ojph::si32*)unencoded_data,
block->k_msbs,
(uint32_t)num_passes,
(uint32_t)offset,
Expand Down
1,736 changes: 658 additions & 1,078 deletions src/lib/jp2/t1/t1_ht/coding/ojph_block_decoder.cpp
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 3 additions & 5 deletions src/lib/jp2/t1/t1_ht/coding/ojph_block_decoder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,9 @@ namespace ojph {
//decodes the cleanup pass, significance propagation pass,
// and magnitude refinement pass
bool
ojph_decode_codeblock(ui8* coded_data, ui32* decoded_data,
ui32 missing_msbs, ui32 num_passes, ui32 lengths1, ui32 lengths2,
ui32 width, ui32 height, ui32 stride);

bool decode_vlc_init_tables();
ojph_decode_codeblock(ui8* coded_data, si32* decoded_data,
int missing_msbs, int num_passes, int lengths1, int lengths2,
int width, int height, int stride);
}
}

Expand Down
Loading