diff options
author | Simon Bünzli <zeniko@gmail.com> | 2014-01-02 21:27:15 +0100 |
---|---|---|
committer | Robin Watts <robin.watts@artifex.com> | 2014-01-06 13:13:35 +0000 |
commit | 9b92bac1ec135862132b1c49b977b53891b73d88 (patch) | |
tree | dfd5faac92aa678cc5c8b23ae626d347b9d17494 /source/pdf/pdf-function.c | |
parent | f6fe26922653b45519d406bd07840719cef1d979 (diff) | |
download | mupdf-9b92bac1ec135862132b1c49b977b53891b73d88.tar.xz |
fix various MSVC warnings
Some warnings we'd like to enable for MuPDF and still be able to
compile it with warnings as errors using MSVC (2008 to 2013):
* C4115: 'timeval' : named type definition in parentheses
* C4204: nonstandard extension used : non-constant aggregate initializer
* C4295: 'hex' : array is too small to include a terminating null character
* C4389: '==' : signed/unsigned mismatch
* C4702: unreachable code
* C4706: assignment within conditional expression
Also, globally disable C4701 which is frequently caused by MSVC not
being able to correctly figure out fz_try/fz_catch code flow.
And don't define isnan for VS2013 and later where that's no longer needed.
Diffstat (limited to 'source/pdf/pdf-function.c')
-rw-r--r-- | source/pdf/pdf-function.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/pdf/pdf-function.c b/source/pdf/pdf-function.c index 510e36cf..b18ccf17 100644 --- a/source/pdf/pdf-function.c +++ b/source/pdf/pdf-function.c @@ -1626,7 +1626,7 @@ pdf_load_function(pdf_document *doc, pdf_obj *dict, int in, int out) if (pdf_obj_marked(dict)) fz_throw(ctx, FZ_ERROR_GENERIC, "Recursion in function definition"); - if ((func = pdf_find_item(ctx, pdf_free_function_imp, dict))) + if ((func = pdf_find_item(ctx, pdf_free_function_imp, dict)) != NULL) { return (fz_function *)func; } |