Commit Graph

53 Commits

Author SHA1 Message Date
Even Rouault 338246278a
Build: fix linking of executables on some systems where TIFF/LCMS2 static libraries are not in system directories (fixes #1430)
Note that the fix might be partial only for static-only builds (cf
comments)

Ammends PR #866 and #867
2022-06-27 12:03:45 +02:00
Stefan Weil 667149ffa1 Fix some typos (found by codespell)
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2021-12-05 13:14:33 +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
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
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
Stefan Weil 3d6ffaf3f3 Fix some typos in code comments and documentation
All typos were found by Codespell.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-09-05 20:01:10 +02:00
Even Rouault 3f0de88c7b Remove opjstyle binary that went inadvertently committed in d4e54e9f35 (#1026) 2017-09-22 21:43:09 +02:00
Even Rouault d4e54e9f35 Add mechanisms to reformant and check code style (#128)
Use an internal version of astyle (astyle 3.0). Scripts taken from QGIS.
astyle.options from https://github.com/uclouvain/openjpeg/issues/128

scripts/prepare-commit.sh can be used locally to automatically reformat
edited files.

Travis-CI will run scripts/verify-indentation.sh to verify committed files.
2017-05-09 20:46:16 +02:00
Samuel Martin 75a7f1a53b thirdparty: tiff: append flags found by pkg-config if available
This change allows to get all required CFLAGS/LDFLAGS in case of static only
build.

This build issue [1] was triggered by the Buildroot farms.

[1] http://autobuild.buildroot.net/results/d0d/d0d22727311d6300e0e400728126170407bfd699/build-end.log

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
2016-11-06 17:05:49 +01:00
Matthieu Darbois 275aad4df8 Update to libpng 1.6.25 (#821) 2016-09-06 22:33:45 +02:00
Matthieu Darbois 4a2a8693e5 Update to lcms 2.8 (#808) 2016-08-06 13:04:56 +02:00
Matthieu Darbois 1509ccc51f Update to libpng 1.6.24 (#807) 2016-08-06 12:51:40 +02:00
Matthieu Darbois 44a499f2ac Update lcms2 (#773)
Update to mm2/Little-CMS@e342f44
2016-05-03 22:22:03 +02:00
Julien Malik 17a0a8a195 Use lowercase for cmake commands consistenly
Inspired from https://github.com/InsightSoftwareConsortium/ITK/blob/master/Utilities/Maintenance/HowToCreateTheCMakeCaseConversion.txt
This needs vim 7.3 and fails with vim 7.4

This also fixes a number of :
- missing empty line at end of files
- useless space at end of lines
2016-05-02 16:05:41 +02:00
Matthieu Darbois b51d088267 Update to libtiff-4.0.6 (#764) 2016-05-01 18:05:46 +02:00
Matthieu Darbois 9a20f8e8d1 Update lcms (#544)
Update to mm2/Little-CMS@0e8234e090
2016-04-30 17:58:04 +02:00
Julien Malik 8611d127db Import pnglibconf.h.prebuilt as new pnglibconf.h 2016-04-22 00:16:16 +02:00
Julien Malik 889bf16791 update libpng to from 1.6.17 to 1.6.21 2016-04-21 18:49:15 +02:00
mayeut 9c5b30005e Add missing include statement for ssize_t
Update uclouvain/openjpeg#681
2016-01-06 17:37:37 +01:00
mayeut 85904a3291 Fix libtiff build with Visual Studio 2010 2015-07-26 18:49:23 +02:00
mayeut 6007ac5c56 Switch to libpng-1.6.17 2015-07-25 19:48:21 +02:00
Matthieu Darbois 335e972554 Merge pull request #528 from mayeut/zlib-1.2.8
Update zlib to version 1.2.8
2015-07-25 19:00:51 +02:00
mayeut 2fc9d4956a Switch to libcms2-2.6 2015-07-21 23:49:11 +02:00
mayeut fb0e397330 Update zlib to version 1.2.8 2015-07-04 18:45:06 +02:00
Aaron Boxer 6b0a8e3a0f upgraded to libtiff v4.0.4 2015-07-03 19:19:17 +02:00
Matthieu Darbois 776b83ddbc [trunk] Fixed compilation error under Visual Studio 2003 (fixes issue 351) 2014-12-09 05:44:55 +00:00
Antonin Descampe f105cb5471 [trunk] removed debug message in CMakeLists.txt 2014-04-02 16:37:07 +00:00
Mathieu Malaterre a43d206b93 [trunk] Remove duplicate content from test_inline.c
Thanks to Matthieu Darbois for report (and patch)
Fixes issue 285
2014-03-14 15:10:31 +00:00
Mickael Savinaud a13e4a77e0 [trunk] use everywhere the new opj_ prefix for HAVE variables and use the opj_apps_config file (thanks to winfried) 2013-03-17 17:03:00 +00:00
Mathieu Malaterre 5db7b01fa2 [trunk] FolderReorgProposal task: Fix doxygen
Update issue 177
2012-10-01 08:30:04 +00:00
Mickael Savinaud 3135642ff5 [trunk] Remove CMake-language block-end command arguments
Ancient versions of CMake required else(), endif(), and similar block termination commands to have arguments matching the command starting the block.  This is no longer the preferred style.
Thanks to Hans Johnson
2012-08-30 17:20:03 +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 8e65846f32 [trunk] add debug statement for Win7-VS2008-32bits-trunk-Debug-OSGeo4W 2012-03-19 09:11:58 +00:00
Mathieu Malaterre 7539577b46 [trunk] Fix compilation when zlib.h is in user specified directory. 2012-03-17 14:51:40 +00:00
Mathieu Malaterre 41ee6006c4 [trunk] Fix compilation on 32bits/PowerPC arch (debian/linux) 2012-03-15 13:36:12 +00:00
Mathieu Malaterre 813ba42cfc [trunk] make sure to build as universal build when OS is APPLE 2012-03-15 13:35:30 +00:00
Mathieu Malaterre d9940f416b [trunk] Fix issue with space 2012-03-12 16:43:27 +00:00
Mathieu Malaterre dd998e7fd3 [trunk] Add support for compiling libtiff with VS2008 2012-03-12 16:40:29 +00:00
Mathieu Malaterre 747db4d940 [trunk] Add support for MSVC 2010 compiler (32bits) 2012-03-12 15:40:22 +00:00
Mathieu Malaterre ecd5c523dc [trunk] Update libtiff to 4.0.1 to support BigTIFF. openjpeg/tiff 4.0.1 currently builds on linux/x86_64 and linux/mingw32. 2012-03-12 11:35:35 +00:00
Mathieu Malaterre 472c390e75 [trunk] import JPIP modifications for build-system from 1.5 2012-03-02 10:23:20 +00:00
Mathieu Malaterre ffc944976b Avoid message pollution during cmake configuration time 2011-11-24 10:14:55 +00:00
Antonin Descampe d8806649ab added cmake support to openjpip 2011-08-12 13:57:36 +00:00
Mickael Savinaud dc9a65923a Fixed issue #76 (trunk) 2011-08-11 14:29:03 +00:00
Mickael Savinaud 06363c01e4 correct some troubles about thirdparty when they are used 2011-07-22 14:26:57 +00:00
Mickael Savinaud a19c8a4ea3 add new decode tests based on conformance data and tolerance. Non regression is also added on the decoder output. Deactivate old tests. 2011-07-21 15:23:31 +00:00
Mickael Savinaud 0380840348 removed unused warning configuration message 2011-07-21 14:34:16 +00:00