summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2022-11-26 21:00:49 +0000
committerEven Rouault <even.rouault@spatialys.com>2022-11-26 21:00:49 +0000
commit94854a8dbc9c25d94c9335fc3cb01071f8f1d78d (patch)
tree2c11f897c22ed4ad21e0dde327cb99b9ba8e654f
parent70a164524ebc76f9f06f640644631845bde6e6d5 (diff)
parent4331d27569c3b6430fc1f6de440cf1998d24fca2 (diff)
downloadlibtiff-git-94854a8dbc9c25d94c9335fc3cb01071f8f1d78d.tar.gz
Merge branch 'TIFFErrorExtR_fix_missing_calls' into 'master'
TIFFErrorExt() was not replaced with TIFFErrorExtR() everywhere in libtiff.... See merge request libtiff/libtiff!428
-rw-r--r--libtiff/tif_dirwrite.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c
index 45413c54..1d1badc7 100644
--- a/libtiff/tif_dirwrite.c
+++ b/libtiff/tif_dirwrite.c
@@ -763,7 +763,7 @@ TIFFWriteDirectorySec(TIFF* tif, int isimage, int imagedone, uint64_t* pdiroff)
goto bad;
/*-- ToDo: After Testing, this should be removed and tv_size==4 should be set as default. */
if (tv_size != 4) {
- TIFFErrorExt(0,"TIFFLib: _TIFFWriteDirectorySec()", "Rational2Double: .set_field_type in not 4 but %d", tv_size);
+ TIFFErrorExtR(tif,"TIFFLib: _TIFFWriteDirectorySec()", "Rational2Double: .set_field_type is not 4 but %d", tv_size);
}
}
}
@@ -782,7 +782,7 @@ TIFFWriteDirectorySec(TIFF* tif, int isimage, int imagedone, uint64_t* pdiroff)
goto bad;
/*-- ToDo: After Testing, this should be removed and tv_size==4 should be set as default. */
if (tv_size != 4) {
- TIFFErrorExt(0,"TIFFLib: _TIFFWriteDirectorySec()", "Rational2Double: .set_field_type in not 4 but %d", tv_size);
+ TIFFErrorExtR(tif,"TIFFLib: _TIFFWriteDirectorySec()", "Rational2Double: .set_field_type is not 4 but %d", tv_size);
}
}
}