From 1b70dc80d997905dc871a92df0243e1493e933e5 Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 1 Jul 2012 23:15:05 +0000 Subject: [PATCH] --- MagickCore/magick-config.h | 4 +--- MagickCore/version.h | 4 ++-- PerlMagick/Makefile.PL | 4 ++-- coders/pdf.c | 22 +++++++++++++++++----- config/ImageMagick.rdf | 4 ++-- config/configure.xml | 10 +++++----- configure | 6 +++--- libtool | 10 +++++----- 8 files changed, 37 insertions(+), 27 deletions(-) diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h index db7b2c9f6..cbfdc8806 100644 --- a/MagickCore/magick-config.h +++ b/MagickCore/magick-config.h @@ -106,9 +106,7 @@ /* #undef GS_DELEGATE */ /* Define if you have GVC library */ -#ifndef MAGICKCORE_GVC_DELEGATE -#define MAGICKCORE_GVC_DELEGATE 1 -#endif +/* #undef GVC_DELEGATE */ /* Define to 1 if you have the `acosh' function. */ #ifndef MAGICKCORE_HAVE_ACOSH diff --git a/MagickCore/version.h b/MagickCore/version.h index a4d56c7e9..0f87ea567 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,14 +27,14 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2012 ImageMagick Studio LLC" -#define MagickSVNRevision "8354" +#define MagickSVNRevision "8543" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 7,0,0 #define MagickLibAddendum "-0" #define MagickLibInterface 7 #define MagickLibMinInterface 7 -#define MagickReleaseDate "2012-06-27" +#define MagickReleaseDate "2012-07-01" #define MagickChangeDate "20110801" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL index 673e1c2d3..b7b9027fe 100644 --- a/PerlMagick/Makefile.PL +++ b/PerlMagick/Makefile.PL @@ -156,7 +156,7 @@ foreach my $delegate (@tested_delegates) { } # defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile -my $INC_magick = '-I../ -I.. -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/libpng15 -pthread -I/usr/include/pango-1.0 -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/libpng15 -I/usr/include/graphviz -I/usr/include/freetype2 -I/usr/include/libxml2 -I"' . $Config{'usrinc'} . '/ImageMagick"'; +my $INC_magick = '-I../ -I.. -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/libpng15 -pthread -I/usr/include/pango-1.0 -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/libpng15 -I/usr/include/freetype2 -I/usr/include/libxml2 -I"' . $Config{'usrinc'} . '/ImageMagick"'; my $LIBS_magick = '-L../MagickCore/.libs -lMagickCore -lperl -lm'; my $CCFLAGS_magick = "$Config{'ccflags'} -pthread -I/usr/include/OpenEXR -fopenmp -g -O2 -Wall -pthread"; my $LDFLAGS_magick = "-L../MagickCore/.libs -lMagickCore $Config{'ldflags'} -L/usr/lib"; @@ -201,7 +201,7 @@ WriteMakefile #'CC' => 'gcc -std=gnu99 -std=gnu99', # C pre-processor flags (e.g. -I & -D options) - # 'CPPFLAGS' => "$Config{'cppflags'} -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/libpng15 -pthread -I/usr/include/pango-1.0 -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/libpng15 -I/usr/include/graphviz -I/usr/include/freetype2 -I/usr/include/libxml2", + # 'CPPFLAGS' => "$Config{'cppflags'} -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/libpng15 -pthread -I/usr/include/pango-1.0 -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/libpng15 -I/usr/include/freetype2 -I/usr/include/libxml2", # C compiler flags (e.g. -O -g) 'CCFLAGS' => $CCFLAGS_magick, diff --git a/coders/pdf.c b/coders/pdf.c index ef3aa13c2..3055eafc9 100644 --- a/coders/pdf.c +++ b/coders/pdf.c @@ -70,6 +70,7 @@ #include "MagickCore/quantum-private.h" #include "MagickCore/resource_.h" #include "MagickCore/resize.h" +#include "MagickCore/signature.h" #include "MagickCore/static.h" #include "MagickCore/string_.h" #include "MagickCore/module.h" @@ -954,6 +955,11 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image, " \n" " application/pdf\n" + " \n" + " \n" + " %s\n" + " \n" + " \n" " \n" " \n" @@ -966,7 +972,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image, " \n" " \n" - " 1\n" + " 2\n" " B\n" " \n" " \n" @@ -1116,6 +1122,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image, (void) WriteBlobString(image,"/Type /Catalog\n"); (void) WriteBlobString(image,">>\n"); (void) WriteBlobString(image,"endobj\n"); + GetPathComponent(image->filename,BasePath,basename); if (LocaleCompare(image_info->magick,"PDFA") == 0) { char @@ -1147,14 +1154,15 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image, (void) FormatMagickTime(time((time_t *) NULL),MaxTextExtent,timestamp); i=FormatLocaleString(xmp_profile,MaxTextExtent,XMPProfile, XMPProfileMagick,modify_date,create_date,timestamp, - GetMagickVersion(&version),GetMagickVersion(&version)); + GetMagickVersion(&version),EscapeParenthesis(basename), + GetMagickVersion(&version)); (void) FormatLocaleString(buffer,MaxTextExtent,"/Length %.20g\n",(double) i); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"/Type /Metadata\n"); (void) WriteBlobString(image,">>\nstream\n"); (void) WriteBlobString(image,xmp_profile); - (void) WriteBlobString(image,"endstream\n"); + (void) WriteBlobString(image,"\nendstream\n"); (void) WriteBlobString(image,"endobj\n"); } /* @@ -1414,7 +1422,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image, (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"Q\n"); offset=TellBlob(image)-offset; - (void) WriteBlobString(image,"endstream\n"); + (void) WriteBlobString(image,"\nendstream\n"); (void) WriteBlobString(image,"endobj\n"); /* Write Length object. @@ -2540,7 +2548,6 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image, object); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"<<\n"); - GetPathComponent(image->filename,BasePath,basename); (void) FormatLocaleString(buffer,MaxTextExtent,"/Title (%s)\n", EscapeParenthesis(basename)); (void) WriteBlobString(image,buffer); @@ -2589,6 +2596,11 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image, (void) FormatLocaleString(buffer,MaxTextExtent,"/Root %.20g 0 R\n",(double) root_id); (void) WriteBlobString(image,buffer); + (void) SignatureImage(image,exception); + (void) FormatLocaleString(buffer,MaxTextExtent,"/ID [<%s> <%s>]\n", + GetImageProperty(image,"signature",exception), + GetImageProperty(image,"signature",exception)); + (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,">>\n"); (void) WriteBlobString(image,"startxref\n"); (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double) offset); diff --git a/config/ImageMagick.rdf b/config/ImageMagick.rdf index 1fd05a311..47112509a 100644 --- a/config/ImageMagick.rdf +++ b/config/ImageMagick.rdf @@ -5,7 +5,7 @@ ImageMagick ImageMagick: convert, edit, and compose images. - 2012-06-27 + 2012-07-01 ImageMagick® is a software suite to create, edit, compose, or convert bitmap images. It can read and write images in a variety of formats (over 100) including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves. @@ -57,7 +57,7 @@ Examples of ImageMagick Usage shows how to use ImageMagick from the command-line stable - 2012-06-27 + 2012-07-01 7.0.0 -0 diff --git a/config/configure.xml b/config/configure.xml index 4ef67c782..08849ab5d 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,8 +10,8 @@ - - + + @@ -29,16 +29,16 @@ - + - + - + diff --git a/configure b/configure index 43bef49b6..8c45b57dc 100755 --- a/configure +++ b/configure @@ -1930,7 +1930,7 @@ Optional Packages: --without-gslib enable Ghostscript library support --with-fontpath=DIR prepend to default font search path --with-gs-font-dir=DIR Ghostscript font directory - --without-gvc disable GVC support + --with-gvc disable GVC support --without-jbig disable JBIG support --without-jpeg disable JPEG support --without-jp2 disable JPEG-2000 support @@ -3648,7 +3648,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE` MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE -MAGICK_SVN_REVISION=8354 +MAGICK_SVN_REVISION=8543 @@ -29809,7 +29809,7 @@ fi if test "${with_gvc+set}" = set; then : withval=$with_gvc; with_gvc=$withval else - with_gvc='yes' + with_gvc='no' fi diff --git a/libtool b/libtool index 2acdf2bde..046fd53c5 100755 --- a/libtool +++ b/libtool @@ -275,7 +275,7 @@ finish_eval="" hardcode_into_libs=yes # Compile-time system search path for libraries. -sys_lib_search_path_spec="/usr/lib/gcc/x86_64-redhat-linux/4.7.0 /usr/lib64 /lib64 " +sys_lib_search_path_spec="/usr/lib/gcc/x86_64-redhat-linux/4.7.1 /usr/lib64 /lib64 " # Run-time system search path for libraries. sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/atlas /usr/lib64/freetype-freeworld /usr/lib/llvm /usr/lib64/llvm /usr/local/lib /usr/lib64/mysql /usr/lib64/nvidia /usr/lib64/qt-3.3/lib /usr/lib64/tcl8.5/tclx8.4 /usr/lib64/tcl8.5 /usr/lib64/tracker-0.14 /usr/lib/wine/ /usr/lib64/wine/ /usr/lib64/xulrunner-2 " @@ -10227,17 +10227,17 @@ file_list_spec="" hardcode_action=immediate # The directories searched by this compiler when creating a shared library. -compiler_lib_search_dirs="/usr/lib/gcc/x86_64-redhat-linux/4.7.0 /usr/lib/gcc/x86_64-redhat-linux/4.7.0/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /usr/lib/gcc/x86_64-redhat-linux/4.7.0/../../.." +compiler_lib_search_dirs="/usr/lib/gcc/x86_64-redhat-linux/4.7.1 /usr/lib/gcc/x86_64-redhat-linux/4.7.1/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /usr/lib/gcc/x86_64-redhat-linux/4.7.1/../../.." # Dependencies to place before and after the objects being linked to # create a shared library. -predep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.7.0/../../../../lib64/crti.o /usr/lib/gcc/x86_64-redhat-linux/4.7.0/crtbeginS.o" -postdep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.7.0/crtendS.o /usr/lib/gcc/x86_64-redhat-linux/4.7.0/../../../../lib64/crtn.o" +predep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.7.1/../../../../lib64/crti.o /usr/lib/gcc/x86_64-redhat-linux/4.7.1/crtbeginS.o" +postdep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.7.1/crtendS.o /usr/lib/gcc/x86_64-redhat-linux/4.7.1/../../../../lib64/crtn.o" predeps="" postdeps="-lstdc++ -lm -lgcc_s -lpthread -lc -lgcc_s" # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path="-L/usr/lib/gcc/x86_64-redhat-linux/4.7.0 -L/usr/lib/gcc/x86_64-redhat-linux/4.7.0/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib/gcc/x86_64-redhat-linux/4.7.0/../../.." +compiler_lib_search_path="-L/usr/lib/gcc/x86_64-redhat-linux/4.7.1 -L/usr/lib/gcc/x86_64-redhat-linux/4.7.1/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib/gcc/x86_64-redhat-linux/4.7.1/../../.." # ### END LIBTOOL TAG CONFIG: CXX -- 2.50.1