diff options
| author | bfriesen <bfriesen> | 2015-09-06 20:42:20 +0000 |
|---|---|---|
| committer | bfriesen <bfriesen> | 2015-09-06 20:42:20 +0000 |
| commit | 546f173ccb0f88599382cf9f9d231240e72fbd7b (patch) | |
| tree | d66d198e3ec05cd46b27c5c2b7b69fe184b4f0ca | |
| parent | 47e17c19b07abe7fdf7c63f1c27e3096a1d694b4 (diff) | |
| download | libtiff-546f173ccb0f88599382cf9f9d231240e72fbd7b.tar.gz | |
* tools/tiffgt.c: Silence glut API deprecation warnings on MacOS
X. Patch by Roger Leigh.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | tools/tiffgt.c | 13 |
2 files changed, 14 insertions, 2 deletions
@@ -1,5 +1,8 @@ 2015-09-06 Bob Friesenhahn <bfriesen@simple.dallas.tx.us> + * 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", |