diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-20 03:00:03 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-20 03:00:04 +0200 |
| commit | bad0c9bbcc6fbbc23fe88c0edd54f3e1e0644434 (patch) | |
| tree | 908094af9e2bec2f2f85e96490d8d76fa527b022 /src/3rdparty/libtiff/libtiff/tif_dirwrite.c | |
| parent | 454c0df87b3699c4291c324f786698864ba171fa (diff) | |
| parent | 4783c6dc4441ab833050a08996d40d959960ecff (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I946f97342788aedfd076c98abd44841720e507ed
Diffstat (limited to 'src/3rdparty/libtiff/libtiff/tif_dirwrite.c')
| -rw-r--r-- | src/3rdparty/libtiff/libtiff/tif_dirwrite.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/3rdparty/libtiff/libtiff/tif_dirwrite.c b/src/3rdparty/libtiff/libtiff/tif_dirwrite.c index c68d6d2..5d0a669 100644 --- a/src/3rdparty/libtiff/libtiff/tif_dirwrite.c +++ b/src/3rdparty/libtiff/libtiff/tif_dirwrite.c @@ -697,8 +697,11 @@ TIFFWriteDirectorySec(TIFF* tif, int isimage, int imagedone, uint64* pdiroff) } break; default: - assert(0); /* we should never get here */ - break; + TIFFErrorExt(tif->tif_clientdata,module, + "Cannot write tag %d (%s)", + TIFFFieldTag(o), + o->field_name ? o->field_name : "unknown"); + goto bad; } } } |