Mickael Savinaud
1023be33fb
add new functions in jp2 codec from v2 branches; solve bug in j2k_setup_encoder_v2
2012-05-14 09:37:36 +00:00
Mickael Savinaud
a9b653db26
Correct a mistake about declaration of j2k_write_eoc_v2
2012-05-14 06:24:27 +00:00
Mickael Savinaud
80c23d4519
solve problem with input of image_to_j2k; using the right return type comparison for opj_stream_flush; add j2k_write_com_v2, j2k_write_poc_v2, j2k_write_eoc_v2 and j2k_write_tlm_v2
2012-05-13 22:13:58 +00:00
Mickael Savinaud
821d7a8941
remove a fixme about tcd_deallocate and encodind precint
2012-05-13 15:48:19 +00:00
Mickael Savinaud
e7c8a22c67
[trunk] style
2012-05-02 13:37:54 +00:00
Mickael Savinaud
055d429ae1
[trunk] Enhance support of events like the v2 branch. Use right name of variables.
2012-05-02 07:01:13 +00:00
Mathieu Malaterre
8231897b26
[trunk] apply patch from winfried on the mailing list. For more info see: https://groups.google.com/group/openjpeg/msg/e631d586a31c6de4
2012-04-23 13:28:20 +00:00
Mathieu Malaterre
df7e656034
Fix a set of warnings reported by gcc in cio.c. This patch impact the API directly (remove left over 32bits API)
2012-04-23 09:16:17 +00:00
Mickael Savinaud
7f3f4cfdd0
[trunk] correct a wrong assert in j2k.c
2012-04-13 14:36:30 +00:00
Mathieu Malaterre
9642c7f990
[trunk] fix compilation on OS where ssize_t is not defined.
2012-03-27 07:44:28 +00:00
Mathieu Malaterre
1cf1d6146c
[trunk] Start working on LFS support in JPIP code section
2012-03-26 09:48:53 +00:00
Mathieu Malaterre
f3217ac170
[trunk] ICC profile length is always an unsigned integer
2012-03-26 09:19:45 +00:00
Mathieu Malaterre
c8125f8710
[trunk] make openjpeg consistant with itself, and adapt sign of struct variables
2012-03-26 09:15:26 +00:00
Mathieu Malaterre
1e3bc7c069
[trunk] Fix a potential issue with truncation of pointers diff
2012-03-26 08:51:12 +00:00
Mathieu Malaterre
34df9f3dbf
[trunk] Fix some simple warnings reported by -Wconversion
2012-03-26 08:47:06 +00:00
Mathieu Malaterre
72bb159a7e
[trunk] fix compilation when jpwl option is ON.
2012-03-26 08:41:48 +00:00
Mickael Savinaud
855b5b513d
[trunk] add test_tile_encoder test and function related
2012-03-23 17:47:53 +00:00
Mathieu Malaterre
b3931741ef
[trunk] Missing PRId64 for MS compilers
2012-03-19 13:46:34 +00:00
Mathieu Malaterre
8890539f47
[trunk] use autotools convention where #ifdef BLA, should be provided by #define BLA 1. This is to cope with pseudo autotools generated tif header.
2012-03-19 13:10:46 +00:00
Mathieu Malaterre
ff72dd8d2c
[trunk] start using new functionalities from opj_inttypes in jpip code and main openjpeg
2012-03-19 11:18:24 +00:00
Mathieu Malaterre
e07b265009
[trunk] move functionalities of stdint/inttype into opj_stdint/opj_inttypes
2012-03-19 10:15:46 +00:00
Mathieu Malaterre
8d0e5899b9
[trunk] Remove remaining of OPJ_INT64_F/OPJ_UINT64_F before move to C99 convention
2012-03-19 10:00:06 +00:00
Mathieu Malaterre
e6f8b59010
[trunk] replace more void* object pointer to proper function pointer: opj_procedure. Remove some warnings reported by gcc -pedantic
2012-03-19 09:51:23 +00:00
Mathieu Malaterre
96d4d3f3be
[trunk] Quick fix for MS compilers which do not ship inttypes.h
2012-03-17 18:20:52 +00:00
Mathieu Malaterre
811c01cc2e
[trunk] Fix compilation win32 with shared libs on (export symbol name)
2012-03-17 18:06:54 +00:00
Mathieu Malaterre
e24127771e
[trunk] Fix numerous warnings about signed vs unsigned comparison. Adapt opj_procedure type to what it should hev been IMHO. Start using PRIi64 for printf and int64_t
2012-03-17 18:06:22 +00:00
Mathieu Malaterre
b3f00d05a8
[trunk] remove a warning, about ISO C restricts enumerator values to range of 'int'
2012-03-17 17:03:16 +00:00
Mathieu Malaterre
652d34b0a8
[trunk] HACK: This commit remove some JPWL related code just to allow compilation. See r1564 for more info
2012-03-17 15:05:38 +00:00
Mickael Savinaud
3a78e8010d
[trunk] modify image_to_j2k and the lib to support functionalities given by the v2 alpha branch
2012-03-15 10:23:20 +00:00
Mathieu Malaterre
3de14fc63e
[trunk] Use stdint.h when available to compute fixed-type definition.
2012-03-11 15:12:31 +00:00
Mickael Savinaud
ab7b5e48c4
[trunk] reverted to revision 1536
2012-03-09 17:34:05 +00:00
Mickael Savinaud
345b5cfc5c
[trunk] add j2k_post_write_tile in trunk from branch v2
2012-03-09 17:16:24 +00:00
Mickael Savinaud
1ac93c3a72
[trunk] add j2k_get_tile_data in trunk from branch v2
2012-03-09 17:16:16 +00:00
Mickael Savinaud
4b8c29a708
[trunk] add tcd_get_encoded_tile_size in trunk from branch v2alpha
2012-03-09 17:16:04 +00:00
Mickael Savinaud
04b057d22c
[trunk] add j2k_pre_write_tile function in trunk from v2alpha
2012-03-09 17:15:55 +00:00
Mickael Savinaud
fcfb8dd2ed
[trunk] first steps about merge compression WIP
2012-03-09 17:15:41 +00:00
Mathieu Malaterre
4a2673772a
[trunk] Fix a bunch of warning about C++ comments in C code.
2012-03-02 15:53:14 +00:00
Mathieu Malaterre
b9e216ac6f
[trunk] merge r1229 from branch 1.5 over to trunk
2012-03-02 15:24:12 +00:00
Mathieu Malaterre
44a3af51f0
[trunk] merge r1322 from branch 1.5 over to trunk
2012-03-02 15:04:45 +00:00
Mathieu Malaterre
79f090d92b
[trunk] merge r1197, r1199, r1228, r1230 and r1232 from branch 1.5 over to trunk
2012-03-02 15:02:48 +00:00
Mathieu Malaterre
54c65fdad0
[trunk] merge r1479 from branch 1.5 over to trunk
2012-03-02 14:55:16 +00:00
Mathieu Malaterre
e917802316
[trunk] merge r1323 from branch 1.5 over to trunk
2012-03-02 14:52:18 +00:00
Mathieu Malaterre
6a19a31171
[trunk] Remove exe bit on CMakeLists.txt. Set from DOS eol to UNIX eol
2012-03-02 14:33:29 +00:00
Mathieu Malaterre
a06b7f2ae0
[trunk] Sync with 1.5 branch
2012-03-02 14:31:46 +00:00
Mathieu Malaterre
405b1067e2
[trunk] Backout r1513 for now.
2012-03-02 14:29:08 +00:00
Mathieu Malaterre
10cb93283a
[trunk] merge rev 1330/1331 from branch 1.5 onto trunk
2012-03-02 14:24:39 +00:00
Mathieu Malaterre
d28e8f537a
[trunk] merge rev 1333 from 1.5 to trunk
2012-03-02 14:19:44 +00:00
Mathieu Malaterre
24d7f54662
[trunk] merge rev 1228 from 1.5 to trunk
2012-03-02 14:14:31 +00:00
Mathieu Malaterre
687a43e199
[trunk] Import change from 1.5 branch over to trunk
2012-03-02 14:01:15 +00:00
Mathieu Malaterre
07ef7d750b
[trunk] Synchronize with 1.5 branch, installation convention
2012-03-02 13:59:12 +00:00
Mickael Savinaud
bc8a3c5b6f
[trunk] correct bug when we expand the list of marker in a tile
2012-03-02 10:42:11 +00:00
Mickael Savinaud
c149db2205
[trunk] check the PSot value during the reading of SOT marker
2012-03-02 10:38:01 +00:00
Mathieu Malaterre
596b5cd732
Fix test NR-ENC-Bretagne2.ppm-4-encode on linux.
2011-12-20 17:54:04 +00:00
Mathieu Malaterre
8ff1ba325d
Fix strange line, as reported by lockalsash (gmail.com)
2011-12-20 17:11:22 +00:00
Mickael Savinaud
90eeb25770
[trunk] remove some warnings detected by cppcheck
2011-12-07 09:53:46 +00:00
Mathieu Malaterre
bfe8b81d18
Add new mechanism for cppcheck
2011-12-06 16:03:05 +00:00
Mathieu Malaterre
cce1fc9c65
Apply patch from Brad Hards to fix some typos.
2011-12-06 09:46:40 +00:00
Mathieu Malaterre
79fee501af
Apply doxygen fixes suggested by Brad Hards on opj mailing list.
2011-12-03 17:26:59 +00:00
Mickael Savinaud
5c363b76ee
[trunk] fix a bug during the creation of the codestream index
2011-12-01 13:46:09 +00:00
Julien Malik
440adddcde
[trunk] fix warnings when printing large integers
2011-12-01 10:50:14 +00:00
Mickael Savinaud
af9ad1580a
[trunk] fix a warning about a recent commit (1104)
2011-12-01 09:10:26 +00:00
Mickael Savinaud
8c2d8bc85f
[trunk] fix bug during random access to tile (tile already decoded)
2011-11-30 17:31:47 +00:00
Julien Malik
455f675806
[trunk] implement Large File support in the library
2011-11-30 16:55:25 +00:00
Julien Malik
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
Julien Malik
2eba4fb96b
[trunk] activate LargeFileSupport in CMake
2011-11-28 15:32:22 +00:00
Julien Malik
769982d058
[trunk] clean up redundant includes already handled in opj_includes.h
2011-11-27 21:57:16 +00:00
Julien Malik
674d702257
[trunk] backout wrong changeset 1091 - see issue 123
2011-11-27 20:28:24 +00:00
Julien Malik
c974cb1b8e
[trunk] support seeking in files larger than 2 GB
2011-11-24 15:30:09 +00:00
Mathieu Malaterre
0e49c6affd
Remove exe bit from source files
2011-11-24 10:16:01 +00:00
Mickael Savinaud
ff3c441023
[trunk] WIP: fix bug when decoding an area or a tile with special resolution
2011-11-17 14:29:36 +00:00
Mickael Savinaud
aaf6e84373
[trunk] WIP: enhance j2k_to_image with new get_decoded_tile functionality
2011-11-17 14:24:51 +00:00
Mickael Savinaud
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
Mickael Savinaud
c4c01b61e6
[trunk] WIP: fix get_decoded_tile function to avoid error with output image
2011-11-09 16:15:15 +00:00
Mickael Savinaud
bd8bca87b2
[trunk] WIP: add get_decoded_tile functionality
2011-11-08 13:21:17 +00:00
Mickael Savinaud
9110aa09a4
[trunk] WIP: clean and enhance j2k files
2011-11-08 13:15:21 +00:00
Mickael Savinaud
fe085a631d
[trunk] WIP: clean and enhance openjpeg.c
2011-11-08 13:13:05 +00:00
Mickael Savinaud
c7489af844
[trunk] WIP: clean and enhance openjpeg.h and add deprecated macro
2011-11-08 13:09:53 +00:00
Kaori Hagihara
8d7073abf6
patches for cmake and autotool are applied
2011-10-25 21:10:48 +00:00
Mickael Savinaud
08bc3b0386
[trunk] WIP: solve problems with reading of elements outside the tilec->data buffer in dwt
2011-10-25 12:27:51 +00:00
Mickael Savinaud
2808de6084
[trunk] WIP: manage output image with area correponding to the set decoded area
2011-10-21 16:38:08 +00:00
Mickael Savinaud
028088f5f0
[trunk] WIP: enhance codestream index generation
2011-10-21 16:36:04 +00:00
Mickael Savinaud
b8214e260c
WIP: remove memory leak about new jp2_read_marker function
2011-10-20 13:18:52 +00:00
Mickael Savinaud
45d813b62c
[trunk] WIP: remove previous commit about memory leak with ppm read function
2011-10-20 09:19:35 +00:00
Mickael Savinaud
73b3e0e50e
[trunk] WIP: solve memory leak with ppm read function
2011-10-20 08:33:00 +00:00
Mickael Savinaud
2d39e5d7a5
[trunk] WIP: resolve heap corruption with p0_07.j2k (credit to Winfried)
2011-10-12 14:44:46 +00:00
Mickael Savinaud
27e255fa75
[trunk] WIP: correct some memory leaks in applications functions
2011-10-12 14:42:21 +00:00
Mickael Savinaud
195190b612
[trunk] WIP: add a read CBD marker function (JPEG2000 part 2)
2011-10-12 14:36:39 +00:00
Mickael Savinaud
aeabfaf417
[trunk] WIP: add a read MCO marker function (JPEG2000 part 2)
2011-10-12 14:34:17 +00:00
Mickael Savinaud
f62201ba9d
[trunk] WIP: add a read MCC marker function (JPEG2000 part 2)
2011-10-12 14:32:29 +00:00
Mickael Savinaud
5cf331d881
[trunk] WIP: add a read MCT marker function (JPEG2000 part 2)
2011-10-12 14:30:22 +00:00
Mickael Savinaud
ca5b10938a
[trunk] WIP: correct a segfault inside j2k_dump output
2011-10-11 13:49:58 +00:00
Mickael Savinaud
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
Mickael Savinaud
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
Mickael Savinaud
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
Mickael Savinaud
c7d3b83164
[trunk] WIP: correct mistake with JP2 files and manage correctly the text_GBR.jp2 filecase
2011-10-11 07:49:16 +00:00
Vincent Torri
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
Vincent Torri
cee4505172
[trunk] fix 'distcheck' rule
2011-10-10 06:26:34 +00:00
Mickael Savinaud
4d4b29ea94
[trunk] WIP: correct mistake in text output inside set_decoded_area function (credit to Winfried)
2011-10-07 21:57:09 +00:00
Mickael Savinaud
efd780f82a
[trunk] WIP: update jp2 dump functions with the new V2 framework
2011-10-07 17:31:35 +00:00
Mickael Savinaud
35e13cf5e8
[trunk] correct wrong input in dump_codec function and add missing return value
2011-10-07 17:11:12 +00:00
Mickael Savinaud
238652b36c
[trunk] WIP: correct mistake inside set_decoded_area function (credit to Francois De Vieilleville)
2011-10-07 14:36:29 +00:00
Mickael Savinaud
ee0e8a3aad
[trunk] WIP: fix the decoding process with conformance files and V2 framework
2011-10-05 16:27:16 +00:00
Vincent Torri
f4734d6b4d
* [vincent] fix autotools for various compilation problems
...
* [vincent] fix indexer compilation. Patch from Winfried
2011-09-30 21:14:25 +00:00
Kaori Hagihara
656628e69b
modified indexer for JPIP, JPP-stream
2011-09-30 17:15:06 +00:00
Mickael Savinaud
67d04dd9ba
[trunk] WIP: enhance the event management into the new API
2011-09-27 12:41:49 +00:00
Mickael Savinaud
b8efd02c7f
[trunk] WIP: fix some warnings about a static function and j2k_read_unk_v2
2011-09-27 12:32:28 +00:00
Mickael Savinaud
a600d8f4e2
[trunk] WIP: add basis for a new output management of the codestream information and index
2011-09-27 12:14:11 +00:00
Mickael Savinaud
a5e442d490
[trunk] WIP: fix build compilation (with autotools) with MJ2 option (credit to Winfried)
2011-09-22 09:31:45 +00:00
Mickael Savinaud
51513c4e6b
WIP: fix build compilation error with windows platform about event_mgr management
2011-09-22 08:39:59 +00:00
Mickael Savinaud
5d0b813cec
[trunk] WIP: clean the j2k_dump application and the lib regards to the event management
2011-09-21 16:37:45 +00:00
Mickael Savinaud
ba0c271774
Enhance the support of endianess with cmake and inside the code (credit to Winfried)
2011-09-21 10:01:54 +00:00
Mickael Savinaud
7062c01b68
WIP: fixed build issues with JPWL option ON
2011-09-20 14:50:04 +00:00
Mickael Savinaud
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
Mickael Savinaud
ac59fd1476
WIP: begin to test opj_decode_tile_data
2011-09-19 16:34:44 +00:00
Mickael Savinaud
6561d70664
WIP: update t1, t2, tcd to use same strut as in V2
2011-09-19 16:09:19 +00:00
Mickael Savinaud
1a5c59326a
WIP: begin to test opj_read_tile_header with V2 style
2011-09-19 16:05:43 +00:00
Mickael Savinaud
d44375aece
WIP: create a new framework to output file information
2011-09-19 16:01:49 +00:00
Mickael Savinaud
cf37058d7c
WIP: remove a piece of code copy by the merge op at the wrong place
2011-09-19 15:51:20 +00:00
Mickael Savinaud
dcb3fcbfa7
WIP: begin to clean j2k_dump and some other small things
2011-09-19 13:55:06 +00:00
Mickael Savinaud
6ece3f6792
WIP: enchance the new version with some bug fixes from v1 and from me
2011-09-19 13:47:35 +00:00
Mickael Savinaud
3b30e42551
WIP: add support of jp2 for new j2k_dump function and some other small stuff
2011-09-19 13:36:07 +00:00
Mickael Savinaud
b0ef524b9e
WIP: new image_header struct is used and enable used of cstr_info
2011-09-19 13:30:21 +00:00
Mickael Savinaud
b138aaae08
WIP: manage the case of event_mgr is not provided to setup_decoder function
2011-09-19 13:18:19 +00:00
Mickael Savinaud
3953661078
WIP: insert elements from V2 framework into the trunk (add missing files)
2011-09-19 13:12:01 +00:00
Mickael Savinaud
b551844cc2
Work In Progress: insert elements from V2 framework into the trunk
2011-09-19 13:04:04 +00:00
Antonin Descampe
6a1573c228
TRUNK: fixed autotools for new indexer option
2011-09-09 18:54:05 +00:00
Antonin Descampe
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
Antonin Descampe
883e0826e2
removed obsolete testing directory and *.nix files (in trunk)
2011-08-16 09:33:37 +00:00
Mickael Savinaud
e3e2dc1f6e
fixed build error with position of variable declaration after patch 856
2011-08-11 08:37:11 +00:00
Mickael Savinaud
7812030886
moved the definition of OPJ_ARG_NOT_USED from opj_includes.h to openjpeg.h
2011-08-10 09:33:33 +00:00
Mickael Savinaud
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
Mickael Savinaud
9e419fdaf7
fixed glibc error with broken2 and broken4 images
2011-08-10 08:47:20 +00:00
Mickael Savinaud
676f8f189f
removed unused parameters warnings with the solution proposed by myself and Bob Friesenhahn
2011-08-10 08:12:10 +00:00
Mickael Savinaud
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
Mickael Savinaud
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
Antonin Descampe
6106e48397
improved encoding speed in t1_encode_cblks (credit to Giuseppe Baruffa)
2011-07-10 17:32:22 +00:00
Antonin Descampe
fa6aea80f5
fixed handling of "jp2->meth" value (Restricted ICC profile handling currently not implemented)
2011-07-03 17:56:49 +00:00
Mathieu Malaterre
3da66d4d79
adding partno and numpart info as part of the warning message (issue #69 )
2011-06-03 08:47:30 +00:00
Antonin Descampe
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
Antonin Descampe
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
Antonin Descampe
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
Antonin Descampe
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
Antonin Descampe
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
Antonin Descampe
6aaaa3eae2
changed the directory hierarchy of the whole project. See README files for details.
2011-04-13 22:38:50 +00:00
Antonin Descampe
16f205d886
re-organization of openjpeg directories hierarchy : step 1
2011-04-13 21:01:39 +00:00
Antonin Descampe
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
Antonin Descampe
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
Antonin Descampe
86edc0a40e
updated autotools files to improve build and install procedures (credit to Vincent Torri)
2011-03-04 10:53:27 +00:00
Antonin Descampe
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
Mathieu Malaterre
af71acb043
Explicitly link to the math lib on UNIX as we use floor and such symbols
2011-02-16 13:59:24 +00:00
Antonin Descampe
99c3c5a4af
cmake : fixed installed links to openjpeg.h and openjpeg3d.h
2011-02-06 16:39:26 +00:00
Antonin Descampe
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
Antonin Descampe
9a811cb52a
replaced en-dash with standard dash in jp2.c
2011-01-30 15:38:45 +00:00
Antonin Descampe
55c8c2bc77
license header: replaced Hervcalloc by Herve, I should learn to double-check my changes
2011-01-29 14:15:26 +00:00
Antonin Descampe
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
Rex Dieter
3f234ac21b
remove (autotools) generated files
2011-01-17 18:45:33 +00:00
Rex Dieter
97c5fe052c
fix symlink creation (cmake)
2011-01-13 19:40:48 +00:00
Winfried
7441340ab5
changed report code in Makefile.am
2011-01-07 03:20:58 +00:00
Antonin Descampe
73a6ed7c21
bug fixes to enable cmake compilation on WIN32 platform (see CHANGES for details)
2011-01-02 18:10:09 +00:00
Winfried
398b3f08b0
Adapted Makefile.am/Makefile.nix to build choice: shared xor static
2010-12-14 03:33:31 +00:00
Winfried
ebcda80583
Updated Makefile.in
2010-12-09 01:23:46 +00:00
Winfried
407b95e35f
Removed LCMS dependencies from Makefile.am/Makefile.nix
2010-12-09 01:11:05 +00:00
Antonin Descampe
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
Antonin Descampe
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
Antonin Descampe
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
Antonin Descampe
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
Antonin Descampe
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
Antonin Descampe
d5b44a98bc
reverted 'include "../opj_config.h"' to 'include "opj_config.h"'
2010-11-22 11:48:19 +00:00
Antonin Descampe
3afd3b1afd
install man pages by default. install CHANGES and LICENSE
2010-11-17 10:59:21 +00:00
Antonin Descampe
709068ef5b
minor changes in header inclusions
2010-11-15 11:08:03 +00:00
Antonin Descampe
2b7f6f82be
complete rewrite of opj_convert.c with correct values (from winfried)
2010-11-15 11:06:46 +00:00
Ben Boeckel
af32de46a2
Installation fixes when using CMake
2010-10-26 16:46:01 +00:00
Antonin Descampe
0dc7f6a2d3
Fixed doxygen data inside source code (from winfried)
2010-10-24 20:28:22 +00:00
Ben Boeckel
bb9232c9d9
Don't clobber openjpeg.h from jp3d
2010-10-22 18:41:49 +00:00
Antonin Descampe
e36881487d
Patch to support the MSVC Win 64 builds (from szekerest)
2010-10-22 09:45:53 +00:00
Antonin Descampe
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
Winfried
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
Antonin Descampe
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
Winfried
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
Winfried
ae6cf3da7d
2010-10-13 15:16:48 +00:00
Winfried
03133377fa
2010-10-13 14:49:39 +00:00
Antonin Descampe
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
Mathieu Malaterre
89eafad589
Synchronize branch and trunk cmakelists files
2010-06-29 19:08:58 +00:00
Mathieu Malaterre
f30f4c744e
Also dump the image info as well as cp info.
2010-06-22 14:03:52 +00:00
Mathieu Malaterre
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
Francois-Olivier Devaux
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
Francois-Olivier Devaux
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
Francois-Olivier Devaux
627f484bce
Significant optimizations of MCT, DWT, MQ and T1 modules by Peter Wimmer (thanks Peter)
2010-04-08 17:22:58 +00:00
Francois-Olivier Devaux
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
Francois-Olivier Devaux
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
Antonin Descampe
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
Antonin Descampe
bfd3fe8a4a
fixed minor bugs which were triggering warnings at compilation (different signedness, wrong pointer type, etc)
2009-09-10 12:29:51 +00:00
Antonin Descampe
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
Antonin Descampe
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
Parvatha Elangovan
cebdbda260
Added the default lossless parameter to opj_set_default_encoder_parameters in openjpeg.c
2008-07-09 11:43:02 +00:00
Antonin Descampe
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
Antonin Descampe
f4d394d932
additional test to avoid crash due to invalid image size, patch by Christopher Layne
2008-05-22 12:34:29 +00:00
Antonin Descampe
65e5ff0fb4
memory leak fixed in openjpeg.c (opj_destroy_cstr_info()), patch by Carsten Juttner
2008-05-22 09:54:44 +00:00
Francois-Olivier Devaux
9652def4de
Corrected the wrong syntax of calloc()...
2008-02-29 09:36:12 +00:00
Francois-Olivier Devaux
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
Francois-Olivier Devaux
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
Parvatha Elangovan
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
Francois-Olivier Devaux
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
Antonin Descampe
13209d2565
fixed opj_malloc.h for macosx (bugfix provided by janpeder, thanks)
2008-01-16 19:01:13 +00:00
Parvatha Elangovan
4051e87d06
Patch by Callum Lerwick. Fixed error during encoding using tile option in tcd.c
2008-01-04 15:43:57 +00:00
Francois-Olivier Devaux
4619a94ebf
VERSION 1.3.0 RELEASE
2007-12-21 10:39:41 +00:00
Francois-Olivier Devaux
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
Antonin Descampe
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
Francois-Olivier Devaux
5f995bcf4b
Fixed allocation problem in pi.c
2007-12-19 13:57:57 +00:00
Parvatha Elangovan
64ed560f4f
In pi.c, removed the Recursive function pi_check_next_level() and modified the code.
2007-12-19 12:28:40 +00:00
Francois-Olivier Devaux
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
Francois-Olivier Devaux
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
Francois-Olivier Devaux
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
Francois-Olivier Devaux
c458af9cd6
Avoided ABI breakage
2007-11-14 11:34:48 +00:00
Francois-Olivier Devaux
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
Francois-Olivier Devaux
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
Francois-Olivier Devaux
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
Francois-Olivier Devaux
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
Francois-Olivier Devaux
4bb067642f
Patches from Callum Lewick: Fixed some spelling errors in dwt.c.
2007-11-08 14:29:39 +00:00
Francois-Olivier Devaux
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
Giuseppe Baruffa
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
Francois-Olivier Devaux
9e114bcaa4
Patch from Callum Lewick. Memset patch. See ChangeLog for more details. Thanks Callum !
2007-10-18 12:26:11 +00:00
Francois-Olivier Devaux
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
Francois-Olivier Devaux
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
Francois-Olivier Devaux
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
Mathieu Malaterre
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
Parvatha Elangovan
7e40a9475a
Fixed issues with generation of SOP marker.
2007-09-19 14:56:19 +00:00
Parvatha Elangovan
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
Francois-Olivier Devaux
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
Francois-Olivier Devaux
569bbb0077
Fixed issues with cstr_info when codestream has components with different number of resolutions.
2007-09-17 14:00:43 +00:00
Francois-Olivier Devaux
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
Giuseppe Baruffa
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
Francois-Olivier Devaux
3816e0edf4
Indexes can now be generated when decoding J2K codestreams.
2007-09-07 15:01:55 +00:00
Giuseppe Baruffa
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
Giuseppe Baruffa
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
Giuseppe Baruffa
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
Francois-Olivier Devaux
7a2d96efe1
Added information regarding the end of packet position in the index
2007-08-30 15:32:51 +00:00
Francois-Olivier Devaux
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
Francois-Olivier Devaux
d07fa5d9d0
Fixed wrong destructors called in openjpeg.c
...
Fixed bug in j2k_decode_jpt_stream
2007-08-28 10:13:58 +00:00
Parvatha Elangovan
c101f8049c
The end of main header is calculated after TLM and POC marker for Dcinema.
2007-08-24 15:11:01 +00:00
Francois-Olivier Devaux
bd0b6ec2fd
Fixed problem with _mm_malloc under OSX. Thanks to Callum Lerwick for solving that issue.
2007-08-24 13:46:44 +00:00
Francois-Olivier Devaux
1d02a8b595
Use <xmmintrin.h> for WIN32, else use <mm_malloc.h>
2007-08-21 12:57:39 +00:00
Francois-Olivier Devaux
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
Francois-Olivier Devaux
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
Francois-Olivier Devaux
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
Francois-Olivier Devaux
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
Francois-Olivier Devaux
adca52578d
Memory leaks fixed
2007-08-21 12:21:35 +00:00
Francois-Olivier Devaux
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
Francois-Olivier Devaux
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
Francois-Olivier Devaux
00e440ebdb
Corrected allocation to take into account the EOC marker
2007-08-21 09:06:13 +00:00