From d1fabc4db183781c36b383558eb96cabb45bfc13 Mon Sep 17 00:00:00 2001 From: Bob Friesenhahn Date: Sun, 6 Sep 2015 20:42:20 +0000 Subject: [PATCH] * tools/tiffgt.c: Silence glut API deprecation warnings on MacOS X. Patch by Roger Leigh. --- ChangeLog | 3 +++ tools/tiffgt.c | 13 +++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0d80846b..9fe60db7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2015-09-06 Bob Friesenhahn + * tools/tiffgt.c: Silence glut API deprecation warnings on MacOS + X. Patch by Roger Leigh. + * Makefile.am: Added a 'coverity' rule to assist with Coverity submissions. diff --git a/tools/tiffgt.c b/tools/tiffgt.c index 3a0d5154..35a23ccf 100644 --- a/tools/tiffgt.c +++ b/tools/tiffgt.c @@ -1,4 +1,4 @@ -/* $Id: tiffgt.c,v 1.14 2015-06-25 02:28:01 bfriesen Exp $ */ +/* $Id: tiffgt.c,v 1.15 2015-09-06 20:42:20 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -82,6 +82,12 @@ extern char* optarg; extern int optind; #endif +/* GLUT framework on MacOS X produces deprecation warnings */ +# if defined(__GNUC__) && defined(__APPLE__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +# endif + static TIFF* tif = NULL; int @@ -408,7 +414,10 @@ raster_special(int key, int x, int y) glutPostRedisplay(); } - +/* GLUT framework on MacOS X produces deprecation warnings */ +# if defined(__GNUC__) && defined(__APPLE__) +# pragma GCC diagnostic pop +# endif char* stuff[] = { "usage: tiffgt [options] file.tif",