<div dir="ltr"><br><br><div class="gmail_quote"><div dir="ltr">On Wed, Jul 4, 2018 at 3:11 PM <<a href="mailto:svn_grass@osgeo.org">svn_grass@osgeo.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: hcho<br>
Date: 2018-07-04 12:11:33 -0700 (Wed, 04 Jul 2018)<br>
New Revision: 72948<br>
<br>
Modified:<br>
   grass/trunk/misc/m.nviz.image/main.c<br>
   grass/trunk/misc/m.nviz.image/write_img.c<br>
Log:<br>
m.nviz.image: Check return value from GS_write_(ppm|tif)<br>
<br>
Modified: grass/trunk/misc/m.nviz.image/main.c<br>
===================================================================<br>
--- grass/trunk/misc/m.nviz.image/main.c        2018-07-03 19:44:31 UTC (rev 72947)<br>
+++ grass/trunk/misc/m.nviz.image/main.c        2018-07-04 19:11:33 UTC (rev 72948)<br>
@@ -236,7 +236,9 @@<br>
     if (strcmp(params->format->answer, "tif") == 0)<br>
        ret = write_img(output_name, FORMAT_TIF);<br>
<br>
-    if (!ret)<br>
+    if (ret == 1)<br>
+       G_fatal_error(_("Failed to write image"));<br>
+    else if (ret == 2)<br>
        G_fatal_error(_("Unsupported output format"));<br>
<br>
     G_done_msg(_("File <%s> created."), output_name);<br>
<br>
Modified: grass/trunk/misc/m.nviz.image/write_img.c<br>
===================================================================<br>
--- grass/trunk/misc/m.nviz.image/write_img.c   2018-07-03 19:44:31 UTC (rev 72947)<br>
+++ grass/trunk/misc/m.nviz.image/write_img.c   2018-07-04 19:11:33 UTC (rev 72948)<br>
@@ -23,19 +23,20 @@<br>
<br>
    \param name filename<br>
<br>
-   \return 1 on success<br>
-   \return 0 on failure (unsupported format)<br>
+   \return 0 on success<br>
+   \return 1 on failure (failed to write image)<br>
+   \return 2 on failure (unsupported format)<br>
  */<br>
 int write_img(const char *name, int format)<br>
 {<br>
     if (format == FORMAT_PPM)<br>
-       GS_write_ppm(name);<br>
+       return !GS_write_ppm(name);<br>
 #ifdef HAVE_TIFFIO_H<br>
     else if (format == FORMAT_TIF)<br>
-       GS_write_tif(name);<br>
+       return !GS_write_tif(name);<br>
 #endif<br>
     else<br>
-       return 0;<br>
+       return 2;<br>
<br>
-    return 1;<br>
+    return 0;<br>
 }<br>
<br></blockquote><div><br></div><div>Shouldn't it be </div><div><br></div><div><span style="background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">return GS_write_ppm(name);</span><br></div><div><span style="background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline"><br></span></div><div><span style="background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">the return code of <span style="text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">GS_write_ppm is 1 when it fails, so there shouldn't be the negation?</span></span></div><div><span style="background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline"><span style="text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline"><br></span></span></div><div><span style="background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline"><span style="text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">Anna</span></span></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
_______________________________________________<br>
grass-commit mailing list<br>
<a href="mailto:grass-commit@lists.osgeo.org" target="_blank">grass-commit@lists.osgeo.org</a><br>
<a href="https://lists.osgeo.org/mailman/listinfo/grass-commit" rel="noreferrer" target="_blank">https://lists.osgeo.org/mailman/listinfo/grass-commit</a></blockquote></div></div>