Even Rouault
0bda7188b7
Merge pull request #1321 from ffontaine/master
...
Fix cmake file with DESTDIR
2021-01-10 23:58:37 +01:00
Fabrice Fontaine
4d0b49edad
cmake/OpenJPEGConfig.cmake: replace ABSOLUTE by REALPATH
...
Fix #1174 by replacing ABSOLUTE by REALPATH which will resolve symlinks:
https://cmake.org/cmake/help/latest/command/get_filename_component.html
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
2021-01-07 14:11:26 +01:00
Fabrice Fontaine
14f4c27e7c
Revert "Use INC_DIR for OPENJPEG_INCLUDE_DIRS (fixes uclouvain#1174)"
...
This reverts commit 65586374d6
which
breaks cross-compilation of poppler under buildroot (because of
DESTDIR usage).
2021-01-07 14:09:50 +01:00
Even Rouault
0782cd075d
Merge pull request #867 from pseiderer/fix-lcms2-static-linking-using-pgk-config
...
Fix lcms2 static linking using pgk config
2021-01-04 19:42:30 +01:00
Peter Seiderer
b6f0e41399
thirdparty: lcms2: append flags found by pkg-config if available
...
This change allows to get all required CFLAGS/LDFLAGS in case of static only
build.
Fixes a buildroot build failure (see [1], [2] and [3]).
[1] http://autobuild.buildroot.net/results/5ce/5cee20afd8bef5268832cddcb3a5270746be7a57
[2] http://lists.busybox.net/pipermail/buildroot/2016-November/177187.html
[3] http://lists.busybox.net/pipermail/buildroot/2016-November/177188.html
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
Depends on https://github.com/uclouvain/openjpeg/pull/866
2021-01-04 17:13:03 +01:00
Even Rouault
07a454324c
Merge pull request #866 from tSed/master
...
fix static build only against tiff and its indirect dependencies
2021-01-04 14:06:43 +01:00
Even Rouault
eb27272a79
Merge pull request #1317 from ffontaine/master
...
CMakeLists.txt: Don't require a C++ compiler
2021-01-04 10:45:52 +01:00
Peter Korsgaard
4d147d9630
CMakeLists.txt: Don't require a C++ compiler
...
By default, CMake assumes that the project is using both C and C++. By
explicitly passing 'C' as argument of the project() macro, we tell CMake
that only C is used, which prevents CMake from erroring out if a C++
compiler doesn't exist.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
[Retrieved (and slightly updated by adding enable_language(CXX) if
WITH_ASTYLE is set) from:
https://git.buildroot.net/buildroot/tree/package/openjpeg/0003-CMakeLists.txt-Don-t-require-a-C-compiler.patch ]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
2021-01-04 09:14:20 +01:00
Even Rouault
2519439d7d
Fix Windows build
2020-12-31 14:54:59 +01:00
Antonin Descampe
433edd0eea
patch provided 3rdparty zlib to work with MacOS
2020-12-31 11:06:28 +01:00
Even Rouault
4db0c8d5ae
Add HOWTO-RELEASE
2020-12-29 15:34:19 +01:00
Even Rouault
43b8ddc6af
Comment back opj_previous_version in abi_check.sh
2020-12-29 15:01:40 +01:00
Even Rouault
b93996d5e0
abi_check.sh: Update version number for automatic abi check
2020-12-29 14:46:50 +01:00
Even Rouault
b897e2cb36
Merge pull request #1312 from stweil/news
...
Fix year in NEWS
2020-12-28 22:58:58 +01:00
Stefan Weil
7dd5497b15
Fix year in NEWS
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-12-28 22:52:34 +01:00
Even Rouault
37ac30ceff
Prepare for v2.4.0
2020-12-28 21:59:39 +01:00
Even Rouault
a335b4d008
Merge pull request #1310 from Jamaika1/patch-1
...
Change defined WIN32
2020-12-28 21:49:48 +01:00
Even Rouault
4980f46210
Merge pull request #1307 from cygwin-lem/pr_use-OPENJPEG_INSTALL_DOC_DIR-to-DESTINATION-of-HTMLs
...
Set ${OPENJPEG_INSTALL_DOC_DIR} to DESTINATION of HTMLs
2020-12-28 19:05:14 +01:00
Even Rouault
6c5acd4d65
Merge pull request #1308 from timgates42/bugfix_typo_produced
...
docs: fix simple typo, producted -> produced
2020-12-28 19:04:28 +01:00
Jamaika1
0c2b633992
Change defined WIN32
2020-12-21 07:59:12 +01:00
Tim Gates
5d494a7e8b
docs: fix simple typo, producted -> produced
...
There is a small typo in thirdparty/include/zlib.h, thirdparty/libz/zlib.h.
Should read `produced` rather than `producted`.
2020-12-16 21:19:17 +11:00
Lemures Lemniscati
aaddbc7c07
Set ${OPENJPEG_INSTALL_DOC_DIR} to DESTINATION of HTMLs
...
Use ${OPENJPEG_INSTALL_DOC_DIR} as DESTINATION of HTML documents,
instead of share/doc.
2020-12-14 23:00:04 +09:00
Even Rouault
98a4c5c370
Merge pull request #1306 from matthew-sharp/master
...
Use INC_DIR for OPENJPEG_INCLUDE_DIRS (fixes uclouvain#1174)
2020-12-10 15:55:41 +01:00
Matthew Sharp
65586374d6
Use INC_DIR for OPENJPEG_INCLUDE_DIRS (fixes uclouvain#1174)
...
This fixes the case where the cmake file is accessed via a symlink.
2020-12-10 10:22:25 +11:00
Even Rouault
5d0a8b08dc
Merge pull request #1304 from rouault/fix_1302
...
pi.c: avoid out of bounds access with POC (fixes #1302 )
2020-12-05 11:39:23 +01:00
Even Rouault
8f5aff1dff
pi.c: avoid out of bounds access with POC ( fixes #1302 )
2020-12-04 20:45:25 +01:00
Even Rouault
43dd9ee178
Merge pull request #1303 from zodf0055980/fix#1283
...
Encoder: grow again buffer size
2020-12-04 20:37:43 +01:00
yuan
4ce7d285a5
Encoder: grow again buffer size in opj_tcd_code_block_enc_allocate_data() ( fixes #1283 )
2020-12-04 19:00:22 +08:00
Even Rouault
aaff099b49
Merge pull request #1301 from rouault/fix_1299
...
opj_j2k_write_sod(): avoid potential heap buffer overflow (fixes #1299 ) (probably master only)
2020-12-02 23:56:57 +01:00
Even Rouault
fb9eae5d63
Merge pull request #1300 from rouault/complement_1293
...
pi.c: avoid out of bounds access with POC (refs https://github.com/uclouvain/openjpeg/issues/1293#issuecomment-737122836 )
2020-12-02 23:56:39 +01:00
Even Rouault
fc6abdbeb7
Merge pull request #1298 from rouault/fix_1297
...
opj_t2_encode_packet(): avoid out of bound access of #1297 , but likely not the proper fix
2020-12-02 23:56:30 +01:00
Even Rouault
73fdf28342
opj_j2k_write_sod(): avoid potential heap buffer overflow ( fixes #1299 ) (probably master only)
2020-12-02 14:10:16 +01:00
Even Rouault
00383e162a
pi.c: avoid out of bounds access with POC (refs https://github.com/uclouvain/openjpeg/issues/1293#issuecomment-737122836 )
2020-12-02 14:03:11 +01:00
Even Rouault
38d661a389
opj_t2_encode_packet(): avoid out of bound access of #1297 , but likely not the proper fix
2020-12-02 13:13:26 +01:00
Even Rouault
18b1138fbe
Merge pull request #1295 from rouault/fix_1293
...
opj_j2k_setup_encoder(): validate POC compno0 and compno1 (fixes #1293 )
2020-12-02 10:05:39 +01:00
Even Rouault
630b485f86
Merge pull request #1296 from rouault/workaround_1294
...
opj_t2_encode_packet(): avoid out of bound access of #1294 , but likely not the proper fix
2020-12-02 10:05:31 +01:00
Even Rouault
c9380ed0f8
opj_j2k_setup_encoder(): validate POC compno0 ( fixes #1293 )
2020-12-01 19:56:44 +01:00
Even Rouault
fbd30b064f
opj_t2_encode_packet(): avoid out of bound access of #1294 , but likely not the proper fix
2020-12-01 19:51:35 +01:00
Even Rouault
61ff143ad6
Merge pull request #1292 from rouault/fix_1286
...
Encoder: avoid global buffer overflow on irreversible conversion when…
2020-12-01 11:35:59 +01:00
Even Rouault
6daf5f3e1e
Encoder: avoid global buffer overflow on irreversible conversion when too many decomposition levels are specified ( fixes #1286 )
2020-11-30 23:29:06 +01:00
Even Rouault
2d119d03a0
Merge pull request #1291 from rouault/tnsot_zero_missing_eoc
...
Decoding: deal with some SPOT6 images that have tiles with a single tile-part with TPsot == 0 and TNsot == 0, and with missing EOC
2020-11-30 23:28:31 +01:00
Even Rouault
b2072402b7
pngtoimage(): fix wrong computation of x1,y1 if -d option is used, that would result in a heap buffer overflow ( fixes #1284 )
2020-11-30 22:31:51 +01:00
Even Rouault
1aa3c60859
Decoding: deal with some SPOT6 images that have tiles with a single tile-part with TPsot == 0 and TNsot == 0, and with missing EOC
2020-11-30 17:53:04 +01:00
Even Rouault
a2b2980a4b
Merge pull request #1288 from zodf0055980/master
...
Free p_tcd_marker_info to avoid memory leak
2020-11-27 14:25:11 +01:00
yuan
4f487798ba
Free p_tcd_marker_info to avoid memory leak
2020-11-26 00:22:49 +08:00
Even Rouault
0c0f27f17d
Merge pull request #1287 from zodf0055980/master
...
Encoder: grow again buffer size
2020-11-25 16:59:46 +01:00
yuan
649298dcf8
Encoder: grow again buffer size in opj_tcd_code_block_enc_allocate_data() ( fixes #1283 )
2020-11-25 20:41:39 +08:00
Even Rouault
15cf3d9581
Encoder: grow again buffer size in opj_tcd_code_block_enc_allocate_data() ( fixes #1283 )
2020-11-23 18:14:02 +01:00
Even Rouault
eaa098b59b
Encoder: grow buffer size in opj_tcd_code_block_enc_allocate_data() to avoid write heap buffer overflow in opj_mqc_flush ( fixes #1283 )
2020-11-23 13:49:05 +01:00
Even Rouault
67ec360f48
Fix typo in internal function name
2020-11-23 13:38:27 +01:00