summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* CMakeLists.txt: properly set value of HOST_FILLORDER to LSB2MSB for Windows ↵Even Rouault2019-07-151-0/+2
| | | | | | | | | | | | | CMake builds As can be seen in https://ci.appveyor.com/project/rleigh-codelibre/libtiff-didfs/builds/25846668/job/ory5w098j8wcij9x log, the HOST_FILLORDER is not properly set: [00:02:58] -- CMAKE_HOST_SYSTEM_PROCESSOR set to AMD64 [00:02:58] -- HOST_FILLORDER set to FILLORDER_MSB2LSB Ther reason is that we match the "amd64.*" lowercase string whereas CMAKE_HOST_SYSTEM_PROCESSOR is set to AMD64 uppercase.
* make TIFF_SSIZE_T the same bitwidth as TIFF_SIZE_TThomas Bernard2019-05-311-14/+6
| | | | | it was previously the same bitwidth as unsigned char * Pointers can be larger than size_t.
* Make defer strile offset/bytecount loading available at runtimeEven Rouault2019-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and add per-strile offset/bytecount loading capabilities. Part of this commit makes the behaviour that was previously met when libtiff was compiled with -DDEFER_STRILE_LOAD available for default builds when specifying the new 'D' (Deferred) TIFFOpen() flag. In that mode, the [Tile/Strip][ByteCounts/Offsets] arrays are only loaded when first accessed. This can speed-up the opening of files stored on the network when just metadata retrieval is needed. This mode has been used for years by the GDAL library when compiled with its embeded libtiff copy. To avoid potential out-of-tree code (typically codecs) that would use the td_stripbytecount and td_stripoffset array inconditionnaly assuming they have been loaded, those have been suffixed with _p (for protected). The use of the new functions mentionned below is then recommended. Another addition of this commit is the capability of loading only the values of the offset/bytecount of the strile of interest instead of the whole array. This is enabled with the new 'O' (Ondemand) flag of TIFFOpen() (which implies 'D'). That behaviour has also been used by GDAL, which hacked into the td_stripoffset/td_stripbytecount arrays directly. The new code added in the _TIFFFetchStrileValue() and _TIFFPartialReadStripArray() internal functions is mostly a port of what was in GDAL GTiff driver previously. Related to that, the public TIFFGetStrileOffset[WithErr]() and TIFFGetStrileByteCount[WithErr]() functions have been added to API. They are of particular interest when using sparse files (with offset == bytecount == 0) and you want to detect if a strile is present or not without decompressing the data, or updating an existing sparse file. They will also be used to enable a future enhancement where client code can entirely skip bytecount loading in some situtations A new test/defer_strile_loading.c test has been added to test the above capabilities.
* CMakeLists.txt: fix TIFF_SIZE_TThomas Bernard2019-02-031-1/+1
|
* webp in tiffNorman Barker2018-10-051-0/+23
|
* port: Add strtol, strtoll and strtoullRoger Leigh2018-03-231-1/+4
| | | | Also update strtoul. All use the same implementation from NetBSD libc.
* Merge branch 'zstd'Even Rouault2018-02-141-0/+28
|\
| * Add ZSTD compression codecEven Rouault2017-12-211-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From https://github.com/facebook/zstd "Zstandard, or zstd as short version, is a fast lossless compression algorithm, targeting real-time compression scenarios at zlib-level and better compression ratios. It's backed by a very fast entropy stage, provided by Huff0 and FSE library." We require libzstd >= 1.0.0 so as to be able to use streaming compression and decompression methods. The default compression level we have selected is 9 (range goes from 1 to 22), which experimentally offers equivalent or better compression ratio than the default deflate/ZIP level of 6, and much faster compression. For example on a 6600x4400 16bit image, tiffcp -c zip runs in 10.7 seconds, while tiffcp -c zstd runs in 5.3 seconds. Decompression time for zip is 840 ms, and for zstd 650 ms. File size is 42735936 for zip, and 42586822 for zstd. Similar findings on other images. On a 25894x16701 16bit image, Compression time Decompression time File size ZSTD 35 s 3.2 s 399 700 498 ZIP/Deflate 1m 20 s 4.9 s 419 622 336
* | Merge branch 'libtiff-as-subdirectory-fixes' into 'master'Even Rouault2018-02-091-1/+1
|\ \ | | | | | | | | | | | | Prefer target_include_directories See merge request libtiff/libtiff!12
| * | Bump minimum required CMake version to v2.8.11Kevin Funk2018-01-291-1/+1
| |/ | | | | | | Because we use the BUILD_INTERFACE generator expression
* | cmake: avoid setting hard-coded variables in the cacheBen Boeckel2018-01-151-2/+1
| |
* | cmake: avoid an unnecessary intermediate variableBen Boeckel2018-01-151-13/+1
| |
* | cmake: avoid an unnecessary intermediate variableBen Boeckel2018-01-151-4/+2
| |
* | cmake: avoid tautological logicBen Boeckel2018-01-151-6/+2
| |
* | cmake: use check_symbol_existsBen Boeckel2018-01-151-21/+9
| | | | | | | | This accounts for symbols being provided by macros.
* | cmake: remove unused configure checksBen Boeckel2018-01-151-29/+0
|/
* * .travis.yml, build/travis-ci: new files fromEven Rouault2017-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | 0001-ci-Add-Travis-support-for-Linux-builds-with-Autoconf.patch by Roger Leigh (sent to mailing list on 2017-06-08) This patch adds support for the Travis-CI service. * .appveyor.yml: new file from 0002-ci-Add-AppVeyor-support.patch by Roger Leigh (sent to mailing list on 2017-06-08) This patch adds a .appveyor.yml file to the top-level. This allows one to opt in to having a branch built on Windows with Cygwin, MinGW and MSVC automatically when a branch is pushed to GitHub, GitLab, BitBucket or any other supported git hosting service. * CMakeLists.txt, test/CMakeLists.txt, test/TiffTestCommon.cmake: apply patch 0001-cmake-Improve-Cygwin-and-MingGW-test-support.patch from Roger Leigh (sent to mailing list on 2017-06-08) This patch makes the CMake build system support running the tests with MinGW or Cygwin.
* * CMakeLists.txt, Makefile.am, configure.ac: Applied patches byBob Friesenhahn2015-09-011-4/+10
| | | | | | | | | | Roger Leigh (via tiff mailing list on 2015-09-01). CMake build is now included in 'distcheck' target. Builds with CMake 2.8.9 and newer. Tar is now resquested to use POSIX PAX format.
* * CMakeLists.txt, libtiff/test/Makefile.am: Applied patches byBob Friesenhahn2015-09-011-4/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Roger Leigh (via tiff mailing list on 2015-08-31. CMake reads all version information directly from configure.ac to avoid duplication of values. This basically greps over the file for the LIBTIFF_* variables, then translates them to the form needed for cmake. This includes the release version and libtool shared library version information. Make shared/static library building configurable. Currently it always builds shared libraries, with static libs having a _static suffix (copying zlib, but it means it's got a non-standard name). CMake has a -DBUILD_SHARED_LIBS=ON|OFF option to select one or the other, which is now used instead. There's now a single "tiff" target to build either shared or static as required, and all the tests and tools are linked with this. Note: the Windows tests fail when linked with a static libtiff (says: libtiff.dll not found). Not really a regression since this was not tested up to this point, and it's likely the unit tests haven't (ever?) been run on Windows with a static libtiff, so there's some additional portability issue here to address. Works fine on UNIX systems, and fine on Windows with the default to build a DLL. Add a missing file which wasn't being distributed, causing unit tests to fail. Note that "find . -name '*.cmake'" lists all the CMake files which need distributing in addition to all the CMakeLists.txt files (which now are distributed).
* Additional CMake-related files were missing from the distribution tarball.v4.0.5Release-v4-0-5Bob Friesenhahn2015-08-311-2/+2
|
* Add ld-version-script option to cmake build.Bob Friesenhahn2015-08-291-1/+2
|
* Fix Cmake build issues caused by Windows large file updates.Bob Friesenhahn2015-08-211-0/+4
|
* * cmake: Add d suffix to debug libraries with MSVC. Patch #3 of 3Bob Friesenhahn2015-07-041-5/+72
| | | | | | | | | | | by Roger Leigh posted to tiff list on Wed, 1 Jul 2015 15:58:20 +0100. * cmake: Add extra warning flags. Patch #2 of 3 by Roger Leigh posted to tiff list on Wed, 1 Jul 2015 15:58:20 +0100. * cmake: Correct snprintf fallback for VS2015. Patch #1 of 3 by Roger Leigh posted to tiff list on Wed, 1 Jul 2015 15:58:20 +0100.
* * CMakeLists.txt: Add CMake patchset by Roger Leigh as posted toBob Friesenhahn2015-06-251-0/+660
libtiff mailing list on Mon, 22 Jun 2015 21:21:01 +0100. Several corrections to ensure that the autotools build still works were added by me. I have not yet tested the build using 'cmake' or MSVC with 'nmake'.