configure: Make jpeglib an optional dependency.

It doesn’t make sense to fail the entire build when jpeglib isn’t
present, so this commit makes it optional just like libwebp in the
previous one, disabled with --without-jpeg and forced with --with-jpeg.

Signed-off-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
This commit is contained in:
Emmanuel Gil Peyrot
2016-02-16 01:57:52 +00:00
committed by Bryce Harrington
parent b00c79b587
commit 66e1614122
2 changed files with 37 additions and 16 deletions
+23 -7
View File
@@ -30,13 +30,16 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <jpeglib.h>
#include <png.h>
#include <pixman.h>
#include "shared/helpers.h"
#include "image-loader.h"
#ifdef HAVE_JPEG
#include <jpeglib.h>
#endif
#ifdef HAVE_WEBP
#include <webp/decode.h>
#endif
@@ -47,6 +50,14 @@ stride_for_width(int width)
return width * 4;
}
static void
pixman_image_destroy_func(pixman_image_t *image, void *data)
{
free(data);
}
#ifdef HAVE_JPEG
static void
swizzle_row(JSAMPLE *row, JDIMENSION width)
{
@@ -68,12 +79,6 @@ error_exit(j_common_ptr cinfo)
longjmp(cinfo->client_data, 1);
}
static void
pixman_image_destroy_func(pixman_image_t *image, void *data)
{
free(data);
}
static pixman_image_t *
load_jpeg(FILE *fp)
{
@@ -132,6 +137,17 @@ load_jpeg(FILE *fp)
return pixman_image;
}
#else
static pixman_image_t *
load_jpeg(FILE *fp)
{
fprintf(stderr, "JPEG support disabled at compile-time\n");
return NULL;
}
#endif
static inline int
multiply_alpha(int alpha, int color)
{