Commit 66849d58 authored by cristy's avatar cristy

--no commit message

--no commit message
parent 8dea145e
......@@ -350,7 +350,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_func_fseeko.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/m4/magick_check_pthread_lib.m4 \
$(top_srcdir)/m4/magick_func_mmap_fileio.m4 \
$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
......@@ -2992,7 +2991,6 @@ M4_EXTRA_DIST = \
ltsugar.m4 \
ltversion.m4 \
magick_check_pthread_lib.m4 \
magick_func_mmap_fileio.m4 \
pkg.m4
......
......@@ -1267,5 +1267,4 @@ m4_include([m4/ltsugar.m4])
m4_include([m4/ltversion.m4])
m4_include([m4/lt~obsolete.m4])
m4_include([m4/magick_check_pthread_lib.m4])
m4_include([m4/magick_func_mmap_fileio.m4])
m4_include([m4/pkg.m4])
......@@ -309,9 +309,6 @@
/* Define to 1 if you have a working `mmap' system call. */
#undef HAVE_MMAP
/* Define to 1 if you have a working `mmap' system call. */
#undef HAVE_MMAP_FILEIO
/* Define to 1 if you have the `munmap' function. */
#undef HAVE_MUNMAP
......
......@@ -3682,7 +3682,7 @@ MAGICK_PATCHLEVEL_VERSION=8
MAGICK_VERSION=6.8.6-8
MAGICK_SVN_REVISION=12752M
MAGICK_SVN_REVISION=12752:12769M
# Substitute library versioning
......@@ -24047,168 +24047,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Check for functions
#
########
for ac_header in stdlib.h unistd.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
done
for ac_func in getpagesize
do :
ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
if test "x$ac_cv_func_getpagesize" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_GETPAGESIZE 1
_ACEOF
fi
done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap file i/o" >&5
$as_echo_n "checking for working mmap file i/o... " >&6; }
if ${magick_cv_func_mmap_fileio+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
magick_cv_func_mmap_fileio=no
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$ac_includes_default
/* malloc might have been renamed as rpl_malloc. */
#undef malloc
/*
This test is derived from GNU Autoconf's similar macro.
The purpose of this test is to verify that files may be memory
mapped, and that memory mapping and file I/O are coherent.
The test creates a test file, memory maps the file, updates
the file using the memory map, and then reads the file using
file I/O to verify that the file contains the updates.
*/
#include <fcntl.h>
#include <sys/mman.h>
#if !STDC_HEADERS && !HAVE_STDLIB_H
char *malloc ();
#endif
/* This mess was copied from the GNU getpagesize.h. */
#if !HAVE_GETPAGESIZE
/* Assume that all systems that can run configure have sys/param.h. */
# if !HAVE_SYS_PARAM_H
# define HAVE_SYS_PARAM_H 1
# endif
# ifdef _SC_PAGESIZE
# define getpagesize() sysconf(_SC_PAGESIZE)
# else /* no _SC_PAGESIZE */
# if HAVE_SYS_PARAM_H
# include <sys/param.h>
# ifdef EXEC_PAGESIZE
# define getpagesize() EXEC_PAGESIZE
# else /* no EXEC_PAGESIZE */
# ifdef NBPG
# define getpagesize() NBPG * CLSIZE
# ifndef CLSIZE
# define CLSIZE 1
# endif /* no CLSIZE */
# else /* no NBPG */
# ifdef NBPC
# define getpagesize() NBPC
# else /* no NBPC */
# ifdef PAGESIZE
# define getpagesize() PAGESIZE
# endif /* PAGESIZE */
# endif /* no NBPC */
# endif /* no NBPG */
# endif /* no EXEC_PAGESIZE */
# else /* no HAVE_SYS_PARAM_H */
# define getpagesize() 8192 /* punt totally */
# endif /* no HAVE_SYS_PARAM_H */
# endif /* no _SC_PAGESIZE */
#endif /* no HAVE_GETPAGESIZE */
int
main ()
{
char *data, *data2, *data3;
int i, pagesize;
int fd;
pagesize = getpagesize ();
/* First, make a file with some known garbage in it. */
data = (char *) malloc (pagesize);
if (!data)
exit (1);
for (i = 0; i < pagesize; ++i)
*(data + i) = rand ();
umask (0);
fd = creat ("conftest.mmap", 0600);
if (fd < 0)
exit (1);
if (write (fd, data, pagesize) != pagesize)
exit (1);
close (fd);
/* Mmap the file as read/write/shared and verify that we see the
same garbage. */
fd = open ("conftest.mmap", O_RDWR);
if (fd < 0)
exit (1);
data2 = mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0L);
if (data2 == 0)
exit (1);
for (i = 0; i < pagesize; ++i)
if (*(data + i) != *(data2 + i))
exit (1);
/* Finally, make sure that changes to the mapped area
percolate back to the file as seen by read(). */
for (i = 0; i < pagesize; ++i)
*(data2 + i) = *(data2 + i) + 1;
data3 = (char *) malloc (pagesize);
if (!data3)
exit (1);
if (read (fd, data3, pagesize) != pagesize)
exit (1);
for (i = 0; i < pagesize; ++i)
if (*(data2 + i) != *(data3 + i))
exit (1);
close (fd);
exit (0);
}
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
magick_cv_func_mmap_fileio=yes
else
magick_cv_func_mmap_fileio=no
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $magick_cv_func_mmap_fileio" >&5
$as_echo "$magick_cv_func_mmap_fileio" >&6; }
if test $magick_cv_func_mmap_fileio = yes; then
$as_echo "#define HAVE_MMAP_FILEIO 1" >>confdefs.h
fi
rm -f conftest.mmap
MAGICK_FUNC_MMAP_FILEIO
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether closedir returns void" >&5
$as_echo_n "checking whether closedir returns void... " >&6; }
if ${ac_cv_func_closedir_void+:} false; then :
......@@ -36,5 +36,4 @@ M4_EXTRA_DIST = \
ltsugar.m4 \
ltversion.m4 \
magick_check_pthread_lib.m4 \
magick_func_mmap_fileio.m4 \
pkg.m4
# http://svn.saurik.com/repos/cycript/trunk/framework.m4
#
# GNU LESSER GENERAL PUBLIC LICENSE
# Version 3, 29 June 2007
#
# Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
# Everyone is permitted to copy and distribute verbatim copies
# of this license document, but changing it is not allowed.
#
#
# This version of the GNU Lesser General Public License incorporates
# the terms and conditions of version 3 of the GNU General Public
# License, supplemented by the additional permissions listed below.
#
# 0. Additional Definitions.
#
# As used herein, "this License" refers to version 3 of the GNU Lesser
# General Public License, and the "GNU GPL" refers to version 3 of the GNU
# General Public License.
#
# "The Library" refers to a covered work governed by this License,
# other than an Application or a Combined Work as defined below.
#
# An "Application" is any work that makes use of an interface provided
# by the Library, but which is not otherwise based on the Library.
# Defining a subclass of a class defined by the Library is deemed a mode
# of using an interface provided by the Library.
#
# A "Combined Work" is a work produced by combining or linking an
# Application with the Library. The particular version of the Library
# with which the Combined Work was made is also called the "Linked
# Version".
#
# The "Minimal Corresponding Source" for a Combined Work means the
# Corresponding Source for the Combined Work, excluding any source code
# for portions of the Combined Work that, considered in isolation, are
# based on the Application, and not on the Linked Version.
#
# The "Corresponding Application Code" for a Combined Work means the
# object code and/or source code for the Application, including any data
# and utility programs needed for reproducing the Combined Work from the
# Application, but excluding the System Libraries of the Combined Work.
#
# 1. Exception to Section 3 of the GNU GPL.
#
# You may convey a covered work under sections 3 and 4 of this License
# without being bound by section 3 of the GNU GPL.
#
# 2. Conveying Modified Versions.
#
# If you modify a copy of the Library, and, in your modifications, a
# facility refers to a function or data to be supplied by an Application
# that uses the facility (other than as an argument passed when the
# facility is invoked), then you may convey a copy of the modified
# version:
#
# a) under this License, provided that you make a good faith effort to
# ensure that, in the event an Application does not supply the
# function or data, the facility still operates, and performs
# whatever part of its purpose remains meaningful, or
#
# b) under the GNU GPL, with none of the additional permissions of
# this License applicable to that copy.
#
# 3. Object Code Incorporating Material from Library Header Files.
#
# The object code form of an Application may incorporate material from
# a header file that is part of the Library. You may convey such object
# code under terms of your choice, provided that, if the incorporated
# material is not limited to numerical parameters, data structure
# layouts and accessors, or small macros, inline functions and templates
# (ten or fewer lines in length), you do both of the following:
#
# a) Give prominent notice with each copy of the object code that the
# Library is used in it and that the Library and its use are
# covered by this License.
#
# b) Accompany the object code with a copy of the GNU GPL and this license
# document.
#
# 4. Combined Works.
#
# You may convey a Combined Work under terms of your choice that,
# taken together, effectively do not restrict modification of the
# portions of the Library contained in the Combined Work and reverse
# engineering for debugging such modifications, if you also do each of
# the following:
#
# a) Give prominent notice with each copy of the Combined Work that
# the Library is used in it and that the Library and its use are
# covered by this License.
#
# b) Accompany the Combined Work with a copy of the GNU GPL and this license
# document.
#
# c) For a Combined Work that displays copyright notices during
# execution, include the copyright notice for the Library among
# these notices, as well as a reference directing the user to the
# copies of the GNU GPL and this license document.
#
# d) Do one of the following:
#
# 0) Convey the Minimal Corresponding Source under the terms of this
# License, and the Corresponding Application Code in a form
# suitable for, and under terms that permit, the user to
# recombine or relink the Application with a modified version of
# the Linked Version to produce a modified Combined Work, in the
# manner specified by section 6 of the GNU GPL for conveying
# Corresponding Source.
#
# 1) Use a suitable shared library mechanism for linking with the
# Library. A suitable mechanism is one that (a) uses at run time
# a copy of the Library already present on the user's computer
# system, and (b) will operate properly with a modified version
# of the Library that is interface-compatible with the Linked
# Version.
#
# e) Provide Installation Information, but only if you would otherwise
# be required to provide such information under section 6 of the
# GNU GPL, and only to the extent that such information is
# necessary to install and execute a modified version of the
# Combined Work produced by recombining or relinking the
# Application with a modified version of the Linked Version. (If
# you use option 4d0, the Installation Information must accompany
# the Minimal Corresponding Source and Corresponding Application
# Code. If you use option 4d1, you must provide the Installation
# Information in the manner specified by section 6 of the GNU GPL
# for conveying Corresponding Source.)
#
# 5. Combined Libraries.
#
# You may place library facilities that are a work based on the
# Library side by side in a single library together with other library
# facilities that are not Applications and are not covered by this
# License, and convey such a combined library under terms of your
# choice, if you do both of the following:
#
# a) Accompany the combined library with a copy of the same work based
# on the Library, uncombined with any other library facilities,
# conveyed under the terms of this License.
#
# b) Give prominent notice with the combined library that part of it
# is a work based on the Library, and explaining where to find the
# accompanying uncombined form of the same work.
#
# 6. Revised Versions of the GNU Lesser General Public License.
#
# The Free Software Foundation may publish revised and/or new versions
# of the GNU Lesser General Public License from time to time. Such new
# versions will be similar in spirit to the present version, but may
# differ in detail to address new problems or concerns.
#
# Each version is given a distinguishing version number. If the
# Library as you received it specifies that a certain numbered version
# of the GNU Lesser General Public License "or any later version"
# applies to it, you have the option of following the terms and
# conditions either of that published version or of any later version
# published by the Free Software Foundation. If the Library as you
# received it does not specify a version number of the GNU Lesser
# General Public License, you may choose any version of the GNU Lesser
# General Public License ever published by the Free Software Foundation.
#
# If the Library as you received it specifies that a proxy can decide
# whether future versions of the GNU Lesser General Public License shall
# apply, that proxy's public statement of acceptance of any version is
# permanent authorization for you to choose that version for the
# Library.
# AC_CHECK_FRAMEWORK(FRAMEWORK, FUNCTION,
# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
......
# MAGICK_FUNC_MMAP_FILEIO
# ------------
AC_DEFUN([MAGICK_FUNC_MMAP_FILEIO],
[AC_CHECK_HEADERS(stdlib.h unistd.h)
AC_CHECK_FUNCS(getpagesize)
AC_CACHE_CHECK(for working mmap file i/o, magick_cv_func_mmap_fileio,
[AC_RUN_IFELSE([AC_LANG_SOURCE([AC_INCLUDES_DEFAULT]
[[/* malloc might have been renamed as rpl_malloc. */
#undef malloc
/*
This test is derived from GNU Autoconf's similar macro.
The purpose of this test is to verify that files may be memory
mapped, and that memory mapping and file I/O are coherent.
The test creates a test file, memory maps the file, updates
the file using the memory map, and then reads the file using
file I/O to verify that the file contains the updates.
*/
#include <fcntl.h>
#include <sys/mman.h>
#if !STDC_HEADERS && !HAVE_STDLIB_H
char *malloc ();
#endif
/* This mess was copied from the GNU getpagesize.h. */
#if !HAVE_GETPAGESIZE
/* Assume that all systems that can run configure have sys/param.h. */
# if !HAVE_SYS_PARAM_H
# define HAVE_SYS_PARAM_H 1
# endif
# ifdef _SC_PAGESIZE
# define getpagesize() sysconf(_SC_PAGESIZE)
# else /* no _SC_PAGESIZE */
# if HAVE_SYS_PARAM_H
# include <sys/param.h>
# ifdef EXEC_PAGESIZE
# define getpagesize() EXEC_PAGESIZE
# else /* no EXEC_PAGESIZE */
# ifdef NBPG
# define getpagesize() NBPG * CLSIZE
# ifndef CLSIZE
# define CLSIZE 1
# endif /* no CLSIZE */
# else /* no NBPG */
# ifdef NBPC
# define getpagesize() NBPC
# else /* no NBPC */
# ifdef PAGESIZE
# define getpagesize() PAGESIZE
# endif /* PAGESIZE */
# endif /* no NBPC */
# endif /* no NBPG */
# endif /* no EXEC_PAGESIZE */
# else /* no HAVE_SYS_PARAM_H */
# define getpagesize() 8192 /* punt totally */
# endif /* no HAVE_SYS_PARAM_H */
# endif /* no _SC_PAGESIZE */
#endif /* no HAVE_GETPAGESIZE */
int
main ()
{
char *data, *data2, *data3;
int i, pagesize;
int fd;
pagesize = getpagesize ();
/* First, make a file with some known garbage in it. */
data = (char *) malloc (pagesize);
if (!data)
exit (1);
for (i = 0; i < pagesize; ++i)
*(data + i) = rand ();
umask (0);
fd = creat ("conftest.mmap", 0600);
if (fd < 0)
exit (1);
if (write (fd, data, pagesize) != pagesize)
exit (1);
close (fd);
/* Mmap the file as read/write/shared and verify that we see the
same garbage. */
fd = open ("conftest.mmap", O_RDWR);
if (fd < 0)
exit (1);
data2 = mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0L);
if (data2 == 0)
exit (1);
for (i = 0; i < pagesize; ++i)
if (*(data + i) != *(data2 + i))
exit (1);
/* Finally, make sure that changes to the mapped area
percolate back to the file as seen by read(). */
for (i = 0; i < pagesize; ++i)
*(data2 + i) = *(data2 + i) + 1;
data3 = (char *) malloc (pagesize);
if (!data3)
exit (1);
if (read (fd, data3, pagesize) != pagesize)
exit (1);
for (i = 0; i < pagesize; ++i)
if (*(data2 + i) != *(data3 + i))
exit (1);
close (fd);
exit (0);
}]])],
[magick_cv_func_mmap_fileio=yes],
[magick_cv_func_mmap_fileio=no],
[magick_cv_func_mmap_fileio=no])])
if test $magick_cv_func_mmap_fileio = yes; then
AC_DEFINE(HAVE_MMAP_FILEIO, 1,
[Define to 1 if you have a working `mmap' system call.])
fi
rm -f conftest.mmap
])# MAGICK_FUNC_MMAP_FILEIO
......@@ -466,11 +466,6 @@
#define MAGICKCORE_HAVE_MMAP 1
#endif
/* Define to 1 if you have a working `mmap' system call. */
#ifndef MAGICKCORE_HAVE_MMAP_FILEIO
#define MAGICKCORE_HAVE_MMAP_FILEIO 1
#endif
/* Define to 1 if you have the `munmap' function. */
#ifndef MAGICKCORE_HAVE_MUNMAP
#define MAGICKCORE_HAVE_MUNMAP 1
......
......@@ -27,7 +27,7 @@ extern "C" {
*/
#define MagickPackageName "ImageMagick"
#define MagickCopyright "Copyright (C) 1999-2013 ImageMagick Studio LLC"
#define MagickSVNRevision "12752M"
#define MagickSVNRevision "12752:12769M"
#define MagickLibVersion 0x686
#define MagickLibVersionText "6.8.6"
#define MagickLibVersionNumber 1,0,0
......@@ -39,7 +39,7 @@ extern "C" {
#define MagickppLibAddendum "-8"
#define MagickppLibInterface 2
#define MagickppLibMinInterface 2
#define MagickReleaseDate "2013-07-24"
#define MagickReleaseDate "2013-07-28"
#define MagickChangeDate "20130725"
#define MagickFeatures "DPC OpenMP"
#define MagickDelegates "bzlib djvu fftw fontconfig freetype jng jp2 jpeg lcms lzma openexr pango png ps tiff x xml zlib"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment