Changeset 72948

Timestamp:

Jul 4, 2018, 12:11:33 PM (6 years ago)

Author:

hcho

Message:

m.nviz.image: Check return value from GS_write_(ppm|tif)

Location:

grass/trunk/misc/m.nviz.image

Files:

• main.c (modified) (1 diff)
• write_img.c (modified) (1 diff)

grass/trunk/misc/m.nviz.image/main.c

@@ -237 +237 @@
         ret = write_img(output_name, FORMAT_TIF);
 
-    if (!ret)
+    if (ret == 1)
+        G_fatal_error(_("Failed to write image"));
+    else if (ret == 2)
         G_fatal_error(_("Unsupported output format"));
 

grass/trunk/misc/m.nviz.image/write_img.c

@@ -24 +24 @@
    \param name filename
 
-   \return 1 on success
-   \return 0 on failure (unsupported format)
+   \return 0 on success
+   \return 1 on failure (failed to write image)
+   \return 2 on failure (unsupported format)
  */
 int write_img(const char *name, int format)
 {
     if (format == FORMAT_PPM)
-        GS_write_ppm(name);
+        return !GS_write_ppm(name);
 #ifdef HAVE_TIFFIO_H
     else if (format == FORMAT_TIF)
-        GS_write_tif(name);
+        return !GS_write_tif(name);
 #endif
     else
-        return 0;
+        return 2;
 
-    return 1;
+    return 0;
 }