Commit Graph

2920 Commits

Author SHA1 Message Date
Dimitri Papadopoulos bea58764ad
LGTM warning: Comparison result is always the same
Comparison is always true because pos >= 0.
2021-08-30 18:48:57 +03:00
xiaoxiaoafeifei 0afbdcf3e6
Fix segfault in src/bin/jp2/opj_decompress.c due to uninitialized pointer (fixes #1368) (#1369) 2021-07-14 03:35:13 +02:00
Even Rouault 08ba6a1638
Fix code formatting 2021-07-12 15:59:41 +02:00
Even Rouault 67f8a1e430
Merge pull request #1366 from sebras/fix-out-of-bounds-access
opj_j2k_is_imf_compliant: Fix out of bounds access
2021-07-12 15:58:06 +02:00
Sebastian Rasmussen e0993d072a opj_j2k_is_imf_compliant: Fix out of bounds access.
Previously when mainlevel was parsed == 12 openjpeg would generate
a warning, but then the sublevel value would be compared to an out
of bounds element in the tabMaxSubLevelFromMainLevel array. From
this commit OpenJPEG will only use mainlevel if in range.
2021-07-12 15:32:39 +02:00
Even Rouault 00beb20953
Merge pull request #1365 from sebras/fix-warning-formatting
opj_j2k_is_imf_compliant: Fix argument formatting for warnings.
2021-07-12 12:02:12 +02:00
Sebastian Rasmussen c8ab3e5849 opj_j2k_is_imf_compliant: Fix argument formatting for warnings. 2021-07-12 03:43:30 +02:00
Even Rouault cc1919b183
Merge pull request #1361 from rouault/update_version_numbers_to_2_5
CMakeLists.txt/appveyor.yml: update version number to 2.5.0…
2021-06-09 11:53:56 +02:00
Even Rouault 655bb12525
CMakeLists.txt/appveyor.yml: update version number to 2.5.0 to make it easier for downstream consumers to use new features 2021-06-08 14:34:43 +02:00
Even Rouault c28965f255
Merge pull request #1359 from rouault/TLM
Add support for enabling generation of TLM markers in encoder
2021-06-08 11:11:04 +02:00
Even Rouault a36ae03860
Add support for enabling generation of TLM markers in encoder
Support was already there, but restricted to Cinema and IMF profiles,
and 255 tiles

* Add -TLM switch added to opj_compress
* Make opj_encoder_set_extra_options() function accept a TLM=YES option.
2021-06-07 15:49:08 +02:00
Even Rouault 2624908517
Merge pull request #1360 from rouault/travis_gcc_4_8_fix
.travis.yml: try to fix gcc 4.8 config by updating to xenial
2021-06-07 15:48:42 +02:00
Even Rouault b5ec98f14f
.travis.yml: try to fix gcc 4.8 config by updating to xenial 2021-06-07 15:43:05 +02:00
Even Rouault e7d908d201
Merge pull request #1358 from rouault/compiler_warning_fixes
Fix various compiler warnings
2021-06-07 13:56:11 +02:00
Even Rouault f0629cb1c4
Fix various compiler warnings 2021-06-07 13:28:26 +02:00
Even Rouault 7e4e09a7fb
openjpeg.c: avoid casts of function pointers 2021-06-07 12:57:30 +02:00
Even Rouault adb888920e
Merge pull request #1354 from msabwat/emscripten
fix #1345: don't remove big endian test for other platforms
2021-06-01 22:59:11 +02:00
Mehdi Sabwat 99c28c960c fix #1345: don't remove big endian test for other platforms
thanks to @ePirat, it turns out that !EMSCRIPTEN does not evaluate to 1 on other platforms, so the the #1345 actually disabled the test for all platforms.
2021-06-01 22:39:27 +02:00
Even Rouault b6b8d28b3a
Merge pull request #1345 from msabwat/emscripten
emscripten: disable big endian test
2021-05-07 11:22:13 +02:00
Mehdi Sabwat 238e849746 emscripten: disable big endian test
This test should not run on the emscripten platform because of :
dff3336842/cmake/Modules/TestBigEndian.cmake (L5)
2021-05-07 00:03:48 +02:00
Jamaika1 8aaafe6995
Import files tiff and yuv(raw) (#1316) 2021-05-06 19:30:34 +02:00
Even Rouault 5f653ad673
Merge pull request #1350 from rouault/remove_jpwl_jp3d_mj2
Remove obsolete components JPWL, JP3D and MJ2
2021-05-06 13:40:43 +02:00
Even Rouault 85a87cd505
Remove obsolete components JPWL, JP3D and MJ2 2021-05-04 19:21:45 +02:00
Even Rouault 05263eeee9
Merge pull request #1348 from rouault/fix_kdu
tools/travis-ci/install.sh: fix links to Kakadu and jpylyzer binaries
2021-05-04 19:15:06 +02:00
Even Rouault 9727f3ac69
.travis.yml: disable tests that no longer pass for unknown reason 2021-05-04 18:55:43 +02:00
Even Rouault 92c0471154
tools/travis-ci/install.sh: fix links to Kakadu and jpylyzer binaries 2021-05-04 16:31:32 +02:00
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