diff options
author | Simon Bünzli <zeniko@gmail.com> | 2013-08-18 12:46:36 +0200 |
---|---|---|
committer | Robin Watts <robin.watts@artifex.com> | 2013-08-28 13:35:48 +0100 |
commit | 01acc82dc88fe43c4743bc18dce4e8581f129d31 (patch) | |
tree | 5db7e0a546e59271153d208ab6f364ff843bf5b2 | |
parent | 0924e802017d5a669041a86beb0f1348d5fda8da (diff) | |
download | mupdf-01acc82dc88fe43c4743bc18dce4e8581f129d31.tar.xz |
fix various typos
-rw-r--r-- | include/mupdf/fitz/function.h | 2 | ||||
-rw-r--r-- | source/fitz/colorspace.c | 2 | ||||
-rw-r--r-- | source/fitz/error.c | 7 | ||||
-rw-r--r-- | source/pdf/pdf-xref.c | 1 |
4 files changed, 8 insertions, 4 deletions
diff --git a/include/mupdf/fitz/function.h b/include/mupdf/fitz/function.h index 8e530e93..e3a1469b 100644 --- a/include/mupdf/fitz/function.h +++ b/include/mupdf/fitz/function.h @@ -16,7 +16,7 @@ void fz_eval_function(fz_context *ctx, fz_function *func, float *in, int inlen, fz_function *fz_keep_function(fz_context *ctx, fz_function *func); void fz_drop_function(fz_context *ctx, fz_function *func); unsigned int fz_function_size(fz_function *func); -#ifndef DEBUG +#ifndef NDEBUG void pdf_debug_function(fz_function *func); #endif diff --git a/source/fitz/colorspace.c b/source/fitz/colorspace.c index 07da5a95..5cefe979 100644 --- a/source/fitz/colorspace.c +++ b/source/fitz/colorspace.c @@ -171,7 +171,7 @@ static void rgb_to_cmyk(fz_context *ctx, fz_colorspace *cs, float *rgb, float *c static fz_colorspace k_default_gray = { {-1, fz_free_colorspace_imp}, 0, "DeviceGray", 1, gray_to_rgb, rgb_to_gray }; static fz_colorspace k_default_rgb = { {-1, fz_free_colorspace_imp}, 0, "DeviceRGB", 3, rgb_to_rgb, rgb_to_rgb }; -static fz_colorspace k_default_bgr = { {-1, fz_free_colorspace_imp}, 0, "DeviceRGB", 3, bgr_to_rgb, rgb_to_bgr }; +static fz_colorspace k_default_bgr = { {-1, fz_free_colorspace_imp}, 0, "DeviceBGR", 3, bgr_to_rgb, rgb_to_bgr }; static fz_colorspace k_default_cmyk = { {-1, fz_free_colorspace_imp}, 0, "DeviceCMYK", 4, cmyk_to_rgb, rgb_to_cmyk }; static fz_colorspace *fz_default_gray = &k_default_gray; diff --git a/source/fitz/error.c b/source/fitz/error.c index 0da7d29e..c5d98c92 100644 --- a/source/fitz/error.c +++ b/source/fitz/error.c @@ -88,9 +88,12 @@ FZ_NORETURN static void throw(fz_error_context *ex); static void throw(fz_error_context *ex) { - if (ex->top >= 0) { + if (ex->top >= 0) + { fz_longjmp(ex->stack[ex->top].buffer, ex->stack[ex->top].code + 2); - } else { + } + else + { fprintf(stderr, "uncaught exception: %s\n", ex->message); LOGE("uncaught exception: %s\n", ex->message); #ifdef USE_OUTPUT_DEBUG_STRING diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c index b1b9abe8..9c408051 100644 --- a/source/pdf/pdf-xref.c +++ b/source/pdf/pdf-xref.c @@ -568,6 +568,7 @@ pdf_read_new_xref(pdf_document *doc, pdf_lexbuf *buf) } fz_catch(ctx) { + pdf_drop_obj(trailer); fz_rethrow_message(ctx, "cannot parse compressed xref stream object"); } |