aboutsummaryrefslogtreecommitdiffstats
path: root/com32/lib/jpeg/tinyjpeg-internal.h
diff options
context:
space:
mode:
Diffstat (limited to 'com32/lib/jpeg/tinyjpeg-internal.h')
-rw-r--r--com32/lib/jpeg/tinyjpeg-internal.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/com32/lib/jpeg/tinyjpeg-internal.h b/com32/lib/jpeg/tinyjpeg-internal.h
index bd0e58da..bb5c6707 100644
--- a/com32/lib/jpeg/tinyjpeg-internal.h
+++ b/com32/lib/jpeg/tinyjpeg-internal.h
@@ -80,7 +80,7 @@ struct component
typedef void (*decode_MCU_fct) (struct jdec_private *priv);
-typedef void (*convert_colorspace_fct) (struct jdec_private *priv);
+typedef void (*convert_colorspace_fct) (struct jdec_private *priv, int, int);
struct jdec_private
{
@@ -167,6 +167,16 @@ enum std_markers {
#define trace(fmt, args...) do { } while (0)
#endif
+#ifndef __likely
+# define __likely(x) (!!(x))
+#endif
+#ifndef __unlikely
+# define __unlikely(x) (!!(x))
+#endif
+
+#define min(x, y) ((x) < (y) ? (x) : (y))
+#define max(x, y) ((x) > (y) ? (x) : (y))
+
#if 0
static char *print_bits(unsigned int value, char *bitstr)
{