diff --git a/Magick++/bin/Magick++-config b/Magick++/bin/Magick++-config
index 66966a5..e1f76f1 100755
--- a/Magick++/bin/Magick++-config
+++ b/Magick++/bin/Magick++-config
@@ -52,7 +52,7 @@
echo '-I/usr/local/include/ImageMagick'
;;
--ldflags)
- echo '-L/usr/local/lib -Wl,--as-needed'
+ echo '-L/usr/local/lib '
;;
--libs)
echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL
index 628980e..1a5cc57 100644
--- a/PerlMagick/Makefile.PL
+++ b/PerlMagick/Makefile.PL
@@ -140,9 +140,9 @@
# defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile
my $INC_magick = '-I../ -I.. -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -pthread -I/usr/include/librsvg-2 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/gtk-2.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/freetype2 -I/usr/include/libxml2 -I"' . $Config{'usrinc'} . '/ImageMagick"';
my $LIBS_magick = '-L../magick/.libs -lMagickCore -lperl -lm';
-my $CCFLAGS_magick = "$Config{'ccflags'} -fopenmp -O3 -g -Wall -W -pthread";
-my $LDFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'ldflags'} -Wl,--as-needed";
-my $LDDLFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'lddlflags'} -Wl,--as-needed";
+my $CCFLAGS_magick = "$Config{'ccflags'} -fopenmp -g -O2 -Wall -W -pthread";
+my $LDFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'ldflags'} ";
+my $LDDLFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'lddlflags'} ";
if (($^O eq 'MSWin32') && ($Config{cc} =~ /gcc/)) {
my($Ipaths, $Lpaths) = AutodetectWin32gcc();
diff --git a/config/configure.xml b/config/configure.xml
index e7e81e9..613bf9d 100644
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,21 +9,21 @@
<configure name="NAME" value="ImageMagick"/>
<configure name="LIB_VERSION" value="0x659"/>
<configure name="LIB_VERSION_NUMBER" value="6,5,9,2"/>
- <configure name="RELEASE_DATE" value="2010-02-01"/>
- <configure name="CONFIGURE" value="./configure 'CFLAGS=-O3 -g' 'LDFLAGS=-Wl,--as-needed'"/>
+ <configure name="RELEASE_DATE" value="2010-02-03"/>
+ <configure name="CONFIGURE" value="./configure "/>
<configure name="PREFIX" value="/usr/local"/>
<configure name="EXEC-PREFIX" value="/usr/local"/>
<configure name="VERSION" value="6.5.9"/>
<configure name="CC" value="gcc -std=gnu99"/>
- <configure name="CFLAGS" value="-fopenmp -O3 -g -Wall -W -pthread"/>
+ <configure name="CFLAGS" value="-fopenmp -g -O2 -Wall -W -pthread"/>
<configure name="CPPFLAGS" value="-I/usr/local/include/ImageMagick"/>
<configure name="PCFLAGS" value="-fopenmp"/>
<configure name="DEFS" value="-DHAVE_CONFIG_H"/>
- <configure name="LDFLAGS" value="-L/usr/local/lib -Wl,--as-needed"/>
+ <configure name="LDFLAGS" value="-L/usr/local/lib "/>
<configure name="LIBS" value="-lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl"/>
<configure name="CXX" value="g++"/>
<configure name="CXXFLAGS" value="-g -O2 -Wall -W -pthread"/>
- <configure name="DISTCHECK_CONFIG_FLAGS" value="'CFLAGS=-O3 -g' 'LDFLAGS=-Wl,--as-needed' --disable-deprecated --with-quantum-depth=16 --with-umem=no --with-autotrace=no --with-gslib=no --with-fontpath="/>
+ <configure name="DISTCHECK_CONFIG_FLAGS" value="--disable-deprecated --with-quantum-depth=16 --with-umem=no --with-autotrace=no --with-gslib=no --with-fontpath="/>
<configure name="HOST" value="x86_64-unknown-linux-gnu"/>
<configure name="DELEGATES" value="bzlib djvu fftw fontconfig freetype jpeg jng jp2 lcms mpeg png rsvg tiff x11 xml wmf zlib"/>
<configure name="COPYRIGHT" value="Copyright (C) 1999-2010 ImageMagick Studio LLC"/>
diff --git a/libtool b/libtool
index 230f1c3..245667e 100755
--- a/libtool
+++ b/libtool
@@ -138,7 +138,7 @@
LTCC="gcc -std=gnu99"
# LTCC compiler flags.
-LTCFLAGS="-fopenmp -O3 -g -Wall -W -pthread"
+LTCFLAGS="-fopenmp -g -O2 -Wall -W -pthread"
# Take the output of nm and produce a listing of raw symbols and C names.
global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'"
diff --git a/magick/Magick-config b/magick/Magick-config
index 2132b9a..92915ca 100755
--- a/magick/Magick-config
+++ b/magick/Magick-config
@@ -49,7 +49,7 @@
echo '-I/usr/local/include/ImageMagick'
;;
--ldflags)
- echo '-L/usr/local/lib -Wl,--as-needed'
+ echo '-L/usr/local/lib '
;;
--libs)
echo "-L${libdir} -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
diff --git a/magick/blob.c b/magick/blob.c
index 9d8cccc..7e19c6a 100644
--- a/magick/blob.c
+++ b/magick/blob.c
@@ -2323,35 +2323,38 @@
#endif
if (*type == 'w')
{
- /*
- Form filename for multi-part images.
- */
- (void) InterpretImageFilename(image_info,image,image->filename,(int)
- image->scene,filename);
+ (void) CopyMagickString(filename,image->filename,MaxTextExtent);
if (image_info->adjoin == MagickFalse)
- if ((image->previous != (Image *) NULL) ||
- (GetNextImageInList(image) != (Image *) NULL))
- {
- if (LocaleCompare(filename,image->filename) == 0)
- {
- char
- extension[MaxTextExtent],
- path[MaxTextExtent];
+ {
+ /*
+ Form filename for multi-part images.
+ */
+ (void) InterpretImageFilename(image_info,image,image->filename,(int)
+ image->scene,filename);
+ if ((image->previous != (Image *) NULL) ||
+ (GetNextImageInList(image) != (Image *) NULL))
+ {
+ if (LocaleCompare(filename,image->filename) == 0)
+ {
+ char
+ extension[MaxTextExtent],
+ path[MaxTextExtent];
- GetPathComponent(image->filename,RootPath,path);
- GetPathComponent(image->filename,ExtensionPath,extension);
- if (*extension == '\0')
- (void) FormatMagickString(filename,MaxTextExtent,"%s-%lu",
- path,image->scene);
- else
- (void) FormatMagickString(filename,MaxTextExtent,"%s-%lu.%s",
- path,image->scene,extension);
- }
- }
- (void) CopyMagickString(image->filename,filename,MaxTextExtent);
+ GetPathComponent(image->filename,RootPath,path);
+ GetPathComponent(image->filename,ExtensionPath,extension);
+ if (*extension == '\0')
+ (void) FormatMagickString(filename,MaxTextExtent,"%s-%lu",
+ path,image->scene);
+ else
+ (void) FormatMagickString(filename,MaxTextExtent,
+ "%s-%lu.%s",path,image->scene,extension);
+ }
+ }
+ (void) CopyMagickString(image->filename,filename,MaxTextExtent);
#if defined(macintosh)
- SetApplicationType(filename,image_info->magick,'8BIM');
+ SetApplicationType(filename,image_info->magick,'8BIM');
#endif
+ }
}
#if defined(MAGICKCORE_ZLIB_DELEGATE)
if (((strlen(filename) > 2) &&
diff --git a/magick/constitute.c b/magick/constitute.c
index 948bf5e..39c98c4 100644
--- a/magick/constitute.c
+++ b/magick/constitute.c
@@ -1099,6 +1099,10 @@
(void) AcquireUniqueFilename(image->filename);
temporary=MagickTrue;
}
+ else
+ if (image_info->adjoin == MagickFalse)
+ (void) CopyMagickString(image->filename,image_info->filename,
+ MaxTextExtent);
(void) CloseBlob(image);
}
}
diff --git a/magick/image.c b/magick/image.c
index a96af7a..07d7e39 100644
--- a/magick/image.c
+++ b/magick/image.c
@@ -3253,11 +3253,14 @@
/*
Rectify multi-image file support.
*/
- (void) InterpretImageFilename(image_info,(Image *) NULL,
- image_info->filename,(int) image_info->scene,filename);
- if ((LocaleCompare(filename,image_info->filename) != 0) &&
- (strchr(filename,'%') == (char *) NULL))
- image_info->adjoin=MagickFalse;
+ if (image_info->adjoin != MagickFalse)
+ {
+ (void) InterpretImageFilename(image_info,(Image *) NULL,
+ image_info->filename,(int) image_info->scene,filename);
+ if ((LocaleCompare(filename,image_info->filename) != 0) &&
+ (strchr(filename,'%') == (char *) NULL))
+ image_info->adjoin=MagickFalse;
+ }
magick_info=GetMagickInfo(magic,exception);
if (magick_info != (const MagickInfo *) NULL)
if (GetMagickAdjoin(magick_info) == MagickFalse)
diff --git a/magick/version.h b/magick/version.h
index 86f75f0..87587b1 100644
--- a/magick/version.h
+++ b/magick/version.h
@@ -32,7 +32,7 @@
#define MagickLibVersionNumber 3,0,0
#define MagickLibAddendum "-2"
#define MagickLibInterface 3
-#define MagickReleaseDate "2010-02-01"
+#define MagickReleaseDate "2010-02-03"
#define MagickChangeDate "20100127"
#define MagickAuthoritativeURL "http://www.imagemagick.org"
#define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-6.5.9/index.html"
diff --git a/wand/Wand-config b/wand/Wand-config
index 245cafd..0420f58 100755
--- a/wand/Wand-config
+++ b/wand/Wand-config
@@ -49,7 +49,7 @@
echo '-I/usr/local/include/ImageMagick'
;;
--ldflags)
- echo '-L/usr/local/lib -Wl,--as-needed'
+ echo '-L/usr/local/lib '
;;
--libs)
echo "-L${libdir} -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
diff --git a/www/favicon.ico b/www/favicon.ico
new file mode 100644
index 0000000..e0062e3
--- /dev/null
+++ b/www/favicon.ico
Binary files differ