Commit Graph

554 Commits

Author SHA1 Message Date
Mickael Savinaud c0ec5d404b remove deprecated v1 style function j2k_read_soc 2012-08-09 15:28:38 +00:00
Mickael Savinaud 10e9a6b6cd rename j2k_decode_v2 to opj_j2k_decode 2012-08-09 15:16:33 +00:00
Mickael Savinaud a51aed7ce2 remove deprecated v1 style function j2k_decode 2012-08-09 15:13:33 +00:00
Mickael Savinaud 71e0106846 rename j2k_setup_decoder_v2 to opj_j2k_setup_decoder 2012-08-09 15:08:33 +00:00
Mickael Savinaud 3ce9af7fce remove deprecated v1 style function j2k_setup_decoder 2012-08-09 15:04:09 +00:00
Mickael Savinaud 05e8aae95e rename j2k_create_decompress_v2 to opj_j2k_create_decompress 2012-08-09 15:00:50 +00:00
Mickael Savinaud 381de6b7cb remove deprecated v1 style function j2k_create_decompress and jp2_create_decompress 2012-08-09 14:57:03 +00:00
Mickael Savinaud c077645f77 rename jp2_decode_v2 to opj_jp2_decode 2012-08-09 14:46:11 +00:00
Mickael Savinaud ebc3263987 remove deprecated v1 style function opj_jp2_decode 2012-08-09 14:42:37 +00:00
Mickael Savinaud cf6e5bf01f rename jp2_setup_decoder_v2 to opj_jp2_setup_decoder 2012-08-09 14:38:55 +00:00
Mickael Savinaud 958c615a83 remove deprecated v1 style function jp2_setup_decoder 2012-08-09 14:31:02 +00:00
Mickael Savinaud 8e5070f469 [trunk] add the support of the flag ignore_pclr_cmap_cdef into the V2 jp2 functions (but not for box reading); no tests modified 2012-08-09 14:28:35 +00:00
Mickael Savinaud 4397b675cb [trunk] begin to clean the old V1 style message event management 2012-08-09 14:00:31 +00:00
Mickael Savinaud 9ed88f6a8d [trunk] clean jp2_read_ihdr_v2 interface 2012-08-09 13:22:25 +00:00
Mickael Savinaud f12fde9132 [trunk] rename opj_destroy_cstr_info_v2 to opj_destroy_cstr_info 2012-08-09 12:56:43 +00:00
Mickael Savinaud 1c4ea6d246 remove deprecated v1 style function opj_destroy_cstr_info 2012-08-09 12:52:28 +00:00
Mickael Savinaud a6d76b3c48 [trunk] move functions in openjpeg.c in two parts compression vs decompression 2012-08-09 12:51:16 +00:00
Mickael Savinaud 5d0ace0577 [trunk] rename opj_encode_v2 to opj_encode 2012-08-09 12:42:46 +00:00
Mickael Savinaud 7b88544d46 [trunk] remove deprecated v1 style function opj_encode and opj_encode_with_info 2012-08-09 12:40:22 +00:00
Mickael Savinaud 6767ea2456 [trunk] rename opj_setup_encoder_v2 to opj_setup_encoder 2012-08-09 12:35:13 +00:00
Mickael Savinaud 459db3d64b remove deprecated v1 style function opj_setup_encoder 2012-08-09 12:31:46 +00:00
Mickael Savinaud d009cf618a rename opj_create_compress_v2 to opj_create_compress 2012-08-09 12:28:51 +00:00
Mickael Savinaud 9a9897a9de [trunk] remove deprecated v1 style function opj_create_compress 2012-08-09 12:26:04 +00:00
Mickael Savinaud 3f9fb13df6 remove deprecated v1 style function opj_decode and opj_decode_with_info 2012-08-09 12:16:59 +00:00
Mickael Savinaud 52f414669a [trunk] rename opj_setup_decoder_v2 to opj_setup_decoder 2012-08-09 12:11:24 +00:00
Mickael Savinaud b34215906c [trunk] remove deprecated v1 style function opj_setup_decoder 2012-08-09 11:56:14 +00:00
Mickael Savinaud fb768ac792 [trunk] remove deprecated v1 style function opj_destroy_decompress 2012-08-09 11:53:33 +00:00
Mickael Savinaud 35289bffe2 [trunk] rename opj_create_decompress_v2 to opj_create_decompress 2012-08-09 11:51:07 +00:00
Mickael Savinaud ef00fdf472 [trunk] remove V1 style function opj_create_decompress 2012-08-09 11:46:19 +00:00
Mickael Savinaud 3de7e8358f [trunk] define local functions of j2k.c as static and clean style 2012-08-09 11:35:06 +00:00
Mickael Savinaud 28ac2f49dc [trunk] move allocation of cstr_index->tile_index to the end of the header reading 2012-08-09 11:12:28 +00:00
Mathieu Malaterre f28fc6f2e1 [trunk] Fix r156 to compile on compilers where false is not defined. 2012-07-11 14:59:41 +00:00
Mathieu Malaterre 5ba8d36687 [trunk] This fixes issues seen on PDF files
Fixes issue 156
2012-07-11 14:55:39 +00:00
Mathieu Malaterre 178236cc5f [trunk] Fix heap buffer overflow
Enforce sanity checks on tile number and tile length, even when the (rather
broken) USE_JPWL code isn't enabled.
Import r1727 from branch 1.5
2012-07-10 13:09:45 +00:00
Mathieu Malaterre 0d0e7a1008 [trunk] The two files in Issue145 have a precision < 8-bit:
therefore 'jp2_read_pclr' must be changed.

j2k_to_image fails to create RGB/RGBA images with a
precision < 8-bit: therefore 'imagetopng' must be
changed.
Fixes issue 145
2012-05-29 13:55:49 +00:00
Mathieu Malaterre 806545df34 [trunk] Fix installation issues. Thanks to winfried for patch.
Fixes issue 149
2012-05-29 13:44:27 +00:00
Mathieu Malaterre 3ff48f27cf [trunk] error message typo, refer PLT instead of PLM 2012-05-22 16:07:38 +00:00
Mathieu Malaterre f0c732452f [trunk] add sentinel when tile_index is null 2012-05-21 08:38:13 +00:00
Mickael Savinaud 38fd7a84c7 Comment the using of j2k_add_marker function into a v2 function. 2012-05-21 06:51:07 +00:00
Mickael Savinaud 0fb6576511 2012-05-14 17:17:53 +00:00
Mathieu Malaterre b55abf5730 [trunk] Need to use new interface opj_event_msg_v2, instead of old opj_event_msg. Remove some simple warnings 2012-05-14 15:20:20 +00:00
Mathieu Malaterre 3e1aa456b9 [trunk] Pointer is opj_jp2_v2_t, not opj_jp2_t 2012-05-14 15:19:40 +00:00
Mathieu Malaterre 00558adda8 [trunk] Wrong struct size. Use opj_jp2_v2_t instead 2012-05-14 14:51:26 +00:00
Mathieu Malaterre 1c3273aab2 [trunk] Make sure the memory is initialized. valgrind was complaning in mqc_init_enc we were reading uninit value. See also comment in r479: FIXME: mqc_init_enc and mqc_byteout underrun the buffer if we don't do this. Why? 2012-05-14 14:38:02 +00:00
Mathieu Malaterre 589b247926 [trunk] Fix minor typo in error message. 2012-05-14 14:36:24 +00:00
Mickael Savinaud 6965e3e03c adding jp2_encode_v2 from v2 branches; using the right return value for opj_stream_flush 2012-05-14 11:04:59 +00:00
Mickael Savinaud 202d5ab754 correct style in cio.c and use only op_bool return value; correct error in jp2.c and some style 2012-05-14 10:02:59 +00:00
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