44a3af51f0
[trunk] merge r1322 from branch 1.5 over to trunk
2012-03-02 15:04:45 +00:00
79f090d92b
[trunk] merge r1197, r1199, r1228, r1230 and r1232 from branch 1.5 over to trunk
2012-03-02 15:02:48 +00:00
54c65fdad0
[trunk] merge r1479 from branch 1.5 over to trunk
2012-03-02 14:55:16 +00:00
e917802316
[trunk] merge r1323 from branch 1.5 over to trunk
2012-03-02 14:52:18 +00:00
6a19a31171
[trunk] Remove exe bit on CMakeLists.txt. Set from DOS eol to UNIX eol
2012-03-02 14:33:29 +00:00
a06b7f2ae0
[trunk] Sync with 1.5 branch
2012-03-02 14:31:46 +00:00
405b1067e2
[trunk] Backout r1513 for now.
2012-03-02 14:29:08 +00:00
10cb93283a
[trunk] merge rev 1330/1331 from branch 1.5 onto trunk
2012-03-02 14:24:39 +00:00
d28e8f537a
[trunk] merge rev 1333 from 1.5 to trunk
2012-03-02 14:19:44 +00:00
24d7f54662
[trunk] merge rev 1228 from 1.5 to trunk
2012-03-02 14:14:31 +00:00
687a43e199
[trunk] Import change from 1.5 branch over to trunk
2012-03-02 14:01:15 +00:00
07ef7d750b
[trunk] Synchronize with 1.5 branch, installation convention
2012-03-02 13:59:12 +00:00
bc8a3c5b6f
[trunk] correct bug when we expand the list of marker in a tile
2012-03-02 10:42:11 +00:00
c149db2205
[trunk] check the PSot value during the reading of SOT marker
2012-03-02 10:38:01 +00:00
596b5cd732
Fix test NR-ENC-Bretagne2.ppm-4-encode on linux.
2011-12-20 17:54:04 +00:00
8ff1ba325d
Fix strange line, as reported by lockalsash (gmail.com)
2011-12-20 17:11:22 +00:00
90eeb25770
[trunk] remove some warnings detected by cppcheck
2011-12-07 09:53:46 +00:00
bfe8b81d18
Add new mechanism for cppcheck
2011-12-06 16:03:05 +00:00
cce1fc9c65
Apply patch from Brad Hards to fix some typos.
2011-12-06 09:46:40 +00:00
79fee501af
Apply doxygen fixes suggested by Brad Hards on opj mailing list.
2011-12-03 17:26:59 +00:00
5c363b76ee
[trunk] fix a bug during the creation of the codestream index
2011-12-01 13:46:09 +00:00
440adddcde
[trunk] fix warnings when printing large integers
2011-12-01 10:50:14 +00:00
af9ad1580a
[trunk] fix a warning about a recent commit (1104)
2011-12-01 09:10:26 +00:00
8c2d8bc85f
[trunk] fix bug during random access to tile (tile already decoded)
2011-11-30 17:31:47 +00:00
455f675806
[trunk] implement Large File support in the library
2011-11-30 16:55:25 +00:00
b68ed904b1
[trunk] add definitions for 64 bits integer types, and define OPJ_OFF_T to map to OPJ_INT64 systematically
2011-11-28 15:32:29 +00:00
2eba4fb96b
[trunk] activate LargeFileSupport in CMake
2011-11-28 15:32:22 +00:00
769982d058
[trunk] clean up redundant includes already handled in opj_includes.h
2011-11-27 21:57:16 +00:00
674d702257
[trunk] backout wrong changeset 1091 - see issue 123
2011-11-27 20:28:24 +00:00
c974cb1b8e
[trunk] support seeking in files larger than 2 GB
2011-11-24 15:30:09 +00:00
0e49c6affd
Remove exe bit from source files
2011-11-24 10:16:01 +00:00
ff3c441023
[trunk] WIP: fix bug when decoding an area or a tile with special resolution
2011-11-17 14:29:36 +00:00
aaf6e84373
[trunk] WIP: enhance j2k_to_image with new get_decoded_tile functionality
2011-11-17 14:24:51 +00:00
8026d0b2e7
[trunk] WIP: add a set decoded resolution factor function and update j2k_to_image help about decoded region
2011-11-17 14:21:11 +00:00
c4c01b61e6
[trunk] WIP: fix get_decoded_tile function to avoid error with output image
2011-11-09 16:15:15 +00:00
bd8bca87b2
[trunk] WIP: add get_decoded_tile functionality
2011-11-08 13:21:17 +00:00
9110aa09a4
[trunk] WIP: clean and enhance j2k files
2011-11-08 13:15:21 +00:00
fe085a631d
[trunk] WIP: clean and enhance openjpeg.c
2011-11-08 13:13:05 +00:00
c7489af844
[trunk] WIP: clean and enhance openjpeg.h and add deprecated macro
2011-11-08 13:09:53 +00:00
8d7073abf6
patches for cmake and autotool are applied
2011-10-25 21:10:48 +00:00
08bc3b0386
[trunk] WIP: solve problems with reading of elements outside the tilec->data buffer in dwt
2011-10-25 12:27:51 +00:00
2808de6084
[trunk] WIP: manage output image with area correponding to the set decoded area
2011-10-21 16:38:08 +00:00
028088f5f0
[trunk] WIP: enhance codestream index generation
2011-10-21 16:36:04 +00:00
b8214e260c
WIP: remove memory leak about new jp2_read_marker function
2011-10-20 13:18:52 +00:00
45d813b62c
[trunk] WIP: remove previous commit about memory leak with ppm read function
2011-10-20 09:19:35 +00:00
73b3e0e50e
[trunk] WIP: solve memory leak with ppm read function
2011-10-20 08:33:00 +00:00
2d39e5d7a5
[trunk] WIP: resolve heap corruption with p0_07.j2k (credit to Winfried)
2011-10-12 14:44:46 +00:00
27e255fa75
[trunk] WIP: correct some memory leaks in applications functions
2011-10-12 14:42:21 +00:00
195190b612
[trunk] WIP: add a read CBD marker function (JPEG2000 part 2)
2011-10-12 14:36:39 +00:00
aeabfaf417
[trunk] WIP: add a read MCO marker function (JPEG2000 part 2)
2011-10-12 14:34:17 +00:00
f62201ba9d
[trunk] WIP: add a read MCC marker function (JPEG2000 part 2)
2011-10-12 14:32:29 +00:00
5cf331d881
[trunk] WIP: add a read MCT marker function (JPEG2000 part 2)
2011-10-12 14:30:22 +00:00
ca5b10938a
[trunk] WIP: correct a segfault inside j2k_dump output
2011-10-11 13:49:58 +00:00
a6178c1de6
[trunk] WIP: correct some segfault with win platform and remove a aligned allocation which produce error when a realloc is done on this pointer
2011-10-11 10:09:02 +00:00
990dd18474
[trunk] WIP: add stream length value to read unknown marker size, backport 855 into V2 framework, correct memory leak into get_cstr_info
2011-10-11 08:01:31 +00:00
c4642d4fda
[trunk] WIP: add output elements about decoding of jp2 files with last tile part lenght equal zero
2011-10-11 07:54:27 +00:00
c7d3b83164
[trunk] WIP: correct mistake with JP2 files and manage correctly the text_GBR.jp2 filecase
2011-10-11 07:49:16 +00:00
81b9e78565
[trunk] add libopenjpeg-jpwl.pc.in. fix output when --disable-shared or --disable-static is passed to configure. Minor clean up of configure.ac.
2011-10-10 06:51:08 +00:00
cee4505172
[trunk] fix 'distcheck' rule
2011-10-10 06:26:34 +00:00
4d4b29ea94
[trunk] WIP: correct mistake in text output inside set_decoded_area function (credit to Winfried)
2011-10-07 21:57:09 +00:00
efd780f82a
[trunk] WIP: update jp2 dump functions with the new V2 framework
2011-10-07 17:31:35 +00:00
35e13cf5e8
[trunk] correct wrong input in dump_codec function and add missing return value
2011-10-07 17:11:12 +00:00
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
Mathieu Malaterre
Mickael Savinaud
Julien Malik
Kaori Hagihara
Vincent Torri
Antonin Descampe
Rex Dieter
Winfried
Ben Boeckel
Francois-Olivier Devaux