diff --git a/configure b/configure index 7c3e815..acc255e 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for motion Git-7dbb5f3d9dcb34f9e7575c744d2e54ed266d128d. +# Generated by GNU Autoconf 2.67 for motion Git-dc2380b04d9f33e2f03ae49dcffa1ef40dddbf23. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -549,8 +549,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='motion' PACKAGE_TARNAME='motion' -PACKAGE_VERSION='Git-7dbb5f3d9dcb34f9e7575c744d2e54ed266d128d' -PACKAGE_STRING='motion Git-7dbb5f3d9dcb34f9e7575c744d2e54ed266d128d' +PACKAGE_VERSION='Git-dc2380b04d9f33e2f03ae49dcffa1ef40dddbf23' +PACKAGE_STRING='motion Git-dc2380b04d9f33e2f03ae49dcffa1ef40dddbf23' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1216,7 +1216,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures motion Git-7dbb5f3d9dcb34f9e7575c744d2e54ed266d128d to adapt to many kinds of systems. +\`configure' configures motion Git-dc2380b04d9f33e2f03ae49dcffa1ef40dddbf23 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1277,7 +1277,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of motion Git-7dbb5f3d9dcb34f9e7575c744d2e54ed266d128d:";; + short | recursive ) echo "Configuration of motion Git-dc2380b04d9f33e2f03ae49dcffa1ef40dddbf23:";; esac cat <<\_ACEOF @@ -1419,7 +1419,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -motion configure Git-7dbb5f3d9dcb34f9e7575c744d2e54ed266d128d +motion configure Git-dc2380b04d9f33e2f03ae49dcffa1ef40dddbf23 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2016,7 +2016,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by motion $as_me Git-7dbb5f3d9dcb34f9e7575c744d2e54ed266d128d, which was +It was created by motion $as_me Git-dc2380b04d9f33e2f03ae49dcffa1ef40dddbf23, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -6437,7 +6437,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by motion $as_me Git-7dbb5f3d9dcb34f9e7575c744d2e54ed266d128d, which was +This file was extended by motion $as_me Git-dc2380b04d9f33e2f03ae49dcffa1ef40dddbf23, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6499,7 +6499,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -motion config.status Git-7dbb5f3d9dcb34f9e7575c744d2e54ed266d128d +motion config.status Git-dc2380b04d9f33e2f03ae49dcffa1ef40dddbf23 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff --git a/jpegutils.c b/jpegutils.c index e8c4550..9c9bc44 100644 --- a/jpegutils.c +++ b/jpegutils.c @@ -491,8 +491,9 @@ int decode_jpeg_raw (unsigned char *jpeg_data, int len, */ jpeg_read_header (&dinfo, TRUE); dinfo.raw_data_out = TRUE; - // TODO: Set to FALSE for some buggy implementation of JPEG ? +#if JPEG_LIB_VERSION >= 70 dinfo.do_fancy_upsampling = FALSE; +#endif dinfo.out_color_space = JCS_YCbCr; dinfo.dct_method = JDCT_IFAST; guarantee_huff_tables(&dinfo); @@ -583,8 +584,9 @@ int decode_jpeg_raw (unsigned char *jpeg_data, int len, if (field > 0) { jpeg_read_header (&dinfo, TRUE); dinfo.raw_data_out = TRUE; - // TODO: Set to FALSE for some buggy implementation of JPEG ? +#if JPEG_LIB_VERSION >= 70 dinfo.do_fancy_upsampling = FALSE; +#endif dinfo.out_color_space = JCS_YCbCr; dinfo.dct_method = JDCT_IFAST; jpeg_start_decompress (&dinfo); @@ -801,8 +803,9 @@ int decode_jpeg_gray_raw(unsigned char *jpeg_data, int len, */ jpeg_read_header (&dinfo, TRUE); dinfo.raw_data_out = TRUE; - // TODO: Set to FALSE for some buggy implementation of JPEG ? +#if JPEG_LIB_VERSION >= 70 dinfo.do_fancy_upsampling = FALSE; +#endif dinfo.out_color_space = JCS_GRAYSCALE; dinfo.dct_method = JDCT_IFAST; @@ -869,8 +872,9 @@ int decode_jpeg_gray_raw(unsigned char *jpeg_data, int len, if (field > 0) { jpeg_read_header (&dinfo, TRUE); dinfo.raw_data_out = TRUE; - // TODO: Set to FALSE for some buggy implementation of JPEG ? +#if JPEG_LIB_VERSION >= 70 dinfo.do_fancy_upsampling = FALSE; +#endif dinfo.out_color_space = JCS_GRAYSCALE; dinfo.dct_method = JDCT_IFAST; jpeg_start_decompress (&dinfo); diff --git a/picture.c b/picture.c index 61c10ed..196f220 100644 --- a/picture.c +++ b/picture.c @@ -436,13 +436,12 @@ static int put_jpeg_yuv420p_memory(unsigned char *dest_image, int image_size, cinfo.image_width = width; cinfo.image_height = height; cinfo.input_components = 3; - jpeg_set_defaults (&cinfo); + jpeg_set_defaults(&cinfo); jpeg_set_colorspace(&cinfo, JCS_YCbCr); cinfo.raw_data_in = TRUE; // Supply downsampled data #if JPEG_LIB_VERSION >= 70 -#warning using JPEG_LIB_VERSION >= 70 cinfo.do_fancy_downsampling = FALSE; // Fix segfault with v7 #endif cinfo.comp_info[0].h_samp_factor = 2; @@ -457,7 +456,7 @@ static int put_jpeg_yuv420p_memory(unsigned char *dest_image, int image_size, _jpeg_mem_dest(&cinfo, dest_image, image_size); // Data written to mem - jpeg_start_compress (&cinfo, TRUE); + jpeg_start_compress(&cinfo, TRUE); put_jpeg_exif(&cinfo, cnt, tm, box); @@ -577,7 +576,6 @@ static void put_jpeg_yuv420p_file(FILE *fp, cinfo.raw_data_in = TRUE; // Supply downsampled data #if JPEG_LIB_VERSION >= 70 -#warning using JPEG_LIB_VERSION >= 70 cinfo.do_fancy_downsampling = FALSE; // Fix segfault with v7 #endif cinfo.comp_info[0].h_samp_factor = 2;