Mercurial > hg > forks > geeqie
changeset 1913:3f5bd5479b48
fixed libjpeg in autoconf
| author | Vladimir Nadvornik <nadvornik@suse.cz> |
|---|---|
| date | Sat, 09 Apr 2011 19:27:43 +0200 |
| parents | 4417578c55f9 |
| children | ccd3da29fc67 |
| files | configure.in po/POTFILES.in src/image-load.c src/image_load_jpeg.c src/image_load_jpeg.h |
| diffstat | 5 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.in Sat Apr 09 16:07:31 2011 +0200 +++ b/configure.in Sat Apr 09 19:27:43 2011 +0200 @@ -301,7 +301,8 @@ if test "x${libjpeg}" != "xno"; then AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, HAVE_JPEG=yes - JPEG_LIBS=-ljpeg, + JPEG_LIBS=-ljpeg + AC_DEFINE(HAVE_JPEG, 1, [define to enable use of custom jpeg loader]), HAVE_JPEG=no) else HAVE_JPEG=disabled
--- a/po/POTFILES.in Sat Apr 09 16:07:31 2011 +0200 +++ b/po/POTFILES.in Sat Apr 09 19:27:43 2011 +0200 @@ -46,6 +46,7 @@ src/image.c src/image-load.c src/image-overlay.c +src/image_load_jpeg.c src/img-view.c src/layout.c src/layout_config.c
--- a/src/image-load.c Sat Apr 09 16:07:31 2011 +0200 +++ b/src/image-load.c Sat Apr 09 19:27:43 2011 +0200 @@ -513,12 +513,14 @@ static void image_loader_setup_loader(ImageLoader *il) { g_mutex_lock(il->data_mutex); +#ifdef HAVE_JPEG if (il->bytes_total >= 2 && il->mapped_file[0] == 0xff && il->mapped_file[1] == 0xd8) { DEBUG_1("Using custom jpeg loader"); image_loader_backend_set_jpeg(&il->backend); } else +#endif image_loader_backend_set_default(&il->backend); il->loader = il->backend.loader_new(image_loader_area_updated_cb, image_loader_size_cb, image_loader_area_prepared_cb, il);
--- a/src/image_load_jpeg.c Sat Apr 09 16:07:31 2011 +0200 +++ b/src/image_load_jpeg.c Sat Apr 09 19:27:43 2011 +0200 @@ -39,10 +39,13 @@ #include "main.h" + #include "image-load.h" #include "image_load_jpeg.h" #include "jpeg_parser.h" +#ifdef HAVE_JPEG + #include <setjmp.h> #include <jpeglib.h> #include <jerror.h> @@ -489,3 +492,4 @@ +#endif \ No newline at end of file