summaryrefslogtreecommitdiff
path: root/com32/lib/jpeg
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2011-04-04 16:17:48 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2011-04-04 16:17:48 -0700
commitb4820db9bd8f6ebe0b01d47972ff2ee816fddf64 (patch)
tree7a056dd1514315428a99ff4a57fb3b2c19327453 /com32/lib/jpeg
parent7557067a64696f1136952a8815562e670205b38c (diff)
downloadsyslinux-b4820db9bd8f6ebe0b01d47972ff2ee816fddf64.tar.gz
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 <hpa@linux.intel.com>
Diffstat (limited to 'com32/lib/jpeg')
-rw-r--r--com32/lib/jpeg/tinyjpeg-internal.h2
-rw-r--r--com32/lib/jpeg/tinyjpeg.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/com32/lib/jpeg/tinyjpeg-internal.h b/com32/lib/jpeg/tinyjpeg-internal.h
index bb5c6707..8e6d4fdf 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 2927b718..47317d00 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