mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2026-06-11 23:34:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

BugReport2010x01x22x084753: Fixed name space clash with libjpeg8

Browse Source
This commit is contained in:
KennethLavrsen
2010-01-22 08:57:35 +00:00
parent c7618cfe17
commit bb48e07e24
5 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG
View File

@@ -1,3 +1,10 @@
3.2.12 Summary of Changes
Bugfixes
* Fixed name space clash with libjpeg8 (Kenneth Lavrsen)
http://www.lavrsen.dk/foswiki/bin/view/Motion/BugReport2010x01x22x084753
3.2.11.1 Sumary of Changes
Bugfixes

2
CREDITS
View File

@@ -1030,6 +1030,8 @@ Kenneth Lavrsen (Currently project managing Motion)
* Smartmask overlay feature did not set intensity correctly.
* Fixed the thread number assignment which could goof up if netcams started very
quickly before all thread were created at startup.
* Fixed name space clash with libjpeg8
http://www.lavrsen.dk/foswiki/bin/view/Motion/BugReport2010x01x22x084753
Mike Lees
* Added the onffmpegclose feature.

18
configure vendored
View File

@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for motion "3.2.11.1".
# Generated by GNU Autoconf 2.61 for motion "3.2.12".
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -572,8 +572,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='motion'
PACKAGE_TARNAME='motion'
PACKAGE_VERSION='"3.2.11.1"'
PACKAGE_STRING='motion "3.2.11.1"'
PACKAGE_VERSION='"3.2.12"'
PACKAGE_STRING='motion "3.2.12"'
PACKAGE_BUGREPORT=''
ac_unique_file="motion.c"
@@ -1178,7 +1178,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 "3.2.11.1" to adapt to many kinds of systems.
\`configure' configures motion "3.2.12" to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1239,7 +1239,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of motion "3.2.11.1":";;
short | recursive ) echo "Configuration of motion "3.2.12":";;
esac
cat <<\_ACEOF
@@ -1375,7 +1375,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
motion configure "3.2.11.1"
motion configure "3.2.12"
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1389,7 +1389,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 "3.2.11.1", which was
It was created by motion $as_me "3.2.12", which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -8132,7 +8132,7 @@ exec 6>&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 "3.2.11.1", which was
This file was extended by motion $as_me "3.2.12", which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8181,7 +8181,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
motion config.status "3.2.11.1"
motion config.status "3.2.12"
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

2
configure.in
View File

@@ -1,6 +1,6 @@
# Process this file with autoconf to produce a configure script
AC_INIT(motion, "3.2.11.1")
AC_INIT(motion, "3.2.12")
AC_CONFIG_SRCDIR([motion.c])
AC_CONFIG_HEADERS(config.h)

12
picture.c
View File

@@ -52,7 +52,7 @@ METHODDEF(void) term_destination(j_compress_ptr cinfo)
dest->jpegsize = dest->bufsize - dest->pub.free_in_buffer;
}
static GLOBAL(void) jpeg_mem_dest(j_compress_ptr cinfo, JOCTET* buf, size_t bufsize)
static GLOBAL(void) _jpeg_mem_dest(j_compress_ptr cinfo, JOCTET* buf, size_t bufsize)
{
mem_dest_ptr dest;
@@ -73,7 +73,7 @@ static GLOBAL(void) jpeg_mem_dest(j_compress_ptr cinfo, JOCTET* buf, size_t bufs
dest->jpegsize = 0;
}
static GLOBAL(int) jpeg_mem_size(j_compress_ptr cinfo)
static GLOBAL(int) _jpeg_mem_size(j_compress_ptr cinfo)
{
mem_dest_ptr dest = (mem_dest_ptr) cinfo->dest;
return dest->jpegsize;
@@ -131,7 +131,7 @@ static int put_jpeg_yuv420p_memory(unsigned char *dest_image, int image_size,
jpeg_set_quality(&cinfo, quality, TRUE);
cinfo.dct_method = JDCT_FASTEST;
jpeg_mem_dest(&cinfo, dest_image, image_size); // data written to mem
_jpeg_mem_dest(&cinfo, dest_image, image_size); // data written to mem
jpeg_start_compress (&cinfo, TRUE);
@@ -147,7 +147,7 @@ static int put_jpeg_yuv420p_memory(unsigned char *dest_image, int image_size,
}
jpeg_finish_compress(&cinfo);
jpeg_image_size = jpeg_mem_size(&cinfo);
jpeg_image_size = _jpeg_mem_size(&cinfo);
jpeg_destroy_compress(&cinfo);
return jpeg_image_size;
@@ -182,7 +182,7 @@ static int put_jpeg_grey_memory(unsigned char *dest_image, int image_size,
jpeg_set_quality(&cjpeg, quality, TRUE);
cjpeg.dct_method = JDCT_FASTEST;
jpeg_mem_dest(&cjpeg, dest_image, image_size); // data written to mem
_jpeg_mem_dest(&cjpeg, dest_image, image_size); // data written to mem
jpeg_start_compress (&cjpeg, TRUE);
@@ -194,7 +194,7 @@ static int put_jpeg_grey_memory(unsigned char *dest_image, int image_size,
}
jpeg_finish_compress(&cjpeg);
dest_image_size = jpeg_mem_size(&cjpeg);
dest_image_size = _jpeg_mem_size(&cjpeg);
jpeg_destroy_compress(&cjpeg);
return dest_image_size;