[GRASS-SVN] r35020 - grass/branches/releasebranch_6_4/visualization/nviz2/cmd

[svn_grass at osgeo.org]

Author: neteler
Date: 2008-12-23 15:43:23 -0500 (Tue, 23 Dec 2008)
New Revision: 35020

Modified:
   grass/branches/releasebranch_6_4/visualization/nviz2/cmd/args.c
   grass/branches/releasebranch_6_4/visualization/nviz2/cmd/write_img.c
Log:
glynn: Don't try to write TIFF if built --without-tiff (merge from trunk, r35018)

Modified: grass/branches/releasebranch_6_4/visualization/nviz2/cmd/args.c
===================================================================
--- grass/branches/releasebranch_6_4/visualization/nviz2/cmd/args.c	2008-12-23 20:39:31 UTC (rev 35019)
+++ grass/branches/releasebranch_6_4/visualization/nviz2/cmd/args.c	2008-12-23 20:43:23 UTC (rev 35020)
@@ -78,7 +78,11 @@
     params->format = G_define_option();
     params->format->key = "format";
     params->format->type = TYPE_STRING;
+#ifdef HAVE_TIFFIO_H
     params->format->options = "ppm,tif";	/* TODO: png */
+#else
+    params->format->options = "ppm";
+#endif
     params->format->answer = "ppm";
     params->format->description = _("Graphics file format");
     params->format->required = YES;

Modified: grass/branches/releasebranch_6_4/visualization/nviz2/cmd/write_img.c
===================================================================
--- grass/branches/releasebranch_6_4/visualization/nviz2/cmd/write_img.c	2008-12-23 20:39:31 UTC (rev 35019)
+++ grass/branches/releasebranch_6_4/visualization/nviz2/cmd/write_img.c	2008-12-23 20:43:23 UTC (rev 35020)
@@ -34,8 +34,10 @@
 {
     if (format == FORMAT_PPM)
 	GS_write_ppm(name);
+#ifdef HAVE_TIFFIO_H
     else if (format == FORMAT_TIF)
 	GS_write_tif(name);
+#endif
     else
 	return 0;