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
Antonin Descampe
Winfried
Ben Boeckel
Mathieu Malaterre
Francois-Olivier Devaux
Parvatha Elangovan
Giuseppe Baruffa