hrev44605 adds 1 changeset to branch 'master' old head: efe79d9878b6be801a18dc206d6f2f83f67e36ff new head: 1d6d4b7872084b35885c2e5641b32c688a5dce6c ---------------------------------------------------------------------------- 1d6d4b7: libtiff: fix ppc build [ Jerome Duval <jerome.duval@xxxxxxxxx> ] ---------------------------------------------------------------------------- Revision: hrev44605 Commit: 1d6d4b7872084b35885c2e5641b32c688a5dce6c URL: http://cgit.haiku-os.org/haiku/commit/?id=1d6d4b7 Author: Jerome Duval <jerome.duval@xxxxxxxxx> Date: Mon Sep 3 17:01:20 2012 UTC ---------------------------------------------------------------------------- 1 file changed, 8 insertions(+), 9 deletions(-) src/libs/tiff/tif_jpeg.c | 17 ++++++++--------- ---------------------------------------------------------------------------- diff --git a/src/libs/tiff/tif_jpeg.c b/src/libs/tiff/tif_jpeg.c index a967827..9ac77f1 100644 --- a/src/libs/tiff/tif_jpeg.c +++ b/src/libs/tiff/tif_jpeg.c @@ -726,11 +726,10 @@ JPEGPreDecode(TIFF* tif, tsample_t s) if (sp->cinfo.d.image_width < segment_width || sp->cinfo.d.image_height < segment_height) { TIFFWarningExt(tif->tif_clientdata, module, - "Improper JPEG strip/tile size, " - "expected %dx%d, got %dx%d", - segment_width, segment_height, - sp->cinfo.d.image_width, - sp->cinfo.d.image_height); + "Improper JPEG strip/tile size, " + "expected %" B_PRIu32 "x%" B_PRIu32 ", got %" B_PRIu32 "x%" + B_PRIu32, segment_width, segment_height, sp->cinfo.d.image_width, + sp->cinfo.d.image_height); } if (sp->cinfo.d.image_width > segment_width || sp->cinfo.d.image_height > segment_height) { @@ -741,10 +740,10 @@ JPEGPreDecode(TIFF* tif, tsample_t s) * case and error out. */ TIFFErrorExt(tif->tif_clientdata, module, - "JPEG strip/tile size exceeds expected dimensions," - " expected %dx%d, got %dx%d", - segment_width, segment_height, - sp->cinfo.d.image_width, sp->cinfo.d.image_height); + "JPEG strip/tile size exceeds expected dimensions," + "expected %" B_PRIu32 "x%" B_PRIu32 ", got %" B_PRIu32 "x%" + B_PRIu32, segment_width, segment_height, sp->cinfo.d.image_width, + sp->cinfo.d.image_height); return (0); } if (sp->cinfo.d.num_components !=