[Spice-devel] [PATCH 3/8] build: use jpeg_boolean with more recent libjpeg versions.
Gerd Hoffmann
kraxel at redhat.com
Thu Jul 8 02:40:52 PDT 2010
Signed-off-by: Gerd Hoffmann <kraxel at redhat.com>
---
client/jpeg_decoder.cpp | 6 +++++-
client/mjpeg_decoder.cpp | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/client/jpeg_decoder.cpp b/client/jpeg_decoder.cpp
index a7824a9..f5a0198 100644
--- a/client/jpeg_decoder.cpp
+++ b/client/jpeg_decoder.cpp
@@ -20,6 +20,10 @@
#include "debug.h"
#include "utils.h"
+#if JPEG_LIB_VERSION < 70
+#define jpeg_boolean boolean
+#endif
+
static void op_begin_decode(SpiceJpegDecoder *decoder,
uint8_t* data,
int data_size,
@@ -45,7 +49,7 @@ extern "C" {
{
}
- static boolean jpeg_decoder_fill_input_buffer(j_decompress_ptr cinfo)
+ static jpeg_boolean jpeg_decoder_fill_input_buffer(j_decompress_ptr cinfo)
{
PANIC("no more data for jpeg");
return FALSE;
diff --git a/client/mjpeg_decoder.cpp b/client/mjpeg_decoder.cpp
index 42bf2f9..b78e1b3 100644
--- a/client/mjpeg_decoder.cpp
+++ b/client/mjpeg_decoder.cpp
@@ -25,6 +25,10 @@
#include "utils.h"
#include "mjpeg_decoder.h"
+#if JPEG_LIB_VERSION < 70
+#define jpeg_boolean boolean
+#endif
+
enum {
STATE_READ_HEADER,
STATE_START_DECOMPRESS,
@@ -38,7 +42,7 @@ extern "C" {
{
}
- static boolean fill_input_buffer(j_decompress_ptr cinfo)
+ static jpeg_boolean fill_input_buffer(j_decompress_ptr cinfo)
{
return FALSE;
}
--
1.7.1
More information about the Spice-devel
mailing list