echo '6.6.8 Q16 '
;;
--cflags)
- echo "-I${includedir} "
+ echo "-I${includedir} -fopenmp"
;;
--cxxflags)
- echo '-g -O2'
+ echo '-g -O2 -pthread'
;;
--cppflags)
echo '-I/usr/local/include/ImageMagick'
coders/ycbcr.c coders/yuv.c coders/dps.c coders/djvu.c \
coders/exr.c coders/fpx.c coders/clipboard.c coders/emf.c \
coders/jbig.c coders/jpeg.c coders/jp2.c coders/png.c \
- coders/ept.c coders/tiff.c coders/wmf.c coders/x.c \
- coders/xwd.c filters/analyze.c
+ coders/ept.c coders/tiff.c coders/webp.c coders/wmf.c \
+ coders/x.c coders/xwd.c filters/analyze.c
am__objects_2 = magick/magick_libMagickCore_la-accelerate.lo \
magick/magick_libMagickCore_la-animate.lo \
magick/magick_libMagickCore_la-annotate.lo \
@TIFF_DELEGATE_TRUE@am__objects_13 = \
@TIFF_DELEGATE_TRUE@ coders/magick_libMagickCore_la-ept.lo \
@TIFF_DELEGATE_TRUE@ coders/magick_libMagickCore_la-tiff.lo
-@WMF_DELEGATE_TRUE@am__objects_14 = \
+@WEBP_DELEGATE_TRUE@am__objects_14 = \
+@WEBP_DELEGATE_TRUE@ coders/magick_libMagickCore_la-webp.lo
+@WMF_DELEGATE_TRUE@am__objects_15 = \
@WMF_DELEGATE_TRUE@ coders/magick_libMagickCore_la-wmf.lo
-@X11_DELEGATE_TRUE@am__objects_15 = \
+@X11_DELEGATE_TRUE@am__objects_16 = \
@X11_DELEGATE_TRUE@ coders/magick_libMagickCore_la-x.lo \
@X11_DELEGATE_TRUE@ coders/magick_libMagickCore_la-xwd.lo
-am__objects_16 = coders/magick_libMagickCore_la-aai.lo \
+am__objects_17 = coders/magick_libMagickCore_la-aai.lo \
coders/magick_libMagickCore_la-art.lo \
coders/magick_libMagickCore_la-avs.lo \
coders/magick_libMagickCore_la-bgr.lo \
$(am__objects_5) $(am__objects_6) $(am__objects_7) \
$(am__objects_8) $(am__objects_9) $(am__objects_10) \
$(am__objects_11) $(am__objects_12) $(am__objects_13) \
- $(am__objects_14) $(am__objects_15)
-am__objects_17 = filters/magick_libMagickCore_la-analyze.lo
+ $(am__objects_14) $(am__objects_15) $(am__objects_16)
+am__objects_18 = filters/magick_libMagickCore_la-analyze.lo
@WITH_MODULES_FALSE@am_magick_libMagickCore_la_OBJECTS = \
@WITH_MODULES_FALSE@ $(am__objects_2) $(am__objects_3) \
-@WITH_MODULES_FALSE@ $(am__objects_16) $(am__objects_17)
+@WITH_MODULES_FALSE@ $(am__objects_17) $(am__objects_18)
@WITH_MODULES_TRUE@am_magick_libMagickCore_la_OBJECTS = \
@WITH_MODULES_TRUE@ $(am__objects_2) $(am__objects_3)
magick_libMagickCore_la_OBJECTS = \
wand_libMagickWand_la_DEPENDENCIES = $(MAGICKCORE_LIBS) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
-am__objects_18 = wand/wand_libMagickWand_la-animate.lo \
+am__objects_19 = wand/wand_libMagickWand_la-animate.lo \
wand/wand_libMagickWand_la-compare.lo \
wand/wand_libMagickWand_la-composite.lo \
wand/wand_libMagickWand_la-conjure.lo \
wand/wand_libMagickWand_la-stream.lo \
wand/wand_libMagickWand_la-wand.lo \
wand/wand_libMagickWand_la-wand-view.lo
-am_wand_libMagickWand_la_OBJECTS = $(am__objects_18)
+am_wand_libMagickWand_la_OBJECTS = $(am__objects_19)
wand_libMagickWand_la_OBJECTS = $(am_wand_libMagickWand_la_OBJECTS)
wand_libMagickWand_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
UMEM_LIBS = @UMEM_LIBS@
UniconvertorDelegate = @UniconvertorDelegate@
VERSION = @VERSION@
-WEBPDelegate = @WEBPDelegate@
+WEBP_LIBS = @WEBP_LIBS@
WMFDecodeDelegate = @WMFDecodeDelegate@
WMF_LIBS = @WMF_LIBS@
WWWDecodeDelegate = @WWWDecodeDelegate@
@PNG_DELEGATE_TRUE@MAGICK_PNG_SRCS = coders/png.c
@TIFF_DELEGATE_TRUE@MAGICK_TIFF_MODULES = coders/ept.la coders/tiff.la
@TIFF_DELEGATE_TRUE@MAGICK_TIFF_SRCS = coders/ept.c coders/tiff.c
+@WEBP_DELEGATE_TRUE@MAGICK_WEBP_MODULES = coders/webp.la
+@WEBP_DELEGATE_TRUE@MAGICK_WEBP_SRCS = coders/webp.c
@WINGDI32_DELEGATE_TRUE@MAGICK_GDI32_MODULES = coders/clipboard.la coders/emf.la
@WINGDI32_DELEGATE_TRUE@MAGICK_GDI32_SRCS = coders/clipboard.c coders/emf.c
@WMF_DELEGATE_TRUE@MAGICK_WMF_MODULES = coders/wmf.la
$(MAGICK_JP2_SRCS) \
$(MAGICK_PNG_SRCS) \
$(MAGICK_TIFF_SRCS) \
+ $(MAGICK_WEBP_SRCS) \
$(MAGICK_WMF_SRCS) \
$(MAGICK_X11_SRCS)
coders_wbmp_la_LDFLAGS = $(MODULECOMMONFLAGS)
coders_wbmp_la_LIBADD = $(MAGICKCORE_LIBS)
+# WEBP coder module
+coders_webp_la_SOURCES = coders/webp.c
+coders_webp_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
+coders_webp_la_LDFLAGS = $(MODULECOMMONFLAGS)
+coders_webp_la_LIBADD = $(MAGICKCORE_LIBS) $(WEBP_LIBS) $(MATH_LIBS)
+
# WMF coder module
coders_wmf_la_SOURCES = coders/wmf.c
coders_wmf_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
coders/$(DEPDIR)/$(am__dirstamp)
coders/magick_libMagickCore_la-tiff.lo: coders/$(am__dirstamp) \
coders/$(DEPDIR)/$(am__dirstamp)
+coders/magick_libMagickCore_la-webp.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
coders/magick_libMagickCore_la-wmf.lo: coders/$(am__dirstamp) \
coders/$(DEPDIR)/$(am__dirstamp)
coders/magick_libMagickCore_la-x.lo: coders/$(am__dirstamp) \
-rm -f coders/magick_libMagickCore_la-viff.lo
-rm -f coders/magick_libMagickCore_la-wbmp.$(OBJEXT)
-rm -f coders/magick_libMagickCore_la-wbmp.lo
+ -rm -f coders/magick_libMagickCore_la-webp.$(OBJEXT)
+ -rm -f coders/magick_libMagickCore_la-webp.lo
-rm -f coders/magick_libMagickCore_la-wmf.$(OBJEXT)
-rm -f coders/magick_libMagickCore_la-wmf.lo
-rm -f coders/magick_libMagickCore_la-wpg.$(OBJEXT)
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-vid.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-viff.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-wbmp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-webp.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-wmf.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-wpg.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-x.Plo@am__quote@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-tiff.lo `test -f 'coders/tiff.c' || echo '$(srcdir)/'`coders/tiff.c
+coders/magick_libMagickCore_la-webp.lo: coders/webp.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-webp.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-webp.Tpo -c -o coders/magick_libMagickCore_la-webp.lo `test -f 'coders/webp.c' || echo '$(srcdir)/'`coders/webp.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-webp.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-webp.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/webp.c' object='coders/magick_libMagickCore_la-webp.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-webp.lo `test -f 'coders/webp.c' || echo '$(srcdir)/'`coders/webp.c
+
coders/magick_libMagickCore_la-wmf.lo: coders/wmf.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-wmf.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-wmf.Tpo -c -o coders/magick_libMagickCore_la-wmf.lo `test -f 'coders/wmf.c' || echo '$(srcdir)/'`coders/wmf.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-wmf.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-wmf.Plo
# defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile
my $INC_magick = '-I../ -I.. -pthread -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/graphviz -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 -g -O2 -Wall -pthread";
+my $CCFLAGS_magick = "$Config{'ccflags'} -fopenmp -I/usr/include/python3.1 -Wall -pthread";
my $LDFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'ldflags'} ";
my $LDDLFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'lddlflags'} ";
# 'OPTIMIZE' => '',
# Use same compiler as ImageMagick
- 'PERLMAINCC' => ' ',
+ 'PERLMAINCC' => ' -fopenmp',
# Set Perl installation prefix to ImageMagick installation prefix
# 'PREFIX' => '/usr/local',
$call Make vicar.c
$call Make vid.c
$call Make viff.c
+$call Make webp.c
$call Make wbmp.c
$call Make wmf.c
$call Make wpg.c
meta,miff,mpc,mpr,msl,mpeg,mono,mtv,mvg,null,otb,pattern,pcd,pcl,pcx,pdb, -
pdf,pes,pict,pix,plasma,png,pnm,preview,ps,ps2,ps3,psd,pwp,raw,rgb,rla,rle, -
sct,sfw,sgi,stegano,sun,svg,tga,thumbnail,tiff,tile,tim,ttf,txt,uil,url, -
- uyvy,vicar,vid,viff,wbmp,wmf,wpg,x,xbm,xc,xcf,xpm,xps,xwd,ycbcr,yuv,cin, -
- magick,scr,[-.magick]compress,[-.magick]prervicccm
+ uyvy,vicar,vid,viff,wbmp,webp,wmf,wpg,x,xbm,xc,xcf,xpm,xps,xwd,ycbcr,yuv, -
+ cin,magick,scr,[-.magick]compress,[-.magick]prervicccm
$exit
$
$Make: subroutine
MAGICK_TIFF_SRCS = coders/ept.c coders/tiff.c
endif
+if WEBP_DELEGATE
+MAGICK_WEBP_MODULES = coders/webp.la
+MAGICK_WEBP_SRCS = coders/webp.c
+endif
+
if WINGDI32_DELEGATE
MAGICK_GDI32_MODULES = coders/clipboard.la coders/emf.la
MAGICK_GDI32_SRCS = coders/clipboard.c coders/emf.c
$(MAGICK_JP2_SRCS) \
$(MAGICK_PNG_SRCS) \
$(MAGICK_TIFF_SRCS) \
+ $(MAGICK_WEBP_SRCS) \
$(MAGICK_WMF_SRCS) \
$(MAGICK_X11_SRCS)
coders_wbmp_la_LDFLAGS = $(MODULECOMMONFLAGS)
coders_wbmp_la_LIBADD = $(MAGICKCORE_LIBS)
+# WEBP coder module
+coders_webp_la_SOURCES = coders/webp.c
+coders_webp_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
+coders_webp_la_LDFLAGS = $(MODULECOMMONFLAGS)
+coders_webp_la_LIBADD = $(MAGICKCORE_LIBS) $(WEBP_LIBS) $(MATH_LIBS)
+
# WMF coder module
coders_wmf_la_SOURCES = coders/wmf.c
coders_wmf_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
--- /dev/null
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
+% W W EEEEE BBBB PPPP %
+% W W E B B P P %
+% W W W EEE BBBB PPPP %
+% WW WW E B B P %
+% W W EEEEE BBBB P %
+% %
+% %
+% Read/Write WebP Image Format %
+% %
+% Software Design %
+% John Cristy %
+% March 2011 %
+% %
+% %
+% Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization %
+% dedicated to making software imaging solutions freely available. %
+% %
+% You may not use this file except in compliance with the License. You may %
+% obtain a copy of the License at %
+% %
+% http://www.imagemagick.org/script/license.php %
+% %
+% Unless required by applicable law or agreed to in writing, software %
+% distributed under the License is distributed on an "AS IS" BASIS, %
+% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. %
+% See the License for the specific language governing permissions and %
+% limitations under the License. %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%
+*/
+\f
+/*
+ Include declarations.
+*/
+#include "magick/studio.h"
+#include "magick/blob.h"
+#include "magick/blob-private.h"
+#include "magick/client.h"
+#include "magick/display.h"
+#include "magick/exception.h"
+#include "magick/exception-private.h"
+#include "magick/image.h"
+#include "magick/image-private.h"
+#include "magick/list.h"
+#include "magick/magick.h"
+#include "magick/memory_.h"
+#include "magick/option.h"
+#include "magick/quantum-private.h"
+#include "magick/static.h"
+#include "magick/string_.h"
+#include "magick/module.h"
+#include "magick/utility.h"
+#include "magick/xwindow.h"
+#include "magick/xwindow-private.h"
+\f
+/*
+ Forward declarations.
+*/
+#if defined(MAGICKCORE_WEBP_DELEGATE)
+static MagickBooleanType
+ WriteWEBPImage(const ImageInfo *,Image *);
+#endif
+\f
+#if defined(MAGICKCORE_WEBP_DELEGATE)
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
+% R e a d W E B P I m a g e %
+% %
+% %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% ReadWEBPImage() reads an image in the WebP image format.
+%
+% The format of the ReadWEBPImage method is:
+%
+% Image *ReadWEBPImage(const ImageInfo *image_info,
+% ExceptionInfo *exception)
+%
+% A description of each parameter follows:
+%
+% o image_info: the image info.
+%
+% o exception: return any errors or warnings in this structure.
+%
+*/
+static Image *ReadWEBPImage(const ImageInfo *image_info,
+ ExceptionInfo *exception)
+{
+ return((Image *) NULL);
+}
+#endif
+\f
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
+% R e g i s t e r W E B P I m a g e %
+% %
+% %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% RegisterWEBPImage() adds attributes for the WebP image format to
+% the list of supported formats. The attributes include the image format
+% tag, a method to read and/or write the format, whether the format
+% supports the saving of more than one frame to the same file or blob,
+% whether the format supports native in-memory I/O, and a brief
+% description of the format.
+%
+% The format of the RegisterWEBPImage method is:
+%
+% size_t RegisterWEBPImage(void)
+%
+*/
+ModuleExport size_t RegisterWEBPImage(void)
+{
+ MagickInfo
+ *entry;
+
+ entry=SetMagickInfo("X");
+#if defined(MAGICKCORE_WEBP_DELEGATE)
+ entry->decoder=(DecodeImageHandler *) ReadWEBPImage;
+ entry->encoder=(EncodeImageHandler *) WriteWEBPImage;
+#endif
+ entry->format_type=ImplicitFormatType;
+ entry->description=ConstantString("WebP Image Format");
+ entry->module=ConstantString("WEBP");
+ (void) RegisterMagickInfo(entry);
+ return(MagickImageCoderSignature);
+}
+\f
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
+% U n r e g i s t e r W E B P I m a g e %
+% %
+% %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% UnregisterWEBPImage() removes format registrations made by the WebP module
+% from the list of supported formats.
+%
+% The format of the UnregisterWEBPImage method is:
+%
+% UnregisterWEBPImage(void)
+%
+*/
+ModuleExport void UnregisterWEBPImage(void)
+{
+ (void) UnregisterMagickInfo("WEBP");
+}
+#if defined(MAGICKCORE_WEBP_DELEGATE)
+\f
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
+% W r i t e W E B P I m a g e %
+% %
+% %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% WriteWEBPImage() writes an image in the WebP image format.
+%
+% The format of the WriteWEBPImage method is:
+%
+% MagickBooleanType WriteWEBPImage(const ImageInfo *image_info,
+% Image *image)
+%
+% A description of each parameter follows.
+%
+% o image_info: the image info.
+%
+% o image: The image.
+%
+*/
+static MagickBooleanType WriteWEBPImage(const ImageInfo *image_info,
+ Image *image)
+{
+ return(MagickFalse);
+}
+#endif
#endif
+/* Define if you have WEBP library */
+#undef WEBP_DELEGATE
+
/* Define to use the Windows GDI32 library */
#undef WINGDI32_DELEGATE
<configure name="NAME" value="ImageMagick"/>
<configure name="LIB_VERSION" value="0x668"/>
<configure name="LIB_VERSION_NUMBER" value="6,6,8,5"/>
- <configure name="RELEASE_DATE" value="2011-03-12"/>
- <configure name="CONFIGURE" value="./configure 'CFLAGS=-fopenmp -g -O2 -Wall -pthread'"/>
+ <configure name="RELEASE_DATE" value="2011-03-13"/>
+ <configure name="CONFIGURE" value="./configure 'CFLAGS=-I/usr/include/python3.1'"/>
<configure name="PREFIX" value="/usr/local"/>
<configure name="EXEC-PREFIX" value="/usr/local"/>
<configure name="VERSION" value="6.6.8"/>
<configure name="CC" value="gcc -std=gnu99 -std=gnu99"/>
- <configure name="CFLAGS" value="-fopenmp -g -O2 -Wall -pthread"/>
+ <configure name="CFLAGS" value="-fopenmp -I/usr/include/python3.1 -Wall -pthread"/>
<configure name="CPPFLAGS" value="-I/usr/local/include/ImageMagick"/>
- <configure name="PCFLAGS" value=""/>
+ <configure name="PCFLAGS" value="-fopenmp"/>
<configure name="DEFS" value="-DHAVE_CONFIG_H"/>
<configure name="LDFLAGS" value="-L/usr/local/lib "/>
<configure name="LIBS" value="-lMagickCore -llcms2 -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread -lltdl"/>
<configure name="CXX" value="g++"/>
- <configure name="CXXFLAGS" value="-g -O2"/>
- <configure name="DISTCHECK_CONFIG_FLAGS" value="'CFLAGS=-fopenmp -g -O2 -Wall -pthread' --disable-deprecated --with-quantum-depth=16 --with-umem=no --with-autotrace=no --with-gslib=no --with-fontpath= --with-perl=no"/>
+ <configure name="CXXFLAGS" value="-g -O2 -pthread"/>
+ <configure name="DISTCHECK_CONFIG_FLAGS" value="'CFLAGS=-I/usr/include/python3.1' --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 gvc jpeg jng jp2 lcms2 lzma png tiff x11 xml zlib"/>
<delegate decode="pdf" encode="eps" mode="bi" command=""gs" -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 "-sDEVICE=epswrite" "-sOutputFile=%o" "-f%i""/>
<delegate decode="pdf" encode="ps" mode="bi" command=""gs" -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 "-sDEVICE=pswrite" "-sOutputFile=%o" "-f%i""/>
<delegate decode="png" encode="launch" mode="encode" command=""gimp" "%i""/>
- <delegate decode="png" encode="webp" command="cp "%i" "%i.png"; "webpconv" "%i.png"; rm "%i.png"; mv "%i.webp" "%o""/>
<delegate decode="pnm" encode="ilbm" mode="encode" command=""ppmtoilbm" -24if "%i" > "%o""/>
<delegate decode="pov" command=""povray" "+i%i" -D0 +o"%o" +fn%q +w%w +h%h +a -q9 -kfi"%s" -kff"%n"\n"convert" -concatenate "%o*.png" "%o""/>
<delegate decode="ps" encode="eps" mode="bi" command=""gs" -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 "-sDEVICE=epswrite" "-sOutputFile=%o" "-f%i""/>
<delegate decode="svg" command=""rsvg" "%i" "%o""/>
<delegate decode="txt" encode="ps" mode="bi" command=""enscript" -o "%o" "%i""/>
<delegate decode="miff" encode="win" stealth="True" spawn="True" command=""/usr/local/bin/display" -immutable -delay 0 -window-group %[group] -title "%l " "ephemeral:%i""/>
- <delegate decode="webp" command="cp "%i" "%i.webp";"webpconv" -format PNG "%i.webp"; convert "%i.png" "%o";rm "%i.webp" "%i.png""/>
<delegate decode="wmf" command=""wmf2eps" -o "%o" "%i""/>
<delegate decode="xps:color" stealth="True" command=""gxps" -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 "-sDEVICE=ppmraw" -dTextAlphaBits=%u -dGraphicsAlphaBits=%u "-r%s" %s "-sOutputFile=%s" "%s""/>
<delegate decode="xps:cmyk" stealth="True" command=""gxps" -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 "-sDEVICE=bmpsep8" -dTextAlphaBits=%u -dGraphicsAlphaBits=%u "-r%s" %s "-sOutputFile=%s" "%s""/>
<delegate decode="pdf" encode="eps" mode="bi" command=""@PSDelegate@" -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 "-sDEVICE=@GSEPSDevice@" "-sOutputFile=%o" "-f%i""/>
<delegate decode="pdf" encode="ps" mode="bi" command=""@PSDelegate@" -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 "-sDEVICE=@GSPSDevice@" "-sOutputFile=%o" "-f%i""/>
<delegate decode="png" encode="launch" mode="encode" command=""@LaunchDelegate@" "%i""/>
- <delegate decode="png" encode="webp" command="cp "%i" "%i.png"; "@WEBPDelegate@" "%i.png"; rm "%i.png"; mv "%i.webp" "%o""/>
<delegate decode="pnm" encode="ilbm" mode="encode" command=""@ILBMEncodeDelegate@" -24if "%i" > "%o""/>
<delegate decode="pov" command=""@POVDelegate@" "+i%i" -D0 +o"%o" +fn%q +w%w +h%h +a -q9 -kfi"%s" -kff"%n"\n"@ConvertDelegate@" -concatenate "%o*.png" "%o""/>
<delegate decode="ps" encode="eps" mode="bi" command=""@PSDelegate@" -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 "-sDEVICE=@GSEPSDevice@" "-sOutputFile=%o" "-f%i""/>
<delegate decode="svg" command=""@RSVGDecodeDelegate@" "%i" "%o""/>
<delegate decode="txt" encode="ps" mode="bi" command=""@TXTDelegate@" -o "%o" "%i""/>
<delegate decode="miff" encode="win" stealth="True" spawn="True" command=""@DisplayDelegate@" -immutable -delay 0 -window-group %[group] -title "%l " "ephemeral:%i""/>
- <delegate decode="webp" command="cp "%i" "%i.webp";"@WEBPDelegate@" -format PNG "%i.webp"; convert "%i.png" "%o";rm "%i.webp" "%i.png""/>
<delegate decode="wmf" command=""@WMFDecodeDelegate@" -o "%o" "%i""/>
<delegate decode="xps:color" stealth="True" command=""@XPSDelegate@" -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 "-sDEVICE=@XPSColorDevice@" -dTextAlphaBits=%u -dGraphicsAlphaBits=%u "-r%s" %s "-sOutputFile=%s" "%s""/>
<delegate decode="xps:cmyk" stealth="True" command=""@XPSDelegate@" -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 "-sDEVICE=@XPSCMYKDevice@" -dTextAlphaBits=%u -dGraphicsAlphaBits=%u "-r%s" %s "-sOutputFile=%s" "%s""/>
XPSDelegate
WWWDecodeDelegate
WMFDecodeDelegate
-WEBPDelegate
UniconvertorDelegate
TXTDelegate
SCANDecodeDelegate
WMF_LIBS
WMF_DELEGATE_FALSE
WMF_DELEGATE_TRUE
+WEBP_LIBS
+WEBP_DELEGATE_FALSE
+WEBP_DELEGATE_TRUE
TIFF_LIBS
TIFF_DELEGATE_FALSE
TIFF_DELEGATE_TRUE
with_png
with_rsvg
with_tiff
+with_webp
with_windows_font_dir
with_wmf
with_xml
--without-png disable PNG support
--without-rsvg disable RSVG support
--without-tiff disable TIFF support
+ --without-webp disable WEBP support
--with-windows-font-dir=DIR
directory containing MS-Windows fonts
--without-wmf disable WMF support
+#
+# Check for WEBP delegate library.
+#
+
+# Check whether --with-webp was given.
+if test "${with_webp+set}" = set; then :
+ withval=$with_webp; with_webp=$withval
+else
+ with_webp='yes'
+fi
+
+
+if test "$with_webp" != 'yes'; then
+ DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-webp=$with_webp "
+fi
+
+have_webp='no'
+WEBP_LIBS=''
+if test "$with_webp" != 'no'; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5
+$as_echo "-------------------------------------------------------------" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WEBP" >&5
+$as_echo_n "checking for WEBP... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+ failed=0
+ passed=0
+ ac_fn_c_check_header_mongrel "$LINENO" "webp/decode.h" "ac_cv_header_webp_decode_h" "$ac_includes_default"
+if test "x$ac_cv_header_webp_decode_h" = xyes; then :
+ passed=`expr $passed + 1`
+else
+ failed=`expr $failed + 1`
+fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WebPDecodeRGB in -lwebp" >&5
+$as_echo_n "checking for WebPDecodeRGB in -lwebp... " >&6; }
+if ${ac_cv_lib_webp_WebPDecodeRGB+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lwebp $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char WebPDecodeRGB ();
+int
+main ()
+{
+return WebPDecodeRGB ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_webp_WebPDecodeRGB=yes
+else
+ ac_cv_lib_webp_WebPDecodeRGB=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_webp_WebPDecodeRGB" >&5
+$as_echo "$ac_cv_lib_webp_WebPDecodeRGB" >&6; }
+if test "x$ac_cv_lib_webp_WebPDecodeRGB" = xyes; then :
+ passed=`expr $passed + 1`
+else
+ failed=`expr $failed + 1`
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if WEBP package is complete" >&5
+$as_echo_n "checking if WEBP package is complete... " >&6; }
+ if test $passed -gt 0; then
+ if test $failed -gt 0; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5
+$as_echo "no -- some components failed test" >&6; }
+ have_webp='no (failed tests)'
+ else
+ WEBP_LIBS='-lwebp'
+ LIBS="$WEBP_LIBS $LIBS"
+
+$as_echo "#define WEBP_DELEGATE 1" >>confdefs.h
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ have_webp='yes'
+ fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+fi
+ if test "$have_webp" = 'yes'; then
+ WEBP_DELEGATE_TRUE=
+ WEBP_DELEGATE_FALSE='#'
+else
+ WEBP_DELEGATE_TRUE='#'
+ WEBP_DELEGATE_FALSE=
+fi
+
+
+
+
#
# Set Windows font directory.
#
SCANDecodeDelegateDefault='scanimage'
TXTDelegateDefault='enscript'
UniconvertorDelegateDefault='uniconvertor'
-WEBPDelegateDefault='webpconv'
WMFDecodeDelegateDefault='wmf2eps'
WWWDecodeDelegateDefault='curl'
XPSDelegateDefault='gxps'
fi
-# Extract the first word of ""$WEBPDelegateDefault"", so it can be a program name with args.
-set dummy "$WEBPDelegateDefault"; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_WEBPDelegate+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $WEBPDelegate in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_WEBPDelegate="$WEBPDelegate" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_WEBPDelegate="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_WEBPDelegate" && ac_cv_path_WEBPDelegate=""$WEBPDelegateDefault""
- ;;
-esac
-fi
-WEBPDelegate=$ac_cv_path_WEBPDelegate
-if test -n "$WEBPDelegate"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WEBPDelegate" >&5
-$as_echo "$WEBPDelegate" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
# Extract the first word of ""$WMFDecodeDelegateDefault"", so it can be a program name with args.
set dummy "$WMFDecodeDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
ShowImageDelegate="$ShowImageDelegateDefault"
TXTDelegate="$TXTDelegateDefault"
UniconvertorDelegate="$UniconvertorDelegateDefault"
- WEBPDelegate="$WEBPDelegateDefault"
WMFDecodeDelegate="$WMFDecodeDelegateDefault"
WWWDecodeDelegate="$WWWDecodeDelegateDefault"
XPSDelegate="$XPSDelegateDefault"
-
#
if test "$with_modules" != 'no'; then
MAGICK_DEP_LIBS="$LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS"
else
- MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS"
+ MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS"
fi
as_fn_error $? "conditional \"TIFF_DELEGATE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${WEBP_DELEGATE_TRUE}" && test -z "${WEBP_DELEGATE_FALSE}"; then
+ as_fn_error $? "conditional \"WEBP_DELEGATE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${WMF_DELEGATE_TRUE}" && test -z "${WMF_DELEGATE_FALSE}"; then
as_fn_error $? "conditional \"WMF_DELEGATE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
PNG --with-png=$with_png $have_png
RSVG --with-rsvg=$with_rsvg $have_rsvg
TIFF --with-tiff=$with_tiff $have_tiff
+WEBP --with-webp=$with_webp $have_webp
Windows fonts --with-windows-font-dir=$with_windows_font_dir $result_windows_font_dir
WMF --with-wmf=$with_wmf $have_wmf
X11 --with-x=$with_x $have_x
PNG --with-png=$with_png $have_png
RSVG --with-rsvg=$with_rsvg $have_rsvg
TIFF --with-tiff=$with_tiff $have_tiff
+WEBP --with-webp=$with_webp $have_webp
Windows fonts --with-windows-font-dir=$with_windows_font_dir $result_windows_font_dir
WMF --with-wmf=$with_wmf $have_wmf
X11 --with-x=$with_x $have_x
dnl ===========================================================================
+#
+# Check for WEBP delegate library.
+#
+AC_ARG_WITH(webp,
+ [AC_HELP_STRING([--without-webp],
+ [disable WEBP support])],
+ [with_webp=$withval],
+ [with_webp='yes'])
+
+if test "$with_webp" != 'yes'; then
+ DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-webp=$with_webp "
+fi
+
+have_webp='no'
+WEBP_LIBS=''
+if test "$with_webp" != 'no'; then
+ AC_MSG_RESULT([-------------------------------------------------------------])
+ AC_MSG_CHECKING([for WEBP])
+ AC_MSG_RESULT([])
+ failed=0
+ passed=0
+ AC_CHECK_HEADER(webp/decode.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+ AC_CHECK_LIB(webp,WebPDecodeRGB,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+ AC_MSG_CHECKING([if WEBP package is complete])
+ if test $passed -gt 0; then
+ if test $failed -gt 0; then
+ AC_MSG_RESULT([no -- some components failed test])
+ have_webp='no (failed tests)'
+ else
+ WEBP_LIBS='-lwebp'
+ LIBS="$WEBP_LIBS $LIBS"
+ AC_DEFINE(WEBP_DELEGATE,1,Define if you have WEBP library)
+ AC_MSG_RESULT([yes])
+ have_webp='yes'
+ fi
+ else
+ AC_MSG_RESULT([no])
+ fi
+fi
+AM_CONDITIONAL(WEBP_DELEGATE,test "$have_webp" = 'yes')
+AC_SUBST(WEBP_LIBS)
+
+dnl ===========================================================================
+
#
# Set Windows font directory.
#
SCANDecodeDelegateDefault='scanimage'
TXTDelegateDefault='enscript'
UniconvertorDelegateDefault='uniconvertor'
-WEBPDelegateDefault='webpconv'
WMFDecodeDelegateDefault='wmf2eps'
WWWDecodeDelegateDefault='curl'
XPSDelegateDefault='gxps'
AC_PATH_PROG(SCANDecodeDelegate, "$SCANDecodeDelegateDefault", "$SCANDecodeDelegateDefault")
AC_PATH_PROG(TXTDelegate, "$TXTDelegateDefault", "$TXTDelegateDefault")
AC_PATH_PROG(UniconvertorDelegate, "$UniconvertorDelegateDefault", "$UniconvertorDelegateDefault")
-AC_PATH_PROG(WEBPDelegate, "$WEBPDelegateDefault", "$WEBPDelegateDefault")
AC_PATH_PROG(WMFDecodeDelegate, "$WMFDecodeDelegateDefault", "$WMFDecodeDelegateDefault")
AC_PATH_PROG(WWWDecodeDelegate, "$WWWDecodeDelegateDefault", "$WWWDecodeDelegateDefault")
AC_PATH_PROG(XPSDelegate, "$XPSDelegateDefault", "$XPSDelegateDefault")
ShowImageDelegate="$ShowImageDelegateDefault"
TXTDelegate="$TXTDelegateDefault"
UniconvertorDelegate="$UniconvertorDelegateDefault"
- WEBPDelegate="$WEBPDelegateDefault"
WMFDecodeDelegate="$WMFDecodeDelegateDefault"
WWWDecodeDelegate="$WWWDecodeDelegateDefault"
XPSDelegate="$XPSDelegateDefault"
AC_SUBST(ShowImageDelegate)
AC_SUBST(TXTDelegate)
AC_SUBST(UniconvertorDelegate)
-AC_SUBST(WEBPDelegate)
AC_SUBST(WMFDecodeDelegate)
AC_SUBST(WWWDecodeDelegate)
AC_SUBST(XPSDelegate)
if test "$with_modules" != 'no'; then
MAGICK_DEP_LIBS="$LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS"
else
- MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS"
+ MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS"
fi
AC_SUBST(MAGICK_DEP_LIBS)
PNG --with-png=$with_png $have_png
RSVG --with-rsvg=$with_rsvg $have_rsvg
TIFF --with-tiff=$with_tiff $have_tiff
+WEBP --with-webp=$with_webp $have_webp
Windows fonts --with-windows-font-dir=$with_windows_font_dir $result_windows_font_dir
WMF --with-wmf=$with_wmf $have_wmf
X11 --with-x=$with_x $have_x
LTCC="gcc -std=gnu99 -std=gnu99"
# LTCC compiler flags.
-LTCFLAGS="-fopenmp -g -O2 -Wall -pthread"
+LTCFLAGS="-fopenmp -I/usr/include/python3.1 -Wall -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' | sed '/ __gnu_lto/d'"
predep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.6.0/../../../../lib64/crti.o /usr/lib/gcc/x86_64-redhat-linux/4.6.0/crtbeginS.o"
postdep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.6.0/crtendS.o /usr/lib/gcc/x86_64-redhat-linux/4.6.0/../../../../lib64/crtn.o"
predeps=""
-postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s"
+postdeps="-lstdc++ -lm -lgcc_s -lpthread -lc -lgcc_s"
# The library search path used internally by the compiler when linking
# a shared library.
Description: ImageMagick - Convert, Edit, and Compose Images
Version: 6.6.8
Libs: -L${libdir} -lMagickCore
-Cflags: -I${includedir}
+Cflags: -I${includedir} -fopenmp
echo '6.6.8 Q16 '
;;
--cflags)
- echo "-I${includedir} "
+ echo "-I${includedir} -fopenmp"
;;
--cxxflags)
- echo '-g -O2'
+ echo '-g -O2 -pthread'
;;
--cppflags)
echo '-I/usr/local/include/ImageMagick'
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
% %
+% %
% M M AAA GGGG IIIII CCCC %
% MM MM A A G I C %
% M M M AAAAA G GGG I C %
#endif
+/* Define if you have WEBP library */
+/* #undef WEBP_DELEGATE */
+
/* Define to use the Windows GDI32 library */
/* #undef WINGDI32_DELEGATE */
(void) RegisterVIDImage();
(void) RegisterVIFFImage();
(void) RegisterWBMPImage();
+#if defined(MAGICKCORE_WEBP_DELEGATE)
+ (void) RegisterWEBPImage();
+#endif
#if defined(MAGICKCORE_WMF_DELEGATE) || defined(MAGICKCORE_WMFLITE_DELEGATE)
(void) RegisterWMFImage();
#endif
UnregisterVIDImage();
UnregisterVIFFImage();
UnregisterWBMPImage();
+#if defined(MAGICKCORE_WEBP_DELEGATE)
+ UnregisterWEBPImage();
+#endif
#if defined(MAGICKCORE_WMF_DELEGATE) || defined(MAGICKCORE_WMFLITE_DELEGATE)
UnregisterWMFImage();
#endif
RegisterVIFFImage(void),
RegisterVSTImage(void),
RegisterWBMPImage(void),
+ RegisterWEBPImage(void),
RegisterWMFImage(void),
RegisterWPGImage(void),
RegisterXImage(void),
UnregisterVIFFImage(void),
UnregisterVSTImage(void),
UnregisterWBMPImage(void),
+ UnregisterWEBPImage(void),
UnregisterWMFImage(void),
UnregisterWPGImage(void),
UnregisterXImage(void),
#define MagickLibAddendum "-5"
#define MagickLibInterface 4
#define MagickLibMinInterface 4
-#define MagickReleaseDate "2011-03-12"
+#define MagickReleaseDate "2011-03-13"
#define MagickChangeDate "20110311"
#define MagickAuthoritativeURL "http://www.imagemagick.org"
#if defined(MAGICKCORE_OPENMP_SUPPORT)
echo '6.6.8 Q16 '
;;
--cflags)
- echo "-I${includedir} "
+ echo "-I${includedir} -fopenmp"
;;
--cxxflags)
- echo '-g -O2'
+ echo '-g -O2 -pthread'
;;
--cppflags)
echo '-I/usr/local/include/ImageMagick'
Description: MagickWand - C API for ImageMagick
Requires: ImageMagick
Libs: -L${libdir} -lMagickWand -lMagickCore
-Cflags: -I${includedir}
+Cflags: -I${includedir} -fopenmp
projects / imagemagick / commitdiff