Mercurial > hg > forks > libbpg

changeset 23:d0ec05fbab88

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanups and warnings fixes.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 27 Apr 2017 15:57:50 +0300
parents 69089d946a14
children 377dc78a052d
files bpgdec.c
diffstat 1 files changed, 7 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/bpgdec.c	Thu Apr 27 12:16:41 2017 +0300
+++ b/bpgdec.c	Thu Apr 27 15:57:50 2017 +0300
@@ -75,10 +75,8 @@
 static void png_write_data (png_structp png_ptr, png_bytep data,
                             png_size_t length)
 {
-    FILE *f;
-    int ret;
-
-    f = png_get_io_ptr(png_ptr);
+    FILE *f = png_get_io_ptr(png_ptr);
+    png_size_t ret;
     ret = fwrite(data, 1, length, f);
     if (ret != length)
 	png_error(png_ptr, "PNG Write Error");
@@ -245,10 +243,9 @@
         const char *tag_name;
         printf("Extension data:\n");
         for(md = first_md; md != NULL; md = md->next) {
-            if (md->tag <= 5)
-                tag_name = extension_tag_str[md->tag];
-            else
-                tag_name = extension_tag_str[0];
+            tag_name = (md->tag < sizeof(extension_tag_str) / sizeof(extension_tag_str[0])) ?
+                extension_tag_str[md->tag] : extension_tag_str[0];
+
             printf("  tag=%d (%s) length=%d\n",
                    md->tag, tag_name, md->buf_len);
         }
@@ -272,7 +269,8 @@
     FILE *f;
     BPGDecoderContext *img;
     uint8_t *buf;
-    int buf_len, bit_depth, c, show_info;
+    png_size_t buf_len;
+    int bit_depth, c, show_info;
     const char *outfilename, *filename, *p;
 
     outfilename = "out.png";