f4d394d932
additional test to avoid crash due to invalid image size, patch by Christopher Layne
2008-05-22 12:34:29 +00:00
65e5ff0fb4
memory leak fixed in openjpeg.c (opj_destroy_cstr_info()), patch by Carsten Juttner
2008-05-22 09:54:44 +00:00
9652def4de
Corrected the wrong syntax of calloc()...
2008-02-29 09:36:12 +00:00
6d1f3ecc9f
Fixed openjpeg.c for proper initialization of codec context structures (dinfo in opj_create_compress() and opj_create_decompress(). Bug fix suggested by Andrey V. Kiselev
...
Clean up of opj_aligned_malloc(), to just forgo the use of posix_memalign(), as apparently memalign() is what is working better for everyone. Patch by Callum.
2008-02-29 09:33:41 +00:00
396cb1e102
Removed the J2KViewer module, which has been replaced by OPJViewer and fixed the error handling of j2k_decode in jp2.c, thanks to Robin Cornelius
2008-02-28 11:26:04 +00:00
29ea3dde47
In convert.c, corrected imagetobmp() conversion for grayscale. In tcd.c, corrected Rate modification in tcd_init_encode().
2008-02-05 15:15:38 +00:00
04966097fc
In image.c, changed the opj_image_create0() memory allocation from malloc() to calloc() in order to avoid segfaults when freeing the memory allocated for the coding of bad images. Thanks to Christopher Layne for this improvement.
2008-01-22 10:35:26 +00:00
13209d2565
fixed opj_malloc.h for macosx (bugfix provided by janpeder, thanks)
2008-01-16 19:01:13 +00:00
4051e87d06
Patch by Callum Lerwick. Fixed error during encoding using tile option in tcd.c
2008-01-04 15:43:57 +00:00
4619a94ebf
VERSION 1.3.0 RELEASE
2007-12-21 10:39:41 +00:00
287fb0b8fd
Bug fixed by David Bruken. Fixed memory allocation issue in opj_malloc.h.
...
Possible errors in pi_create_encode handled
2007-12-21 10:19:01 +00:00
847b082b64
changed variables names alpha, beta, gamma, delta in dwt.c to avoid re-declarations on Macosx
2007-12-19 14:45:35 +00:00
5f995bcf4b
Fixed allocation problem in pi.c
2007-12-19 13:57:57 +00:00
64ed560f4f
In pi.c, removed the Recursive function pi_check_next_level() and modified the code.
2007-12-19 12:28:40 +00:00
1a33a09726
In mqc.h, changed MQC_NUMCTXS from 32 to 19 as JPEG 2000 only allows 19 possible contexts
2007-12-19 09:13:52 +00:00
26606c71c8
First import of JAVAOpenJPEG, a Java wrapper of OpenJPEG, developed by Patrick Piscaglia of Telemis (www.telemis.com). Thank you Patrick for this new module !
2007-12-10 13:16:01 +00:00
9e5d165e79
Fixed the maximum number of resolutions a user can discard while decoding.
...
Added an error state in J2K_STATE (j2k.c)
2007-11-27 14:00:45 +00:00
c458af9cd6
Avoided ABI breakage
2007-11-14 11:34:48 +00:00
010ae27471
Patch by Callum Lerwick. The opj_tcd_cblk array is one of the largest allocations, because it contains a bunch of static buffers. This also makes it a major source of cache thrashing. This patch allocates the buffers from the heap, and dynamically sizes them in the decoder. I have not yet managed to dynamically size them in the encoder, getting the decoder to do it was tricky enough... I also split opj_tcd_cblk_t into separate encode and decode versions. A lot of fields were not used by both, so this cuts its size even further.
2007-11-14 10:52:02 +00:00
24e189e4d8
Patch by Callum Lerwick. This patch rearranges the largest memory allocations so they're allocated as late as possible, and freed as soon as possible. This cuts memory usage by about half on two large test images.
2007-11-14 08:45:00 +00:00
61a15672bb
Patch by Callum Lerwick. Instead of reinventing realloc, j2k_read_sod now just uses opj_realloc in j2k.c
2007-11-14 08:29:12 +00:00
dbeebe72b9
Patch by Dzonatas and Callum Lerwick. Fp/vectorization patch which basically converts most of the irreversible decode codepath to floating point, eliminating a few rounds of int/fp conversion, resulting in a vast performance improvement, and an increase in accuracy.
2007-11-13 17:35:12 +00:00
4bb067642f
Patches from Callum Lewick: Fixed some spelling errors in dwt.c.
2007-11-08 14:29:39 +00:00
c38de0728d
In t1.c, small change to avoid calling twice t1_getwmsedec()
...
Patch from Callum Lewick. Basic gcc optimization flags in cmake and makefile match.
2007-11-08 14:26:03 +00:00
95d760a173
Fixed a bug which prevented JPWL from working on multi-tiled images; added some more fields in the interface info structures (keep a list of markers, save start packet number for each tile)
2007-11-05 13:05:07 +00:00
9e114bcaa4
Patch from Callum Lewick. Memset patch. See ChangeLog for more details. Thanks Callum !
2007-10-18 12:26:11 +00:00
1f11a4fe90
Changed the way the image structure is allocated when the decoding parameters include some resolutions to discard. This should have a significant impact for the decoding of huge images when some resolutions are discarder (-r parameter)
...
Warning: The output image size is now reduced when discarding resolutions !
2007-10-12 15:04:34 +00:00
ab0473aa42
*Patch from Callum Lewick. Clean up of j2klib.h for the aligned malloc stuff.
...
*convert.c: Changed some error comments for TIFF images
2007-10-10 06:17:28 +00:00
4b60f17bba
Patch from Callum Lewick. Fixed dwt.c where an alignment in buffer was problematic under x86_64.
2007-09-27 12:20:12 +00:00
6265dcfb11
BUG: Fix previous patch from Callum Lerwick. I have no clue what CMAKE_INSTALL_LIBDIR refers too. Bump up cmake 2.2 restriction to cmake 2.4 because of previous patch not backward compatible. Properly set the SOVERSION in a cross plateform way (yes WIN32 is a plateform)
2007-09-25 14:54:49 +00:00
7e40a9475a
Fixed issues with generation of SOP marker.
2007-09-19 14:56:19 +00:00
a6ba04cdf4
Fixed issues with Reading and Writing TIF images in convert.c to avoid segmentation fault.
...
Fixed issues relating to using user specified rates for CINEMA option for multiple images.
2007-09-18 13:07:29 +00:00
55c4c14352
OpenJPEG library interface modified to retain compatibility with version 1.2. Sorry if some of you already adapted their code to the previous interface, but we want to avoid a ABI break....
2007-09-17 15:11:20 +00:00
569bbb0077
Fixed issues with cstr_info when codestream has components with different number of resolutions.
2007-09-17 14:00:43 +00:00
abfba20b99
Patch from Callum Lerwick. Fixed the library linking so it links with the soversion properly set. Fixes up the install targets so that it interacts properly with RPM. Install target for MJ2. Sets some necessary and useful CFLAGS if gcc is in use.
2007-09-12 09:04:03 +00:00
1e705438e4
JPWL encoding is finalized correctly into the JP2 file format; added an additional structure in opj_codestream_info, to keep a record of the written markers
2007-09-11 15:21:12 +00:00
3816e0edf4
Indexes can now be generated when decoding J2K codestreams.
2007-09-07 15:01:55 +00:00
dfcacb8247
One more field in the codestream_info struct for recording the number of packets per tile part; JPWL now distributes the EPBs in all the tile part headers
2007-09-06 15:59:39 +00:00
d3d2a36fbc
Added some fields in the codestream_info structure: they are used to record the position of single tile parts. Changed also the write_index function in the codec, to reflect the presence of this new information.
2007-09-04 14:19:55 +00:00
564e16d5ce
Added the knowledge of JPSEC SEC and INSEC markers (you have to compile the JPWL project). Management of these markers is limited to skipping them without crashing: no real security function at this stage. Deprecated USE_JPSEC and USE_JPWL will be removed next
2007-09-03 13:30:59 +00:00
7a2d96efe1
Added information regarding the end of packet position in the index
2007-08-30 15:32:51 +00:00
acfe0ad645
Changed the OpenJPEG library interface to enable users to access information regarding the codestream (also called index).
2007-08-30 09:51:20 +00:00
d07fa5d9d0
Fixed wrong destructors called in openjpeg.c
...
Fixed bug in j2k_decode_jpt_stream
2007-08-28 10:13:58 +00:00
c101f8049c
The end of main header is calculated after TLM and POC marker for Dcinema.
2007-08-24 15:11:01 +00:00
bd0b6ec2fd
Fixed problem with _mm_malloc under OSX. Thanks to Callum Lerwick for solving that issue.
2007-08-24 13:46:44 +00:00
1d02a8b595
Use <xmmintrin.h> for WIN32, else use <mm_malloc.h>
2007-08-21 12:57:39 +00:00
07be749bf2
Moved the orient flipping into the ctxno_zc table.
...
Thanks to Callum Lerwick who provided all these great patches !
2007-08-21 12:51:57 +00:00
2952874cb8
Replaced the large ctxno_mag lookup table with a small bit of inline-able branchless code
2007-08-21 12:42:55 +00:00
1cfbdcc9ce
Consolidated some calls to mqc_setcurctx. Cleaned up t1_generate_luts to output the proper types.
2007-08-21 12:36:05 +00:00
d4d23c7eb5
Reworks of t1_updateflags to get rid of the shift operation. mqc_setcurctx moved to the header to allow it to be inlined into the t1.
2007-08-21 12:30:08 +00:00
adca52578d
Memory leaks fixed
2007-08-21 12:21:35 +00:00
3810e943b1
Aligned malloc using Intel's _mm_malloc(), cleanup on the t1 memory allocation, getting rid of some leftover debug code
2007-08-21 12:13:54 +00:00
ca2a0114a2
Minor cleanup patch, that gets rid of a bunch of "old style declaration" warnings from Intel's compiler
2007-08-21 12:02:23 +00:00
00e440ebdb
Corrected allocation to take into account the EOC marker
2007-08-21 09:06:13 +00:00
7dcb817e6a
Fixed the DCinema filesize allocation. It now includes the SOT marker size
2007-08-08 09:41:16 +00:00
5dec8bbbe9
2007-07-13 13:07:07 +00:00
4a50efe542
Fixed a bug in JPWL module, which prevented to exploit the full error correction capability of RS codes (e.g. it gave up at 5 errors, even if 6 were correctable); defined a JPWL_MAXIMUM_EPB_ROOM for better customization of the maximum dimension of EPBs (the dimension is pre-calculated on an hypothesis, if it goes beyond 65535 there will be problems, thus we give a little less than the max, let's say 65450)
2007-07-12 08:31:01 +00:00
bdb18ab19c
fixed the size of the memory allocation in cio.c (confusion between bits and bytes)
2007-07-08 16:38:51 +00:00
c924975434
Output image color space set when decoding a JP2 file
2007-06-21 08:26:03 +00:00
3d626da232
Fixed the generation of index files. Now works with cinema formats.
2007-06-15 13:27:43 +00:00
21f2cab710
Release of version 1.2.0
2007-06-04 13:27:25 +00:00
ea9335ff48
Bugs corrected in decoding of command line (getopt.c), in the handling of 16 bit files (t1.c and tcd.c) and the calculation of elapsed time for multiple tiles parts (tcd.c and tdc.h).
2007-06-04 13:23:26 +00:00
1f55aaf4a6
Bug fixed by Sylvain Munaut. Change in the reading of the POC marker. Since COD/COC can be anywhere in the header, the decoder cannot always know while decoding the POC marker the value of numlayers and numresolution.
2007-05-23 16:04:50 +00:00
8be8111008
Patch suggested by Callum Lerwick <seg@haxxed.com>: "This makes the t1 data arrays dynamic, which greatly reduces cache thrashing. Also, some minor cleanup to prevent unnecessary casts"
2007-05-22 13:14:13 +00:00
1bec8fe082
Patch suggested by Callum Lerwick <seg@haxxed.com>: "Some formatting cleanups, so that the long function definitions and calls fit on screen. Use of prefix increment which is theoretically faster, in
...
practice any sane compiler can optimize a postfix increment but its best not to count on such things. Consolidation of some redundant calculations in the inner loops, which becomes very useful in the future autovectorize patch."
2007-05-21 13:08:10 +00:00
7d06d7fb5d
Patch suggested by Callum Lerwick <seg@haxxed.com>: "This changes the flag code in t1 to use a flag_t type, which can then be changed to reduce RAM usage. It is now typedef to a short."
2007-05-21 12:50:03 +00:00
e0ee9becb4
Patch suggested by Callum Lerwick <seg@haxxed.com>: "This patch makes the t1 LUTs static. I actually intend this as a prelude to possibly eliminating some or all of the LUTs entirely."
2007-05-21 09:44:10 +00:00
1200dd871a
MJ2 codec updated from LibOpenJPEG version 0.97 to LibOpenJPEG version 1. Hence, the MJ2 codec will now take advantage of all the improvements and optimizations done on the LibOpenJPEG library.
2007-05-10 14:21:09 +00:00
f3170bf64e
Possibility to choose to apply MCT (multiple component transform) enabled, and new decoding_limit: DECODE_ALL_BUT_PACKETS
2007-05-10 14:13:30 +00:00
2bd0f7b8c4
Modification of the openjpeg.h file to avoid and ABI break with v1.1, removed the dangerous #IFDEF JPWL and added tcp_mct in cparameters.
2007-04-25 17:04:21 +00:00
dbd132dca8
Accepting "j2c" as format for Encoding and Decoding. Modification in image_to_j2k.c.
...
Modified imagetotif() to read images with signed data. Modification in convert.c.
2007-04-10 16:23:48 +00:00
0930d9886b
fix.h, dwt.c and t1.c optimized. Thanks a lot to Dzonatas <dzonatas at dzonux.net> and Callum Lerwick <seg at haxxed.com> for these great patches !
2007-04-05 14:24:19 +00:00
dd18811600
Digital cinema compliance for 4K chosen by "-cinema4K" option. Modification in image_to_j2k.c.
...
Bit rate limitation for each color component. Modification in image_to_j2k.c, t2.c.
Modified and tested Progression order change "-POC" option. Modification in image_to_j2k.c, j2k.c, pi.c.
Function j2k_check_poc_val() to check for possible loss of packets in case of wrong POC declaration. Modification in j2k.c.
Structure T2_MODE. This tells if the t2_encode_packets() is called during Threshold calculation or in Final pass. Modification in j2k.h, tcd.c
2007-04-04 13:40:32 +00:00
9ba672366e
Enable accepting file names with `-´ symbol .Modification getopt.c
...
Rsiz profile name generation to be STD_RSIZ for profiles which are not DCI compliant.Modification in image_to_j2k.c
Renamed convert_progression_order to j2k_convert_progression_order. Modification j2k.c
Calculation of number of tile part in each tile in j2k_calculate_tp. Modification j2k.c
j2k_setup_encoder to set bit rate limitation for digital cinema compliance with quality option. Modification in j2k.c
Equation to check multiple tile precincts. Modification pi.c
array size generation of pi->include in pi_initialise_encode().Modification in pi.c
Modification in pi_create_encode for tile part generation.Modification in pi.c
In tcd_rateallocate a variable stable_threshold which holds the valid threshold value. This is used to avoid error in case of a wrong threshold value in the last iteration. Modification in tcd.c.
2007-03-29 14:15:14 +00:00
5a3c1ffe7d
Fixed an historical bug in t1.c that leaded to the inclusion of useless 0xFF in the codestream. Thanks to Sylvain, Pascal and Parvatha !
2007-03-28 08:44:21 +00:00
144e1ff4e6
Following to Hervé's suggestions, all the exit() calls, added by JPWL strict checking in t2.c and j2k.c, have been substituted with (object free'ing + opj_evt_message(EVT_ERROR) + return); added linking to TIFF library in the JPWL VC6 workspaces
2007-03-27 17:18:56 +00:00
6045158ce6
Fixed j2k_prog_order_list[]. Modifications in j2k.c.
...
Fixed t1_decode_cblks. Modifications in t1.c.
2007-03-21 13:01:15 +00:00
694a173adb
Added feature for generation of tile parts. Modifications in image_to_j2k.c, openjpeg.c, j2k.c, pi.c
...
Added function j2k_write_tlm(),to generate TLM marker for a Digital cinema compliant codestream. Modifications in j2k.c.
2007-03-20 17:15:18 +00:00
78003a016a
Added option for Digital cinema profile compliant codestream. This can be chosen by "-cinema2K" or "-cinema4K" for a 2K and 4K compliance respectively. The feature for tileparts has not been implemented in this version. Modification in image_to_j2k.c
...
Added the Digital Cinema profiles (CINEMA2K and CINEMA4K) to the list of profiles recognized in the codestream SIZ marker segment. Modification in openjpeg.h,j2k.c
Added feature for constant quality within bitrate defined in Digital cinema standards. Modification in tcd.c
Modified the method of generation of buffer length. Modification in cio.c
2007-03-07 16:04:33 +00:00
192e46c32f
Enabled compression of TIF image format to j2k by tifftoimage() and decompression of codestream to TIF image format using imagetotif(). Modifications in image_to_j2k.c, j2k_to_image.c, convert.c, convert.h
2007-02-28 15:31:56 +00:00
e5c5d1064e
fixed a bug in context numerotation that prevented the RESET switch to work correctly : mqc_reset_enc in mqc.c
2007-02-28 14:27:20 +00:00
d268ea7d6a
Changed version number from 1.1.0 to 1.1.1 in openjpeg.h
2007-02-23 10:48:11 +00:00
8a75823eea
Fixed a copy-and-paste type assignment error (bool instead of int) in the JPWL section of decoder parameters structure in openjpeg.h; minor type-casting in jpwl_lib.c. As a result, now OPJViewer should run correctly when built against the most current SVN trunk of LibOpenJPEG.lib
2007-02-23 01:23:05 +00:00
7cb2194c8e
Algorithmic optimizations in t1.c, thanks to Guido J. !
2007-02-21 07:57:27 +00:00
eac141b69a
Added OPJ_LIMIT_DECODING enabling us to limit the decoding to main header
2007-02-19 09:59:29 +00:00
3f5e8eb92b
Extra tokens at the end of #endif directive corrected in openjpeg.c, j2k.c and image_to_j2k.c -> no more warnings in linux compilation
2007-01-31 15:19:54 +00:00
a6d7377213
Use of OPJ_PATH_LEN (defined as 4096) to be the maximum allowed size for filenames instead of MAX_PATH which is not always defined. This caused some programs using OpenJPEG to crash. Modifications in openjpeg.h j2k_to_image.c and image_to_j2k.c
2007-01-30 10:51:29 +00:00
521b9bef33
Modification of the context numbers, to reflect what has been specified in standard.
2007-01-23 11:41:16 +00:00
ed3aec55fd
Copyright update
2007-01-15 09:55:40 +00:00
ef560f19a3
JP2 module: Tests during encoding if the number of components respects the JPEG 2000 standard.
2007-01-03 15:41:50 +00:00
2c03b73dff
First integration of JPWL code
2006-12-04 14:59:33 +00:00
6cc148e226
Code optimization usinq vsprintf() command
2006-12-04 14:57:09 +00:00
15949d43d1
fixed a cast problem in the maxlen variable
2006-10-31 18:10:03 +00:00
696cd710df
removed a debug test in the version just committed
2006-10-31 17:37:01 +00:00
2d416a8017
fixed a bug in the computation of the mantissa (mu)
2006-10-31 17:11:15 +00:00
b565431251
added the ability to specify the rate as "float" (before : integer)
2006-10-31 17:10:14 +00:00
b5aee428ba
remove some needless cvs files
2006-10-27 17:51:08 +00:00
97a3327f99
testsvn
2006-10-26 19:54:44 +00:00
7860407cb5
fixed a bug in pi.c, line 473, that appeared when more than 100 precincts were generated in a resolution level
2006-08-04 10:12:14 +00:00
9aa9170110
ENH: Update CMake to do proper installation. Still using the 2.2 installation approach for now.
2006-07-22 03:47:02 +00:00
Antonin Descampe
Francois-Olivier Devaux
Parvatha Elangovan
Giuseppe Baruffa
Mathieu Malaterre