238652b36c
[trunk] WIP: correct mistake inside set_decoded_area function (credit to Francois De Vieilleville)
2011-10-07 14:36:29 +00:00
ee0e8a3aad
[trunk] WIP: fix the decoding process with conformance files and V2 framework
2011-10-05 16:27:16 +00:00
f4734d6b4d
* [vincent] fix autotools for various compilation problems
...
* [vincent] fix indexer compilation. Patch from Winfried
2011-09-30 21:14:25 +00:00
656628e69b
modified indexer for JPIP, JPP-stream
2011-09-30 17:15:06 +00:00
67d04dd9ba
[trunk] WIP: enhance the event management into the new API
2011-09-27 12:41:49 +00:00
b8efd02c7f
[trunk] WIP: fix some warnings about a static function and j2k_read_unk_v2
2011-09-27 12:32:28 +00:00
a600d8f4e2
[trunk] WIP: add basis for a new output management of the codestream information and index
2011-09-27 12:14:11 +00:00
a5e442d490
[trunk] WIP: fix build compilation (with autotools) with MJ2 option (credit to Winfried)
2011-09-22 09:31:45 +00:00
51513c4e6b
WIP: fix build compilation error with windows platform about event_mgr management
2011-09-22 08:39:59 +00:00
5d0b813cec
[trunk] WIP: clean the j2k_dump application and the lib regards to the event management
2011-09-21 16:37:45 +00:00
ba0c271774
Enhance the support of endianess with cmake and inside the code (credit to Winfried)
2011-09-21 10:01:54 +00:00
7062c01b68
WIP: fixed build issues with JPWL option ON
2011-09-20 14:50:04 +00:00
af7ebd96a0
Enhance some new JPIP files about opj_config inclusion and using of free/calloc (credit to Julien Malik)
2011-09-19 16:53:10 +00:00
ac59fd1476
WIP: begin to test opj_decode_tile_data
2011-09-19 16:34:44 +00:00
6561d70664
WIP: update t1, t2, tcd to use same strut as in V2
2011-09-19 16:09:19 +00:00
1a5c59326a
WIP: begin to test opj_read_tile_header with V2 style
2011-09-19 16:05:43 +00:00
d44375aece
WIP: create a new framework to output file information
2011-09-19 16:01:49 +00:00
cf37058d7c
WIP: remove a piece of code copy by the merge op at the wrong place
2011-09-19 15:51:20 +00:00
dcb3fcbfa7
WIP: begin to clean j2k_dump and some other small things
2011-09-19 13:55:06 +00:00
6ece3f6792
WIP: enchance the new version with some bug fixes from v1 and from me
2011-09-19 13:47:35 +00:00
3b30e42551
WIP: add support of jp2 for new j2k_dump function and some other small stuff
2011-09-19 13:36:07 +00:00
b0ef524b9e
WIP: new image_header struct is used and enable used of cstr_info
2011-09-19 13:30:21 +00:00
b138aaae08
WIP: manage the case of event_mgr is not provided to setup_decoder function
2011-09-19 13:18:19 +00:00
3953661078
WIP: insert elements from V2 framework into the trunk (add missing files)
2011-09-19 13:12:01 +00:00
b551844cc2
Work In Progress: insert elements from V2 framework into the trunk
2011-09-19 13:04:04 +00:00
6a1573c228
TRUNK: fixed autotools for new indexer option
2011-09-09 18:54:05 +00:00
fa720c1858
TRUNK:added a new indexer functionality to the library. With the new -jpip option at encoding, the user can now generate a JP2 file including an XML box with the index used when browsing the image with JPIP
2011-09-09 14:49:08 +00:00
883e0826e2
removed obsolete testing directory and *.nix files (in trunk)
2011-08-16 09:33:37 +00:00
e3e2dc1f6e
fixed build error with position of variable declaration after patch 856
2011-08-11 08:37:11 +00:00
7812030886
moved the definition of OPJ_ARG_NOT_USED from opj_includes.h to openjpeg.h
2011-08-10 09:33:33 +00:00
6fb9794200
fixed segfault with 123.j2c and bug.j2c images (thanks to Tim Mattox for his contribution to this patch)
2011-08-10 09:00:34 +00:00
9e419fdaf7
fixed glibc error with broken2 and broken4 images
2011-08-10 08:47:20 +00:00
676f8f189f
removed unused parameters warnings with the solution proposed by myself and Bob Friesenhahn
2011-08-10 08:12:10 +00:00
5743cca5f8
solve some obvious warnings for WIN platform, increase number of warning reported on the dashboard, correct last warnings with gcc 4.4 (-Wall)
2011-07-29 08:50:55 +00:00
e716a316f6
manage case 0 frames inside yuv_num_frames function and correct some warnings with gcc4.5 (credit to Winfried)
2011-07-28 10:45:22 +00:00
6106e48397
improved encoding speed in t1_encode_cblks (credit to Giuseppe Baruffa)
2011-07-10 17:32:22 +00:00
fa6aea80f5
fixed handling of "jp2->meth" value (Restricted ICC profile handling currently not implemented)
2011-07-03 17:56:49 +00:00
3da66d4d79
adding partno and numpart info as part of the warning message (issue #69 )
2011-06-03 08:47:30 +00:00
586581685c
fixed autotools (broken since the new directory structure) and added autotools as a build method for jpip (credit to Vincent Torri)
2011-05-23 20:30:20 +00:00
88f43b15fa
defined new type "opj_bool", and new constants OPJ_FALSE and OPJ_TRUE, to avoid having to deal with "stdbool.h" (patch from Winfried)
2011-05-18 11:02:27 +00:00
0c9f6a3ac9
fixed another bug related to the number of packets in a tile-part, not correctly taken into account when generating an index file during decoding
2011-05-16 19:39:07 +00:00
18cb325a8e
fixed part of issue 69, when tile-part index is inconsistent with the total number of tile-parts
2011-05-16 11:07:37 +00:00
2a5a6416a5
fixed a bug in mqc.c (see https://groups.google.com/d/topic/openjpeg/kQ1PbZUd19k/discussion , credit to Peter Wimmer)
2011-04-16 12:09:16 +00:00
6aaaa3eae2
changed the directory hierarchy of the whole project. See README files for details.
2011-04-13 22:38:50 +00:00
16f205d886
re-organization of openjpeg directories hierarchy : step 1
2011-04-13 21:01:39 +00:00
e93d5a683f
Fixed internal function names conflict with Jasper ( http://code.google.com/p/openjpeg/issues/detail?id=30 )
2011-04-12 17:24:30 +00:00
a3df1f5c5e
small fix related to the formatting of the install report displayed at the end of install procedure
2011-03-04 11:03:33 +00:00
86edc0a40e
updated autotools files to improve build and install procedures (credit to Vincent Torri)
2011-03-04 10:53:27 +00:00
89456eed51
replaced "long" by "size_t" in dwt.c to be sure to cast to a pointer size.
2011-02-17 21:11:29 +00:00
af71acb043
Explicitly link to the math lib on UNIX as we use floor and such symbols
2011-02-16 13:59:24 +00:00
99c3c5a4af
cmake : fixed installed links to openjpeg.h and openjpeg3d.h
2011-02-06 16:39:26 +00:00
a1920bc5c2
fixed warnings in jp2.c (signed compared to unsigned) and dwt.c (bad cast) ; removed depcomp file from trunk (automatically copied by automake in main folder)
2011-01-30 21:33:55 +00:00
9a811cb52a
replaced en-dash with standard dash in jp2.c
2011-01-30 15:38:45 +00:00
55c8c2bc77
license header: replaced Hervcalloc by Herve, I should learn to double-check my changes
2011-01-29 14:15:26 +00:00
fbffea94a9
removed é in license header to prevent warning C4819 (see http://code.google.com/p/openjpeg/issues/detail?id=57 )
2011-01-29 14:08:13 +00:00
3f234ac21b
remove (autotools) generated files
2011-01-17 18:45:33 +00:00
97c5fe052c
fix symlink creation (cmake)
2011-01-13 19:40:48 +00:00
7441340ab5
changed report code in Makefile.am
2011-01-07 03:20:58 +00:00
73a6ed7c21
bug fixes to enable cmake compilation on WIN32 platform (see CHANGES for details)
2011-01-02 18:10:09 +00:00
398b3f08b0
Adapted Makefile.am/Makefile.nix to build choice: shared xor static
2010-12-14 03:33:31 +00:00
ebcda80583
Updated Makefile.in
2010-12-09 01:23:46 +00:00
407b95e35f
Removed LCMS dependencies from Makefile.am/Makefile.nix
2010-12-09 01:11:05 +00:00
d08a96e251
(thanks to Winfried for his help)
...
* [antonin] changed remaining "WIN32" to "_WIN32"
! [antonin] libopenjpeg has no more dependency on LCMS lib. Everything concerning color (icc profile, conversion to rgb, etc) has been put outside libopenjpeg and is used in j2k_to_image.c and mj2_to_frames.c.
- [antonin] removed "opj_convert{.c,.h}"
+ [antonin] added a directory "common/" that contains "getopt{.c,.h}" (previously in "codec/compat").
+ [antonin] added files "color{.c,.h}" in "common/" that define the code for icc profile management and sycc_to_rgb conversion
+ [antonin] added "common/format_defs.h" that contains common definitions used in image_to_j2k, j2k_to_image, j2k_dump.
2010-12-08 11:06:41 +00:00
59d9b97ffe
revert to previous behaviour for cmake: builds (and links) dynamically by default. Static build only if -DBUILD_SHARED_LIBS is set to OFF.
2010-12-05 15:19:57 +00:00
02229c7c2d
workaround for name clash when building static and dynamic on WIN32 (see http://www.vtk.org/Bug/view.php?id=10190 for description)
2010-12-03 11:57:00 +00:00
eb5694ca2a
changed cmake behaviour: executables are now always statically linked. When -DBUIL_SHARED_LIBS option is ON (the default), the shared versions of the libraries are also built (but executables remain linked against the static libraries).
2010-11-28 17:07:04 +00:00
389166e86e
fix compilation and DLL creation of libopenjpeg with MSYS/MinGW (from vincent.torri, see issue 47 on googlecode)
2010-11-25 11:58:26 +00:00
d5b44a98bc
reverted 'include "../opj_config.h"' to 'include "opj_config.h"'
2010-11-22 11:48:19 +00:00
3afd3b1afd
install man pages by default. install CHANGES and LICENSE
2010-11-17 10:59:21 +00:00
709068ef5b
minor changes in header inclusions
2010-11-15 11:08:03 +00:00
2b7f6f82be
complete rewrite of opj_convert.c with correct values (from winfried)
2010-11-15 11:06:46 +00:00
af32de46a2
Installation fixes when using CMake
2010-10-26 16:46:01 +00:00
0dc7f6a2d3
Fixed doxygen data inside source code (from winfried)
2010-10-24 20:28:22 +00:00
bb9232c9d9
Don't clobber openjpeg.h from jp3d
2010-10-22 18:41:49 +00:00
e36881487d
Patch to support the MSVC Win 64 builds (from szekerest)
2010-10-22 09:45:53 +00:00
56dd722fb4
Currently the Visual Studio builds are broken in the SVN. Attached a patch to fix this issue (from szekerest)
2010-10-22 09:43:06 +00:00
c2f441840f
M libopenjpeg/Makefile.in
...
M libopenjpeg/Makefile.am
M jp3d/libjp3dvm/Makefile.in
M jp3d/libjp3dvm/Makefile.am
M CHANGES
M jpwl/Makefile.in
M jpwl/Makefile.am
2010-10-22 08:51:38 +00:00
b6102e207c
fixed paths to png and tiff in CMakeLists.txt and fixed link to lcms library (patch from winfried)
2010-10-21 09:49:54 +00:00
f4b08bacb0
-This line, and those below, will be ignored--
...
M configure
M Makefile.in
M opj_config.h.in.user
M mj2/Makefile.in
M mj2/Makefile.am
M mj2/Makefile.nix
M libopenjpeg/Makefile.in
M jp3d/Makefile.in
M jp3d/libjp3dvm/Makefile.in
M jp3d/Makefile.nix
M jp3d/codec/Makefile.in
M jp3d/codec/Makefile.am
M config.nix
M configure.ac
M doc/Makefile.in
M doc/Makefile.am
M doc/Makefile.nix
M INSTALL
M CHANGES
M jpwl/Makefile.in
M jpwl/Makefile.am
M jpwl/Makefile.nix
M Makefile.am
M Makefile.nix
M codec/Makefile.in
M codec/Makefile.am
2010-10-17 22:42:46 +00:00
ae6cf3da7d
2010-10-13 15:16:48 +00:00
03133377fa
2010-10-13 14:49:39 +00:00
eeefefd56c
Added files to let people build openjpeg with configure tools ; Added makefiles to let people manually build openjpeg on *nix platforms ; Removed obsolete Makefiles ; Renamed dirent.h to windirent.h ; Made optional the PNG, TIFF, and LCMS support in CMake files ; Added opj_config* files to configure openjpeg before building it (opj_config.h generated by configure, cmake, or manually by the user) ; Renamed this file from ChangeLog to CHANGES ; Renamed License.txt to LICENSE ; Updated README files ; Added INSTALL and LICENSE files ; Added man pages
2010-10-05 10:33:15 +00:00
89eafad589
Synchronize branch and trunk cmakelists files
2010-06-29 19:08:58 +00:00
f30f4c744e
Also dump the image info as well as cp info.
2010-06-22 14:03:52 +00:00
6621494d9d
Apply patch from w. szukalski (sent to list). Mon, Jun 21, 2010 at 5:49 PM
2010-06-22 11:55:36 +00:00
fdf04af271
[v1.4]Fixed issue 6 on google code. Variable "pi" not freed or pointed-to in function "pi_create_encode". Thanks to Kent Mein for reporting this.
...
[v1.4]Fixed problem with Borland C++ Builder (Borland C do not have lrintf). Thanks Marek Mauder for this fix.
2010-04-08 20:19:54 +00:00
203a264f96
[v1.4] Fixed pi.c bug (issue 15 on google code). Thanks to Anton Lionel for catching this.
2010-04-08 18:43:03 +00:00
627f484bce
Significant optimizations of MCT, DWT, MQ and T1 modules by Peter Wimmer (thanks Peter)
2010-04-08 17:22:58 +00:00
54214fb65f
Code improvements using 'g++-4.4.0' to trace the code (v1.4). Thanks to Winfried for this patch.
2010-03-24 11:20:45 +00:00
c1a51d68a6
[FOD] Created a new constant in openjpeg.h to differentiate the case when the colorspace is not supported by the library and when it is not specified in the codestream. Suggested by Matteo Italia.
2010-01-20 15:44:13 +00:00
9324bc4cd4
fixed MCT check bug in t1_getwmsedec. See http://groups.google.com/group/openjpeg/browse_thread/thread/d9d96dd4ec3e7443 for info
2009-11-06 12:52:54 +00:00
bfd3fe8a4a
fixed minor bugs which were triggering warnings at compilation (different signedness, wrong pointer type, etc)
2009-09-10 12:29:51 +00:00
9dbbc6ca13
openjpeg.c : fixed initialization of parameters->cp_disto_alloc/fixed_quality/fixed_alloc/tcp_numlayers because they were preventing to use the -q and -f options.
2009-09-08 18:25:51 +00:00
73d8401465
found a bug in tcd.c that was preventing to find the correct threshold in tcd_rateallocate.c for high-precision images. Applied a temporary patch but a better solution should be found.
2008-08-22 16:18:17 +00:00
cebdbda260
Added the default lossless parameter to opj_set_default_encoder_parameters in openjpeg.c
2008-07-09 11:43:02 +00:00
295ad6b112
fixed a bug in j2k.c (j2k_write_sod) that allowed to get negative rates, thanks zhong1985624 for pointing this.
2008-05-22 16:39:40 +00:00
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
817681fb98
fixed a bug in t1.c that prevented in some cases a true lossless compression (thanks to Don Mimlitch for reporting this bug)
2006-03-19 18:51:32 +00:00
0108506433
COMP: Fix warning about C++ comment
2006-02-19 21:12:20 +00:00
b883da435b
COMP: Fix declaration hides parameter len
2006-02-18 12:52:52 +00:00
6a4572a56f
COMP: Fix declaration hides parameter len
2006-02-18 12:51:35 +00:00
fba75d93c4
STYLE: Remove C++ comments
2006-02-18 12:48:49 +00:00
c2b399b363
removed unneeded working variables in opj_tcd_t
2006-02-12 16:53:23 +00:00
23eeec8769
ENH: Do the proper thing for static/shared
2006-02-05 21:39:19 +00:00
48311061c1
added the 'static' keyword to inline functions to keep gcc happy
2006-02-03 23:08:52 +00:00
8d7b0c9c05
changed function definitions of INT and FIX modules to 'inline'
2006-02-01 21:25:11 +00:00
33b5757921
ENH: Update CMake to match the new shared lib system (no more def file)
2006-01-31 22:35:51 +00:00
355b88c15d
fixed various minor warnings occuring under icc9 and bcc32, added MSVC project and compiler directives to build a 'standard' WIN32 DLL
2006-01-31 21:26:11 +00:00
74c1b3637e
COMP: Fix compilation on MINGW
2006-01-31 19:45:17 +00:00
1460d23294
STYLE: Remove completely reference to OPJ_EXPORT
2006-01-31 14:51:39 +00:00
75cf4f0906
STYLE: More verbose comments
2006-01-31 14:41:40 +00:00
85c327861a
STYLE: Add more comment, also use more feature from CMake to introduce the VERSION number of openjpeg
2006-01-31 14:32:40 +00:00
c5c3ca370e
ENH: Move to a def solution to avoid polluting header file with declspec
2006-01-31 14:20:06 +00:00
72de930d08
fixed two initialization problems in t1.c and tcd.c
2006-01-27 16:29:41 +00:00
8a662fa4b1
fixed various minor warnings occuring under gcc, added corrections proposed in the forum
2006-01-26 20:02:04 +00:00
55fb4d0b67
ENH: Sync with ITK repository
2006-01-25 18:18:09 +00:00
61e353d652
STYLE: Add a lot of comments for the CMake build system
2006-01-25 16:32:48 +00:00
ec2b3b3b3f
COMP: Fix compilation on mingw (already had itoa) and borland (need __int64)
2006-01-25 15:21:28 +00:00
e6aae96217
added cmake files to the project
2006-01-25 09:23:17 +00:00
a1ec600b42
fix.c : replaced "WIN32" by "_MSC_VER" for int64
2006-01-25 09:04:36 +00:00
5432a70c79
added "OPJ_EXPORT" in openjpeg.h to generate shared lib with win32
2006-01-25 08:50:18 +00:00
cc3e813786
event.c : replaced "WIN32" by "_MSC_VER" for i2a (line 33) + replaced win32 line breaks
2006-01-24 21:02:13 +00:00
6a52f1a9df
fixed various minor warnings with gdcm patches
2006-01-20 16:53:05 +00:00
197b0505cb
fixed a bug in jp2_read_ihdr (need to allocate jp2->comps)
2006-01-19 20:25:44 +00:00
d5ecae07ad
fixed a bug in opj_cio_open when saving 48-bit images (wrong buffer size calculation)
2006-01-18 20:10:58 +00:00
8f9f70f922
changed the name of j2k_realloc to opj_realloc
2006-01-18 20:10:23 +00:00
34c8a555fa
fixed a bug when specifying a rate '-r' => no distortion info was available in the index
2005-12-08 14:47:40 +00:00
fe33ebe83c
fixed a bug in t1_getwmsedec (stepsize was divided by 8192)
2005-12-08 11:01:59 +00:00
95bc884365
OpenJPEG version 1.1
2005-12-08 09:38:47 +00:00
884c8429fc
Makefile moved to ROOT directory
2005-12-04 17:10:57 +00:00
5cf0326dcb
LibOpenJPEG project files moved to root directory
2005-12-04 17:07:44 +00:00
08f7bfbb5f
add an include <sys/time.h> before <sys/resource.h>
2005-12-02 13:48:10 +00:00
f61cda9b7d
openjpeg version 1.0 (previous version still available with tag opj0-97)
2005-12-02 13:34:15 +00:00
4458ef921c
minor change for readability
2005-11-09 10:20:28 +00:00
c9ac67cd05
minor change to avoid warnings about signedness
2005-11-09 10:17:51 +00:00
e398154212
small changes to remove warnings related to signedness
2005-11-08 16:15:40 +00:00
0ea26e7ba6
small change to avoid signed/unsigned warning during compilation
2005-11-04 11:10:38 +00:00
8f3bd54c3d
Changes proposed by Mathieu Malaterre from the GDCM project... Thanks a lot Mathieu
...
- '//' replaced by '/* */'
- inclusion of int.h in int.c
- inclusion of j2k.h in int.h in order to export symbols
- adding (void) var when a variable is declared but not used
- some explicit cast
- CLOCKS_PER_SEC is declared as float in bcc55, so there is a need to cast it to int for the modulo operation
- some variables changed from float -> double
2005-11-01 10:15:34 +00:00
18a9bcb882
changed one of the 9-7 coefficients (value closer to the one in the std)
2005-10-27 07:51:11 +00:00
7ee36c3a4c
1) quantization stepsizes stored as float instead of shifted integers -> fixes a pb of precision when using very small stepsizes. 2) bug fixed when decoding until bitplane 0 -> r-value (1/2) added to the coefficient.
2005-10-27 07:49:29 +00:00
7f8f47566f
Modifications to decoding of JP2H box in order to be compatible with JP2 conformance files
2005-10-20 07:43:55 +00:00
d6a523e091
major change in the dwt-module, thanks to Ive (aka Reiner Wahler): thanks a lot ! See note in dwt.c for more details.
2005-09-21 13:00:51 +00:00
ac634b1639
bug fixed when asking for an index with more than (layer*resolutions*100) packets per tile (2nd correction)
2005-09-21 08:11:27 +00:00
a0513798bb
bug fixed when asking for an index with more than (layer*resolutions*100) packets per tile
2005-09-20 15:40:13 +00:00
8f4d6bbeba
bug fixed when freeing the memory allocated if ppm-marker or ppt-marker is used
2005-09-13 14:17:09 +00:00
cd98a4f740
bug fixed when freeing the memory allocated if ppm-marker or ppt-marker is used
2005-09-13 14:11:41 +00:00
e25e7e767e
Modifications proposed by Rob Komar. Thanks for your contribution !
2005-08-01 15:10:04 +00:00
de75303c38
Several bugs fixed when dealing with pgx-files with more than 8 bpp and the fixed_quality feature.
2005-07-18 15:21:56 +00:00
32ba9920db
At lines 577, 692 and 699, zeroing of effective region of code-block rather than the 1024*1024 allocated integers of code-block. This optimization has been proposed by Dmitry Kolyadin. Thanks for your help !
2005-06-02 15:28:37 +00:00
7ae6a670fa
Conversions from int to unsigned int to ensure correct execution of int_min and int_max at lines 800 to 830
2005-06-02 15:25:25 +00:00
cf4f8be5f0
Conversions from int to unsigned int to ensure correct execution of int_min at line 626 to 628
2005-06-02 15:14:33 +00:00
Mickael Savinaud
Vincent Torri
Kaori Hagihara
Antonin Descampe
Mathieu Malaterre
Rex Dieter
Winfried
Ben Boeckel
Francois-Olivier Devaux
Parvatha Elangovan
Giuseppe Baruffa
Freeimage