Mercurial > hg > dmlib

changeset 302:43c985265fd5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Silence some warnings.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 11 Oct 2012 18:01:15 +0300
parents b620ffe1c27e
children 2b5472173355
files stb_image.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/stb_image.c	Thu Oct 11 17:55:43 2012 +0300
+++ b/stb_image.c	Thu Oct 11 18:01:15 2012 +0300
@@ -693,6 +693,8 @@
    start_callbacks(&s, (stbi_io_callbacks *) clbk, user);
    return stbi_hdr_test(&s);
    #else
+   (void) clbk;
+   (void) user;
    return 0;
    #endif
 }
@@ -2820,7 +2822,7 @@
             // if critical, fail
             if (first) return e("first not IHDR", "Corrupt PNG");
             if ((c.type & (1 << 29)) == 0) {
-               #ifndef STBI_NO_FAILURE_STRINGS
+               #if !defined(STBI_NO_FAILURE_STRINGS) && !defined(STBI_FAILURE_USERMSG)
                // not threadsafe
                static char invalid_chunk[] = "XXXX chunk not known";
                invalid_chunk[0] = (uint8) (c.type >> 24);