Skip to content

Commit dc2380b

Browse files
committed
Adding dinfo.do_fancy_upsampling = FALSE;
1 parent 7dbb5f3 commit dc2380b

File tree

4 files changed

+31
-9
lines changed

4 files changed

+31
-9
lines changed

CHANGELOG

+2
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ Bugfixes
6363
http://www.lavrsen.dk/foswiki/bin/view/Motion/BugReport2011x01x21x162309
6464
* Added a conditional check for avformat_alloc_context , av_avformat_alloc_context to fix
6565
http://www.lavrsen.dk/foswiki/bin/view/Motion/BugReport2011x10x05x071936 (Angel Carpintero)
66+
* Fix issue with JPEG , adding dinfo.do_fancy_upsampling = FALSE;
67+
http://www.lavrsen.dk/foswiki/bin/view/Motion/BugReport2011x08x20x194659
6668

6769
3.2.12 Summary of Changes
6870

Makefile.in

+12
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,11 @@ dep depend fastdep: $(DEPEND_FILE)
133133
################################################################################
134134
dev: distclean autotools all
135135

136+
################################################################################
137+
# DEV-GIT, BUILD with developer flags #
138+
################################################################################
139+
dev-git: distclean autotools-git all
140+
136141

137142
################################################################################
138143
# GIT, BUILD with developer flags #
@@ -152,6 +157,12 @@ autotools:
152157
autoconf
153158
./configure --with-developer-flags
154159

160+
autotools-git:
161+
@sed -i 's/.\/git-commit-version.sh/.\/version.sh/g' configure.in
162+
autoconf
163+
./configure --with-developer-flags
164+
165+
155166
build-commit: distclean svn set-version all
156167

157168
set-version:
@@ -172,6 +183,7 @@ help:
172183
@echo "make Build motion from local copy in your computer"
173184
@echo "make current Build last version of motion from svn"
174185
@echo "make dev Build motion with dev flags"
186+
@echo "make dev-git Build motion with dev flags for git"
175187
@echo "make build-commit Build last version of motion and prepare to commit to svn"
176188
@echo "make build-commit-git Build last version of motion and prepare to commit to git"
177189
@echo "make clean Clean objects"

configure

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.67 for motion Git-5dd9ed44ecbd430a5f059e916c0f9ce9ceed0beb.
3+
# Generated by GNU Autoconf 2.67 for motion Git-7dbb5f3d9dcb34f9e7575c744d2e54ed266d128d.
44
#
55
#
66
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -549,8 +549,8 @@ MAKEFLAGS=
549549
# Identity of this package.
550550
PACKAGE_NAME='motion'
551551
PACKAGE_TARNAME='motion'
552-
PACKAGE_VERSION='Git-5dd9ed44ecbd430a5f059e916c0f9ce9ceed0beb'
553-
PACKAGE_STRING='motion Git-5dd9ed44ecbd430a5f059e916c0f9ce9ceed0beb'
552+
PACKAGE_VERSION='Git-7dbb5f3d9dcb34f9e7575c744d2e54ed266d128d'
553+
PACKAGE_STRING='motion Git-7dbb5f3d9dcb34f9e7575c744d2e54ed266d128d'
554554
PACKAGE_BUGREPORT=''
555555
PACKAGE_URL=''
556556

@@ -1216,7 +1216,7 @@ if test "$ac_init_help" = "long"; then
12161216
# Omit some internal or obsolete options to make the list less imposing.
12171217
# This message is too long to be a string in the A/UX 3.1 sh.
12181218
cat <<_ACEOF
1219-
\`configure' configures motion Git-5dd9ed44ecbd430a5f059e916c0f9ce9ceed0beb to adapt to many kinds of systems.
1219+
\`configure' configures motion Git-7dbb5f3d9dcb34f9e7575c744d2e54ed266d128d to adapt to many kinds of systems.
12201220
12211221
Usage: $0 [OPTION]... [VAR=VALUE]...
12221222
@@ -1277,7 +1277,7 @@ fi
12771277

12781278
if test -n "$ac_init_help"; then
12791279
case $ac_init_help in
1280-
short | recursive ) echo "Configuration of motion Git-5dd9ed44ecbd430a5f059e916c0f9ce9ceed0beb:";;
1280+
short | recursive ) echo "Configuration of motion Git-7dbb5f3d9dcb34f9e7575c744d2e54ed266d128d:";;
12811281
esac
12821282
cat <<\_ACEOF
12831283
@@ -1419,7 +1419,7 @@ fi
14191419
test -n "$ac_init_help" && exit $ac_status
14201420
if $ac_init_version; then
14211421
cat <<\_ACEOF
1422-
motion configure Git-5dd9ed44ecbd430a5f059e916c0f9ce9ceed0beb
1422+
motion configure Git-7dbb5f3d9dcb34f9e7575c744d2e54ed266d128d
14231423
generated by GNU Autoconf 2.67
14241424
14251425
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2016,7 +2016,7 @@ cat >config.log <<_ACEOF
20162016
This file contains any messages produced by compilers while
20172017
running configure, to aid debugging if configure makes a mistake.
20182018
2019-
It was created by motion $as_me Git-5dd9ed44ecbd430a5f059e916c0f9ce9ceed0beb, which was
2019+
It was created by motion $as_me Git-7dbb5f3d9dcb34f9e7575c744d2e54ed266d128d, which was
20202020
generated by GNU Autoconf 2.67. Invocation command line was
20212021
20222022
$ $0 $@
@@ -6437,7 +6437,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
64376437
# report actual input values of CONFIG_FILES etc. instead of their
64386438
# values after options handling.
64396439
ac_log="
6440-
This file was extended by motion $as_me Git-5dd9ed44ecbd430a5f059e916c0f9ce9ceed0beb, which was
6440+
This file was extended by motion $as_me Git-7dbb5f3d9dcb34f9e7575c744d2e54ed266d128d, which was
64416441
generated by GNU Autoconf 2.67. Invocation command line was
64426442
64436443
CONFIG_FILES = $CONFIG_FILES
@@ -6499,7 +6499,7 @@ _ACEOF
64996499
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
65006500
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
65016501
ac_cs_version="\\
6502-
motion config.status Git-5dd9ed44ecbd430a5f059e916c0f9ce9ceed0beb
6502+
motion config.status Git-7dbb5f3d9dcb34f9e7575c744d2e54ed266d128d
65036503
configured by $0, generated by GNU Autoconf 2.67,
65046504
with options \\"\$ac_cs_config\\"
65056505

jpegutils.c

+8
Original file line numberDiff line numberDiff line change
@@ -491,6 +491,8 @@ int decode_jpeg_raw (unsigned char *jpeg_data, int len,
491491
*/
492492
jpeg_read_header (&dinfo, TRUE);
493493
dinfo.raw_data_out = TRUE;
494+
// TODO: Set to FALSE for some buggy implementation of JPEG ?
495+
dinfo.do_fancy_upsampling = FALSE;
494496
dinfo.out_color_space = JCS_YCbCr;
495497
dinfo.dct_method = JDCT_IFAST;
496498
guarantee_huff_tables(&dinfo);
@@ -581,6 +583,8 @@ int decode_jpeg_raw (unsigned char *jpeg_data, int len,
581583
if (field > 0) {
582584
jpeg_read_header (&dinfo, TRUE);
583585
dinfo.raw_data_out = TRUE;
586+
// TODO: Set to FALSE for some buggy implementation of JPEG ?
587+
dinfo.do_fancy_upsampling = FALSE;
584588
dinfo.out_color_space = JCS_YCbCr;
585589
dinfo.dct_method = JDCT_IFAST;
586590
jpeg_start_decompress (&dinfo);
@@ -797,6 +801,8 @@ int decode_jpeg_gray_raw(unsigned char *jpeg_data, int len,
797801
*/
798802
jpeg_read_header (&dinfo, TRUE);
799803
dinfo.raw_data_out = TRUE;
804+
// TODO: Set to FALSE for some buggy implementation of JPEG ?
805+
dinfo.do_fancy_upsampling = FALSE;
800806
dinfo.out_color_space = JCS_GRAYSCALE;
801807
dinfo.dct_method = JDCT_IFAST;
802808

@@ -863,6 +869,8 @@ int decode_jpeg_gray_raw(unsigned char *jpeg_data, int len,
863869
if (field > 0) {
864870
jpeg_read_header (&dinfo, TRUE);
865871
dinfo.raw_data_out = TRUE;
872+
// TODO: Set to FALSE for some buggy implementation of JPEG ?
873+
dinfo.do_fancy_upsampling = FALSE;
866874
dinfo.out_color_space = JCS_GRAYSCALE;
867875
dinfo.dct_method = JDCT_IFAST;
868876
jpeg_start_decompress (&dinfo);

0 commit comments

Comments
 (0)