Просмотр исходного кода

Don't try to write TIFF if built --without-tiff

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@35018 15284696-431f-4ddb-bdfa-cd5b030d7da7
Glynn Clements 16 лет назад
Родитель
Сommit
20c058c89b
2 измененных файлов с 6 добавлено и 0 удалено
  1. 4 0
      visualization/nviz2/cmd/args.c
  2. 2 0
      visualization/nviz2/cmd/write_img.c

+ 4 - 0
visualization/nviz2/cmd/args.c

@@ -78,7 +78,11 @@ void parse_command(int argc, char *argv[], struct GParams *params)
     params->format = G_define_option();
     params->format = G_define_option();
     params->format->key = "format";
     params->format->key = "format";
     params->format->type = TYPE_STRING;
     params->format->type = TYPE_STRING;
+#ifdef HAVE_TIFFIO_H
     params->format->options = "ppm,tif";	/* TODO: png */
     params->format->options = "ppm,tif";	/* TODO: png */
+#else
+    params->format->options = "ppm";
+#endif
     params->format->answer = "ppm";
     params->format->answer = "ppm";
     params->format->description = _("Graphics file format");
     params->format->description = _("Graphics file format");
     params->format->required = YES;
     params->format->required = YES;

+ 2 - 0
visualization/nviz2/cmd/write_img.c

@@ -34,8 +34,10 @@ int write_img(const char *name, int format)
 {
 {
     if (format == FORMAT_PPM)
     if (format == FORMAT_PPM)
 	GS_write_ppm(name);
 	GS_write_ppm(name);
+#ifdef HAVE_TIFFIO_H
     else if (format == FORMAT_TIF)
     else if (format == FORMAT_TIF)
 	GS_write_tif(name);
 	GS_write_tif(name);
+#endif
     else
     else
 	return 0;
 	return 0;