Commit Graph

3574 Commits

Author SHA1 Message Date
Even Rouault
e2801db6fd Merge branch 'various_fixes' into 'master'
Fix compiler warnings about unused variables when assert() expands to nothing

See merge request libtiff/libtiff!157
2020-10-12 19:18:40 +00:00
Even Rouault
4c4965a9df
.gitignore: add entries for new files in test/ 2020-10-12 20:20:38 +02:00
Even Rouault
c4aa76401b
Fix compiler warnings about unused variables when assert() expands to nothing 2020-10-12 19:45:51 +02:00
Roger Leigh
3279b00500 Merge branch '215-cygwin-appveyor-fail' into 'master'
Update Appveyor CI build to build with VS2019 image

Closes #215

See merge request libtiff/libtiff!154
2020-10-09 18:05:25 +00:00
Roger Leigh
7f8f6991da wip 2020-10-09 18:10:56 +01:00
Roger Leigh
42b6225641 wip 2020-10-09 17:58:44 +01:00
Roger Leigh
aeddabed84 wip 2020-10-09 17:00:46 +01:00
Roger Leigh
7d8b5e3695 wip 2020-10-09 16:47:38 +01:00
Roger Leigh
9911889a25 wip 2020-10-09 16:19:58 +01:00
Roger Leigh
4d1e1bc362 wip 2020-10-09 15:49:47 +01:00
Roger Leigh
e61c593494 Merge branch 'TIFF-217_m_lib_path' into 'master'
cmake: Do not use absolute libm path

Closes #217

See merge request libtiff/libtiff!156
2020-10-09 09:21:55 +00:00
Roger Leigh
7c9ca61785 cmake: Do not use absolute libm path 2020-10-09 08:32:44 +01:00
Even Rouault
a4cae3b8a3
tif_fax3.h: restore systematic calls to CLEANUP_RUNS()
now that SETVALUE() no longer cause overflows.
Those were removed per b351db8be1 and
3440ac2164.

As SETVALUE() now returns an error, this allow the decoder to exit.

Otherwise, the assert(x == lastx) in _TIFFFax3fillruns() can trigger.

Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=26201
2020-10-08 12:20:52 +02:00
Even Rouault
4ee4a69bbb Merge branch 'check_TIFFFlushData1' into 'master'
FAX/JPEG/LZMA/PixarLog/ZIP/ZSTD codecs: make sure to check TIFFFlushData1() return value

See merge request libtiff/libtiff!155
2020-10-06 09:57:51 +00:00
Even Rouault
8c4c297a48 Merge branch 'shared-memory' into 'master'
Set the --shared-memory linker flag for Emscripten builds

See merge request libtiff/libtiff!153
2020-10-04 09:51:13 +00:00
Even Rouault
ca70b5e702
tiff2rgba.c: fix -Wold-style-declaration warning 2020-10-03 18:16:27 +02:00
Even Rouault
ff1022ac06
FAX/JPEG/LZMA/PixarLog/ZIP/ZSTD codecs: make sure to check TIFFFlushData1() return value 2020-10-03 18:12:04 +02:00
Even Rouault
9febb7599a
tif_fax3.h: extra buffer overflow checks. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=25934 2020-09-26 23:02:19 +02:00
Roger Leigh
6d078fe1f8 wip 2020-09-25 17:14:58 +01:00
Roger Leigh
e8863893b0 wip 2020-09-25 10:47:23 +01:00
Roger Leigh
5123e29287 wip 2020-09-25 10:12:02 +01:00
Roger Leigh
3b522bf470 wip 2020-09-25 09:57:15 +01:00
Roger Leigh
5d0476eb0b wip 2020-09-25 09:43:43 +01:00
Roger Leigh
9555de026e wip 2020-09-25 09:33:47 +01:00
Roger Leigh
04b299927f Update AppVeyor image 2020-09-25 09:10:07 +01:00
Roger Leigh
f846cd6452 test-appveyor 2020-09-25 09:01:47 +01:00
Attila Oláh
2b9abce31b
Also pass --shared-memory to raw_decode.
This is needed when building for Emscripten with *both* WEBP and JPEG
support.
2020-09-24 17:24:12 +00:00
Attila Oláh
433e052356
Set the --shared-memory linker flag for Emscripten builds.
This is only needed when building with WEBP support, which uses atomics,
therefore the linker needs the --shared-memory flag. The flag cannot be
added globally because not all executables link against libwebp.
2020-09-24 16:22:25 +00:00
Even Rouault
c8f0a16f4a
tif_fax3.h: return error when a buffer overflow occurs. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=25552 and https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=25849 2020-09-22 18:27:44 +02:00
Even Rouault
57d487aa1c Merge branch 'fix-float-compare' into 'master'
Fix comparison for max negative float value.

See merge request libtiff/libtiff!152
2020-09-11 09:41:47 +00:00
Dirk Lemstra
c0e310bc3f
Fix comparison for max negative float value. 2020-09-11 10:41:11 +02:00
Even Rouault
7b840002c1
Fax3PreDecode(): reset curruns and refruns state variables
to avoid out-of-bounds write triggered by GDAL when repeatedly
reading a corrupt strip.

Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=25493
2020-09-07 23:51:23 +02:00
Vadim Zeitlin
6e69a96bf6 Merge branch 'buildin-linux' of https://github.com/MaartenBent/libtiff into wx
Allow using tif_config.h not generated by configure under Linux too.

Note that the previous commit is best viewed with --color-moved option.

See https://github.com/wxWidgets/libtiff/pull/3
2020-08-15 12:27:34 +02:00
Maarten Bent
40e3e51ec6 Swap preprocessor check and use ifdef instead of ifndef 2020-08-14 21:46:10 +02:00
Maarten Bent
39ba1ec447 Enable using built-in libtiff on Linux 2020-08-14 21:38:58 +02:00
Thomas Bernard
1373f8dacb Merge branch 'issue-17' into 'master'
normalize tools behaviour regarding -h

Closes #17

See merge request libtiff/libtiff!115
2020-06-06 20:32:09 +00:00
Even Rouault
8a58319106
TWebPSetupEncode(): fix logic problem (and instead of or) in test that checks input is 8bit unsigned data 2020-05-31 21:18:21 +02:00
Even Rouault
6b3b189d5b
TIFFGetConfiguredCODECs(): fix to avoid wrong structure to be returned for registered (ie non built-in) codecs 2020-05-13 00:56:14 +02:00
Even Rouault
2a597b76cc Merge branch 'zstd-webp-update' into 'master'
gitlab-ci: use latest zstd and webp versions

See merge request libtiff/libtiff!148
2020-05-09 12:15:38 +00:00
Even Rouault
4c750d0238 Merge branch 'deprecated' into 'master'
ojpeg: s/Depreciated/Deprecated/

See merge request libtiff/libtiff!149
2020-05-09 12:13:27 +00:00
Aaron Boxer
0c2445854f ojpeg: s/Depreciated/Deprecated/ 2020-05-09 08:00:43 -04:00
Even Rouault
5fb3593eba
Fix typos 2020-04-28 00:49:54 +02:00
Even Rouault
8405704ebb
tif_jpeg.c: avoid potential division in previous fix (master only) 2020-04-27 13:20:55 +02:00
Thomas Bernard
312105b4a1
gitlab-ci: use latest zstd and webp versions 2020-04-26 22:32:35 +02:00
Even Rouault
c96a0232b7
tiff.h: fixes to use ASCII only characters (master only) 2020-04-26 22:30:14 +02:00
Thomas Bernard
aea167005f
tiffsplit: use EXIT_SUCCESS / EXIT_FAILURE 2020-04-26 22:15:09 +02:00
Thomas Bernard
2fa1ce2f55
tiffset: print usage on stdout when -h is used
also use EXIT_FAILURE / EXIT_SUCCESS
see #17
2020-04-26 22:15:09 +02:00
Thomas Bernard
9bf9cd3926
tiffmedian: shopw usage on stdout when -h is used
aslo use EXIT_SUCCESS/EXIT_FAILURE
see #17
2020-04-26 22:15:09 +02:00
Thomas Bernard
1c614e2686
tiffinfo: print usage on stdout when -h is used
also use EXIT_FAILURE / EXIT_SUCCESS
see #17
2020-04-26 22:15:09 +02:00
Thomas Bernard
46c8624972
raw2tiff: print usage to stdout when -h is used
see #17
2020-04-26 22:15:08 +02:00