From b4820db9bd8f6ebe0b01d47972ff2ee816fddf64 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Mon, 4 Apr 2011 16:17:48 -0700 Subject: [PATCH] tinyjpeg: change DEBUG to JPEG_DEBUG Rename the debugging option for tinyjpeg to JPEG_DEBUG to avoid conflict with the global dprintf option. Signed-off-by: H. Peter Anvin --- com32/lib/jpeg/tinyjpeg-internal.h | 2 +- com32/lib/jpeg/tinyjpeg.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/com32/lib/jpeg/tinyjpeg-internal.h b/com32/lib/jpeg/tinyjpeg-internal.h index bb5c670..8e6d4fd 100644 --- a/com32/lib/jpeg/tinyjpeg-internal.h +++ b/com32/lib/jpeg/tinyjpeg-internal.h @@ -152,7 +152,7 @@ enum std_markers { #define SANITY_CHECK 1 -#if DEBUG +#if JPEG_DEBUG #define error(fmt, args...) do { \ snprintf(error_string, sizeof(error_string), fmt, ## args); \ return -1; \ diff --git a/com32/lib/jpeg/tinyjpeg.c b/com32/lib/jpeg/tinyjpeg.c index 2927b71..47317d0 100644 --- a/com32/lib/jpeg/tinyjpeg.c +++ b/com32/lib/jpeg/tinyjpeg.c @@ -440,7 +440,7 @@ static void build_default_huffman_tables(struct jdec_private *priv) static void print_SOF(const unsigned char *stream) { -#if DEBUG +#if JPEG_DEBUG int width, height, nr_components, precision; const char *nr_components_to_string[] = { "????", @@ -664,7 +664,7 @@ static int parse_DRI(struct jdec_private *priv, const unsigned char *stream) priv->restart_interval = be16_to_cpu(stream+2); -#if DEBUG +#if JPEG_DEBUG trace("Restart interval = %d\n", priv->restart_interval); #endif -- 2.7.4