Commit fd9dcd4a authored by cristy's avatar cristy

--no commit message

--no commit message
parent cf584455
......@@ -3,6 +3,8 @@
http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=16795).
* Only list orientation options for the -list orientation option (reference
http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=16801).
* Return proper standard deviation for combined channels (reference
http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=16786).
2010-08-05 6.6.3-3 Glenn Randers-Pehrson <glennrp@image...>
* Properly map PNG intent to image->rendering_intent
......
......@@ -2357,6 +2357,7 @@ MAGICK_CONFIGURE_SRC_PATH = @MAGICK_CONFIGURE_SRC_PATH@
MAGICK_CPPFLAGS = @MAGICK_CPPFLAGS@
MAGICK_CXXFLAGS = @MAGICK_CXXFLAGS@
MAGICK_DEP_LIBS = @MAGICK_DEP_LIBS@
MAGICK_FEATURES = @MAGICK_FEATURES@
MAGICK_FILTER_MODULE_PATH = @MAGICK_FILTER_MODULE_PATH@
MAGICK_HDRI = @MAGICK_HDRI@
MAGICK_LDFLAGS = @MAGICK_LDFLAGS@
......@@ -2530,7 +2531,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
ltdl_LIBOBJS = @ltdl_LIBOBJS@
ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
......@@ -2730,7 +2730,7 @@ CONFIG_EXTRA_DIST = \
config/type-windows.xml.in \
config/type.xml.in
LTDL_VERSION_INFO = -version-info 9:2:2
LTDL_VERSION_INFO = -version-info 9:1:2
@INSTALL_LTDL_TRUE@ltdlincludedir = $(includedir)/libltdl
@INSTALL_LTDL_TRUE@ltdlinclude_HEADERS = ltdl/libltdl/lt_system.h \
@INSTALL_LTDL_TRUE@ ltdl/libltdl/lt_error.h \
......
......@@ -9,7 +9,7 @@
<configure name="NAME" value="ImageMagick"/>
<configure name="LIB_VERSION" value="0x663"/>
<configure name="LIB_VERSION_NUMBER" value="6,6,3,4"/>
<configure name="RELEASE_DATE" value="2010-08-06"/>
<configure name="RELEASE_DATE" value="2010-08-08"/>
<configure name="CONFIGURE" value="./configure "/>
<configure name="PREFIX" value="/usr/local"/>
<configure name="EXEC-PREFIX" value="/usr/local"/>
......@@ -25,6 +25,7 @@
<configure name="CXXFLAGS" value="-g -O2 -pthread"/>
<configure name="DISTCHECK_CONFIG_FLAGS" value="--disable-deprecated --with-quantum-depth=16 --with-umem=no --with-autotrace=no --with-gslib=no --with-fontpath= --with-perl=no"/>
<configure name="HOST" value="x86_64-unknown-linux-gnu"/>
<configure name="FEATURES" value="OpenMP "/>
<configure name="DELEGATES" value="bzlib fontconfig freetype jpeg jng png tiff x11 xml wmf zlib"/>
<configure name="COPYRIGHT" value="Copyright (C) 1999-2010 ImageMagick Studio LLC"/>
<configure name="WEBSITE" value="http://www.imagemagick.org"/>
......
......@@ -25,6 +25,7 @@
<configure name="CXXFLAGS" value="@CXXFLAGS@"/>
<configure name="DISTCHECK_CONFIG_FLAGS" value="@DISTCHECK_CONFIG_FLAGS@"/>
<configure name="HOST" value="@host@"/>
<configure name="FEATURES" value="@MAGICK_FEATURES@"/>
<configure name="DELEGATES" value="@DELEGATES@"/>
<configure name="COPYRIGHT" value="Copyright (C) 1999-2010 ImageMagick Studio LLC"/>
<configure name="WEBSITE" value="http://www.imagemagick.org"/>
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
......@@ -156,6 +156,7 @@ MAGICK_CPPFLAGS=$CPPFLAGS_USER
MAGICK_PCFLAGS=$CPPFLAGS_USER
MAGICK_LDFLAGS=''
MAGICK_LIBS=''
MAGICK_FEATURES=''
#
# Evaluate shell variable equivalents to Makefile directory variables
......@@ -397,12 +398,21 @@ AC_OPENMP([C])
CFLAGS="$OPENMP_CFLAGS $CFLAGS"
MAGICK_PCFLAGS="$MAGICK_PCFLAGS $OPENMP_CFLAGS"
AC_SUBST(OPENMP_CFLAGS)
case $ac_cv_prog_c_openmp in #(
"none needed" | unsupported)
;; #(
*)
MAGICK_FEATURES="OpenMP $MAGICK_FEATURES"
esac
# Enable support for OpenCL
AX_OPENCL([C])
CFLAGS="$CL_CFLAGS $CFLAGS"
LIBS="$CL_LIBS $LIBS"
AC_SUBST(CL_CFLAGS)
if test "_OPENCL" = '1'; then
MAGICK_FEATURES="OpenCL $MAGICK_FEATURES"
fi
########
#
......@@ -566,6 +576,7 @@ MAGICK_HDRI=""
if test "$enable_hdri" = 'yes'; then
MAGICK_HDRI="HDRI"
AC_DEFINE(HDRI_SUPPORT,1,[accurately represent the wide range of intensity levels in real scenes])
MAGICK_FEATURES="HDRI $MAGICK_FEATURES"
fi
AC_SUBST(MAGICK_HDRI)dnl
......@@ -3424,6 +3435,7 @@ AC_SUBST(MAGICK_CPPFLAGS)
AC_SUBST(MAGICK_PCFLAGS)
AC_SUBST(MAGICK_LDFLAGS)
AC_SUBST(MAGICK_LIBS)
AC_SUBST(MAGICK_FEATURES)
# Set configured scripts to executable.
AC_CONFIG_COMMANDS([default],[],[])
......@@ -3526,4 +3538,5 @@ Options used to compile and link:
LIBS = $MAGICK_LIBS
CXX = $CXX
CXXFLAGS = $CXXFLAGS
FEATURES = $MAGICK_FEATURES
])
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -36,7 +36,7 @@ AM_CPPFLAGS += -DLT_CONFIG_H='<$(LT_CONFIG_H)>' \
-DLTDL -I. -I$(srcdir) -Iltdl \
-I$(srcdir)/ltdl -I$(srcdir)/ltdl/libltdl
AM_LDFLAGS += -no-undefined
LTDL_VERSION_INFO = -version-info 9:2:2
LTDL_VERSION_INFO = -version-info 9:1:2
noinst_LTLIBRARIES += $(LT_DLLOADERS)
......
This diff is collapsed.
......@@ -7,7 +7,7 @@
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
# serial 17 LTDL_INIT
# serial 18 LTDL_INIT
# LT_CONFIG_LTDL_DIR(DIRECTORY, [LTDL-MODE])
# ------------------------------------------
......@@ -407,6 +407,7 @@ AC_CHECK_HEADERS([unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h dirent.h],
AC_CHECK_FUNCS([closedir opendir readdir], [], [AC_LIBOBJ([lt__dirent])])
AC_CHECK_FUNCS([strlcat strlcpy], [], [AC_LIBOBJ([lt__strl])])
m4_pattern_allow([LT_LIBEXT])dnl
AC_DEFINE_UNQUOTED([LT_LIBEXT],["$libext"],[The archive extension])
name=ltdl
......@@ -467,7 +468,7 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
freebsd* | dragonfly*)
lt_cv_sys_dlopen_deplibs=yes
;;
gnu* | linux* | k*bsd*-gnu)
gnu* | linux* | k*bsd*-gnu | kopensolaris*-gnu)
# GNU and its variants, using gnu ld.so (Glibc)
lt_cv_sys_dlopen_deplibs=yes
;;
......
# Helper functions for option handling. -*- Autoconf -*-
#
# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
# Inc.
# Written by Gary V. Vaughan, 2004
#
# This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
# serial 6 ltoptions.m4
# serial 7 ltoptions.m4
# This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
......@@ -125,7 +126,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],
[enable_win32_dll=yes
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
AC_CHECK_TOOL(AS, as, false)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
AC_CHECK_TOOL(OBJDUMP, objdump, false)
......@@ -133,13 +134,13 @@ case $host in
esac
test -z "$AS" && AS=as
_LT_DECL([], [AS], [0], [Assembler program])dnl
_LT_DECL([], [AS], [1], [Assembler program])dnl
test -z "$DLLTOOL" && DLLTOOL=dlltool
_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
test -z "$OBJDUMP" && OBJDUMP=objdump
_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
])# win32-dll
AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
......
......@@ -9,15 +9,15 @@
# Generated from ltversion.in.
# serial 3017 ltversion.m4
# serial 3175 ltversion.m4
# This file is part of GNU Libtool
m4_define([LT_PACKAGE_VERSION], [2.2.6b])
m4_define([LT_PACKAGE_REVISION], [1.3017])
m4_define([LT_PACKAGE_VERSION], [2.2.10])
m4_define([LT_PACKAGE_REVISION], [1.3175])
AC_DEFUN([LTVERSION_VERSION],
[macro_version='2.2.6b'
macro_revision='1.3017'
[macro_version='2.2.10'
macro_revision='1.3175'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
#
# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
# Written by Scott James Remnant, 2004.
#
# This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
# serial 4 lt~obsolete.m4
# serial 5 lt~obsolete.m4
# These exist entirely to fool aclocal when bootstrapping libtool.
#
......@@ -77,7 +77,6 @@ m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])])
m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
......@@ -90,3 +89,10 @@ m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])])
m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
......@@ -38,35 +38,33 @@ extern "C" {
#define GetAlphaPixelComponent(p) (QuantumRange-(p)->opacity)
#define GetIndexPixelComponent(p) ((p)->index)
#define SetRedPixelComponent(q,component) ((q)->red=(component))
#define SetGreenPixelComponent(q,component) ((q)->green=(component))
#define SetBluePixelComponent(q,component) ((q)->blue=(component))
#define SetOpacityPixelComponent(q,component) ((q)->opacity=(component))
#define SetAlphaPixelComponent(q,component) \
((q)->opacity=(QuantumRange-(component)))
#define SetIndexPixelComponent(q,component) ((q)->index=(component))
#define SetRedPixelComponent(q,value) ((q)->red=(value))
#define SetGreenPixelComponent(q,value) ((q)->green=(value))
#define SetBluePixelComponent(q,value) ((q)->blue=(value))
#define SetOpacityPixelComponent(q,value) ((q)->opacity=(value))
#define SetAlphaPixelComponent(q,value) ((q)->opacity=(QuantumRange-(value)))
#define SetIndexPixelComponent(q,value) ((q)->index=(value))
#define GetGrayPixelComponent(p) ((p)->red)
#define SetGrayPixelComponent(q,component) \
((q)->red=(q)->green=(q)->blue=(component))
#define SetGrayPixelComponent(q,value) ((q)->red=(q)->green=(q)->blue=(value))
#define GetYPixelComponent(p) ((p)->red)
#define GetCbPixelComponent(p) ((p)->green)
#define GetCrPixelComponent(p) ((p)->blue)
#define SetYPixelComponent(q,component) ((q)->red=(component))
#define SetCbPixelComponent(q,component) ((q)->green=(component))
#define SetCrPixelComponent(q,component) ((q)->blue=(component))
#define SetYPixelComponent(q,value) ((q)->red=(value))
#define SetCbPixelComponent(q,value) ((q)->green=(value))
#define SetCrPixelComponent(q,value) ((q)->blue=(value))
#define GetCyanPixelComponent(p) ((p)->red)
#define GetMagentaPixelComponent(p) ((p)->green)
#define GetYellowPixelComponent(p) ((p)->blue)
#define GetBlackPixelComponent(p) ((p)->opacity)
#define GetBlackPixelComponent(x) (indexes[x])
#define SetCyanPixelComponent(q,component) ((q)->red=(component))
#define SetMagentaPixelComponent(q,component) ((q)->green=(component))
#define SetYellowPixelComponent(q,component) ((q)->blue=(component))
#define SetBlackPixelComponent(q,component) ((q)->opacity=(component))
#define SetCyanPixelComponent(q,value) ((q)->red=(value))
#define SetMagentaPixelComponent(q,value) ((q)->green=(value))
#define SetYellowPixelComponent(q,value) ((q)->blue=(value))
#define SetBlackPixelComponent(x,value) (indexes[x]=(value))
typedef struct _DoublePixelPacket
{
......
This diff is collapsed.
......@@ -30,7 +30,10 @@ typedef struct _ChannelStatistics
double
minima,
maxima,
sum,
sum_squared,
mean,
variance,
standard_deviation,
kurtosis,
skewness;
......
......@@ -1153,6 +1153,11 @@ static MagickBooleanType LoadTypeList(const char *xml,const char *filename,
MaxTextExtent);
(void) ConcatenateMagickString(font_path,token,MaxTextExtent);
path=ConstantString(font_path);
if (IsPathAccessible(path) == MagickFalse)
{
path=DestroyString(path);
path=ConstantString(token);
}
}
type_info->glyphs=path;
break;
......
......@@ -33,9 +33,10 @@ extern "C" {
#define MagickLibAddendum "-4"
#define MagickLibInterface 4
#define MagickLibMinInterface 4
#define MagickReleaseDate "2010-08-06"
#define MagickChangeDate "20100805"
#define MagickReleaseDate "2010-08-08"
#define MagickChangeDate "20100807"
#define MagickAuthoritativeURL "http://www.imagemagick.org"
#define MagickFeatures "OpenMP "
#define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-6.6.3/index.html"
#if (MAGICKCORE_QUANTUM_DEPTH == 8)
#define MagickQuantumDepth "Q8"
......@@ -53,23 +54,6 @@ extern "C" {
#define MagickQuantumDepth "Q?"
#define MagickQuantumRange "?"
#endif
#if !defined(MAGICKCORE_HDRI_SUPPORT)
#define MagickHDRIFeature ""
#else
#define MagickHDRIFeature "HDRI "
#endif
#if !defined(MAGICKCORE_OPENMP_SUPPORT)
#define MagickOPENMPFeature ""
#else
#define MagickOPENMPFeature "OpenMP "
#endif
#if !defined(MAGICKCORE_OPENCL_SUPPORT)
#define MagickOPENCLFeature ""
#else
#define MagickOPENCLFeature "OpenCL "
#endif
#define MagickFeatures \
MagickHDRIFeature MagickOPENMPFeature MagickOPENCLFeature
#define MagickVersion \
MagickPackageName " " MagickLibVersionText MagickLibAddendum " " \
MagickReleaseDate " " MagickQuantumDepth " " MagickAuthoritativeURL
......
......@@ -36,6 +36,7 @@ extern "C" {
#define MagickReleaseDate "@PACKAGE_RELEASE_DATE@"
#define MagickChangeDate "@PACKAGE_CHANGE_DATE@"
#define MagickAuthoritativeURL "http://www.imagemagick.org"
#define MagickFeatures "@MAGICK_FEATURES@"
#define MagickHomeURL "file://@DOCUMENTATION_PATH@/index.html"
#if (MAGICKCORE_QUANTUM_DEPTH == 8)
#define MagickQuantumDepth "Q8"
......@@ -53,23 +54,6 @@ extern "C" {
#define MagickQuantumDepth "Q?"
#define MagickQuantumRange "?"
#endif
#if !defined(MAGICKCORE_HDRI_SUPPORT)
#define MagickHDRIFeature ""
#else
#define MagickHDRIFeature "HDRI "
#endif
#if !defined(MAGICKCORE_OPENMP_SUPPORT)
#define MagickOPENMPFeature ""
#else
#define MagickOPENMPFeature "OpenMP "
#endif
#if !defined(MAGICKCORE_OPENCL_SUPPORT)
#define MagickOPENCLFeature ""
#else
#define MagickOPENCLFeature "OpenCL "
#endif
#define MagickFeatures \
MagickHDRIFeature MagickOPENMPFeature MagickOPENCLFeature
#define MagickVersion \
MagickPackageName " " MagickLibVersionText MagickLibAddendum " " \
MagickReleaseDate " " MagickQuantumDepth " " MagickAuthoritativeURL
......
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