Commit 65dab13d authored by cristy's avatar cristy

git-svn-id:...

git-svn-id: https://subversion.imagemagick.org/subversion/ImageMagick/trunk@1168 aa41f4f7-0bf4-0310-aa73-e5a19afd5a74
parent c6b418af
......@@ -2349,7 +2349,9 @@ MAGICK_LDFLAGS = @MAGICK_LDFLAGS@
MAGICK_LIBLTDL = @MAGICK_LIBLTDL@
MAGICK_LIBRARY_AGE = @MAGICK_LIBRARY_AGE@
MAGICK_LIBRARY_CURRENT = @MAGICK_LIBRARY_CURRENT@
MAGICK_LIBRARY_CURRENT_MIN = @MAGICK_LIBRARY_CURRENT_MIN@
MAGICK_LIBRARY_REVISION = @MAGICK_LIBRARY_REVISION@
MAGICK_LIBRARY_VERSION_INFO = @MAGICK_LIBRARY_VERSION_INFO@
MAGICK_LIBS = @MAGICK_LIBS@
MAGICK_LIB_VERSION = @MAGICK_LIB_VERSION@
MAGICK_LIB_VERSION_NUMBER = @MAGICK_LIB_VERSION_NUMBER@
......
......@@ -9,7 +9,7 @@
<configure name="NAME" value="ImageMagick"/>
<configure name="LIB_VERSION" value="0x659"/>
<configure name="LIB_VERSION_NUMBER" value="6,5,9,4"/>
<configure name="RELEASE_DATE" value="2010-02-07"/>
<configure name="RELEASE_DATE" value="2010-02-09"/>
<configure name="CONFIGURE" value="./configure "/>
<configure name="PREFIX" value="/usr/local"/>
<configure name="EXEC-PREFIX" value="/usr/local"/>
......
......@@ -1122,6 +1122,8 @@ PACKAGE_LIB_VERSION_NUMBER
PACKAGE_LIB_VERSION
PACKAGE_CHANGE_DATE
PACKAGE_RELEASE
MAGICK_LIBRARY_VERSION_INFO
MAGICK_LIBRARY_CURRENT_MIN
MAGICK_LIBRARY_AGE
MAGICK_LIBRARY_REVISION
MAGICK_LIBRARY_CURRENT
......@@ -3473,6 +3475,10 @@ test -n "$target_alias" &&
program_prefix=${target_alias}-
# Substitute library versioning
MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`
MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
# Ensure that make can run correctly
......@@ -9004,13 +9010,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
(eval echo "\"\$as_me:9007: $ac_compile\"" >&5)
(eval echo "\"\$as_me:9013: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
(eval echo "\"\$as_me:9010: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval echo "\"\$as_me:9016: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
(eval echo "\"\$as_me:9013: output\"" >&5)
(eval echo "\"\$as_me:9019: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
......@@ -10201,7 +10207,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
echo '#line 10204 "configure"' > conftest.$ac_ext
echo '#line 10210 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
......@@ -12286,11 +12292,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:12289: $lt_compile\"" >&5)
(eval echo "\"\$as_me:12295: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:12293: \$? = $ac_status" >&5
echo "$as_me:12299: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
......@@ -12625,11 +12631,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:12628: $lt_compile\"" >&5)
(eval echo "\"\$as_me:12634: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:12632: \$? = $ac_status" >&5
echo "$as_me:12638: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
......@@ -12730,11 +12736,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:12733: $lt_compile\"" >&5)
(eval echo "\"\$as_me:12739: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:12737: \$? = $ac_status" >&5
echo "$as_me:12743: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
......@@ -12785,11 +12791,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:12788: $lt_compile\"" >&5)
(eval echo "\"\$as_me:12794: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:12792: \$? = $ac_status" >&5
echo "$as_me:12798: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
......@@ -15155,7 +15161,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 15158 "configure"
#line 15164 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
......@@ -15251,7 +15257,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 15254 "configure"
#line 15260 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
......@@ -17207,11 +17213,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:17210: $lt_compile\"" >&5)
(eval echo "\"\$as_me:17216: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:17214: \$? = $ac_status" >&5
echo "$as_me:17220: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
......@@ -17306,11 +17312,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:17309: $lt_compile\"" >&5)
(eval echo "\"\$as_me:17315: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:17313: \$? = $ac_status" >&5
echo "$as_me:17319: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
......@@ -17358,11 +17364,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:17361: $lt_compile\"" >&5)
(eval echo "\"\$as_me:17367: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:17365: \$? = $ac_status" >&5
echo "$as_me:17371: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
......@@ -18770,7 +18776,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 18773 "configure"
#line 18779 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
......
......@@ -91,6 +91,10 @@ AC_CANONICAL_TARGET([])
AC_SUBST(MAGICK_LIBRARY_CURRENT)dnl
AC_SUBST(MAGICK_LIBRARY_REVISION)dnl
AC_SUBST(MAGICK_LIBRARY_AGE)dnl
AC_SUBST([MAGICK_LIBRARY_CURRENT_MIN],
[`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`])
AC_SUBST([MAGICK_LIBRARY_VERSION_INFO],
[$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE])
AC_SUBST(PACKAGE_NAME)dnl
AC_SUBST(PACKAGE_VERSION)dnl
......
......@@ -32,8 +32,9 @@ extern "C" {
#define MagickLibVersionNumber 3,0,0
#define MagickLibAddendum "-4"
#define MagickLibInterface 3
#define MagickReleaseDate "2010-02-07"
#define MagickChangeDate "20100207"
#define MagickLibMinInterface 3
#define MagickReleaseDate "2010-02-09"
#define MagickChangeDate "20100208"
#define MagickAuthoritativeURL "http://www.imagemagick.org"
#define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-6.5.9/index.html"
#if (MAGICKCORE_QUANTUM_DEPTH == 8)
......
......@@ -32,6 +32,7 @@ extern "C" {
#define MagickLibVersionNumber @MAGICK_LIB_VERSION_NUMBER@
#define MagickLibAddendum "@PACKAGE_VERSION_ADDENDUM@"
#define MagickLibInterface @MAGICK_LIBRARY_CURRENT@
#define MagickLibMinInterface @MAGICK_LIBRARY_CURRENT_MIN@
#define MagickReleaseDate "@PACKAGE_RELEASE_DATE@"
#define MagickChangeDate "@PACKAGE_CHANGE_DATE@"
#define MagickAuthoritativeURL "http://www.imagemagick.org"
......
......@@ -5846,7 +5846,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info,
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
canvas=image;
if ((window->immutable != MagickFalse) &&
if ((window->immutable == MagickFalse) &&
(image->storage_class == DirectClass) && (image->matte != MagickFalse))
{
char
......
......@@ -35,18 +35,12 @@ PACKAGE_VERSION_ADDENDUM="-${PACKAGE_RELEASE}"
# Here are a set of rules to help you update your library version
# information:
#
# 1. Start with version information of `0:0:0' for each libtool library.
# 2. Update the version information only immediately before a public
# release of your software. More frequent updates are unnecessary, and
# only guarantee that the current interface number gets larger faster.
# 3. If the library source code has changed at all since the last update,
# then increment revision (`c:r:a' becomes `c:r+1:a').
# 4. If any interfaces have been added, removed, or changed since the last
# update, increment current, and set revision to 0.
# 5. If any interfaces have been added since the last public release, then
# increment age.
# 6. If any interfaces have been removed since the last public release,
# then set age to 0.
# If there is any interface change, increment CURRENT (major). If that
# interface change does not break upward compatibility (i.e. it is an
# addition), increment AGE( micro), Otherwise AGE is reset to 0. If CURRENT
# has changed, REVISION (minor) is set to 0, otherwise REVISION is
# incremented.
MAGICK_LIBRARY_CURRENT=3
MAGICK_LIBRARY_REVISION=0
MAGICK_LIBRARY_AGE=0
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