From: cristy Date: Sun, 12 Jan 2014 22:52:25 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~2890 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a8940fda5dbd6f518aca7555a8b8ca534fc65cb9;p=imagemagick --- diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h index 553adaaed..b390b47e2 100644 --- a/MagickCore/magick-baseconfig.h +++ b/MagickCore/magick-baseconfig.h @@ -1113,7 +1113,9 @@ #endif /* Define if you have OPENJP2 library */ -/* #undef LIBOPENJP2_DELEGATE */ +#ifndef MAGICKCORE_LIBOPENJP2_DELEGATE +#define MAGICKCORE_LIBOPENJP2_DELEGATE 1 +#endif /* Directory where architecture-dependent files live. */ #ifndef MAGICKCORE_LIBRARY_PATH diff --git a/MagickCore/version.h b/MagickCore/version.h index b0f439d71..daf622c05 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,7 +27,7 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2014 ImageMagick Studio LLC" -#define MagickSVNRevision "14247:14282M" +#define MagickSVNRevision "14346:14360M" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 1,0,0 @@ -48,11 +48,11 @@ extern "C" { #define MagickppLibAddendum "-0" #define MagickppLibInterface 1 #define MagickppLibMinInterface 1 -#define MagickReleaseDate "2014-01-09" +#define MagickReleaseDate "2014-01-12" #define MagickChangeDate "20120427" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickFeatures "DPC HDRI OpenMP" -#define MagickDelegates "bzlib djvu mpeg fftw fpx fontconfig freetype jng jpeg lcms lzma openexr pango png ps tiff webp x xml zlib" +#define MagickDelegates "bzlib djvu mpeg fftw fpx fontconfig freetype jng jpeg lcms lzma openexr openjp2 pango png ps tiff webp x xml zlib" #define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-7/index.html" #if (MAGICKCORE_QUANTUM_DEPTH == 8) #define MagickQuantumDepth "Q8" diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL index f5b1b7eea..aef191a47 100644 --- a/PerlMagick/Makefile.PL +++ b/PerlMagick/Makefile.PL @@ -163,7 +163,7 @@ foreach my $delegate (@tested_delegates) { # defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile my $INC_magick = '-I../ -I.. -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/libdrm -I/usr/include/libpng16 -I/usr/include/freetype2 -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16 -I/usr/include/libxml2 -I"' . $Config{'usrinc'} . '/ImageMagick"'; my $LIBS_magick = '-L../MagickCore/.libs -lMagickCore-7.Q16HDRI -lperl -lm'; -my $CCFLAGS_magick = "$Config{'ccflags'} -pthread -I/usr/include/OpenEXR -I/usr/include/libdrm -I/usr/include/freetype2 -fopenmp -g -O2 -Wall -fexceptions -pthread -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16"; +my $CCFLAGS_magick = "$Config{'ccflags'} -pthread -I/usr/include/OpenEXR -I/usr/include/libdrm -I/usr/local/include/openjpeg-2.0 -I/usr/include/freetype2 -fopenmp -g -O2 -Wall -fexceptions -pthread -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16"; my $LDFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-7.Q16HDRI $Config{'ldflags'} "; my $LDDLFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-7.Q16HDRI $Config{'lddlflags'} "; diff --git a/configure b/configure index 7e542cdbb..8b084b541 100755 --- a/configure +++ b/configure @@ -3698,7 +3698,7 @@ MAGICK_PATCHLEVEL_VERSION=0 MAGICK_VERSION=7.0.0-0 -MAGICK_SVN_REVISION=14247:14282M +MAGICK_SVN_REVISION=14346:14360M # Substitute library versioning @@ -26188,7 +26188,7 @@ if test "$enable_delegate_build" != 'no'; then # Most delegates have includes in the same directory as the library, but not all... # # Includes - for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper/include jbig/libjbig jpeg lcms/include lzma magick mupdf png tiff/libtiff ttf/include wand webp/src wmf/include xml/include zlib; do + for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper/include jbig/libjbig jpeg lcms/include lzma magick mupdf openjp2/include png tiff/libtiff ttf/include wand webp/src wmf/include xml/include zlib; do if test -d "$builddir/$dir"; then CPPFLAGS="$CPPFLAGS -I$builddir/$dir" else @@ -26199,7 +26199,7 @@ if test "$enable_delegate_build" != 'no'; then done # Libraries - for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper jbig/libjbig jpeg lcms/src lzma magick mupdf png tiff/libtiff ttf/objs wand webp wmf/src xml zlib; do + for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper jbig/libjbig jpeg lcms/src lzma magick mupdf openjp2 png tiff/libtiff ttf/objs wand webp wmf/src xml zlib; do if test -d "$builddir/$dir/.libs"; then LDFLAGS="$LDFLAGS -L$builddir/$dir/.libs" else diff --git a/configure.ac b/configure.ac index 097d1d66f..5f977d97b 100755 --- a/configure.ac +++ b/configure.ac @@ -1303,7 +1303,7 @@ if test "$enable_delegate_build" != 'no'; then # Most delegates have includes in the same directory as the library, but not all... # # Includes - for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper/include jbig/libjbig jpeg lcms/include lzma magick mupdf png tiff/libtiff ttf/include wand webp/src wmf/include xml/include zlib; do + for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper/include jbig/libjbig jpeg lcms/include lzma magick mupdf openjp2/include png tiff/libtiff ttf/include wand webp/src wmf/include xml/include zlib; do if test -d "$builddir/$dir"; then CPPFLAGS="$CPPFLAGS -I$builddir/$dir" else @@ -1314,7 +1314,7 @@ if test "$enable_delegate_build" != 'no'; then done # Libraries - for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper jbig/libjbig jpeg lcms/src lzma magick mupdf png tiff/libtiff ttf/objs wand webp wmf/src xml zlib; do + for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper jbig/libjbig jpeg lcms/src lzma magick mupdf openjp2 png tiff/libtiff ttf/objs wand webp wmf/src xml zlib; do if test -d "$builddir/$dir/.libs"; then LDFLAGS="$LDFLAGS -L$builddir/$dir/.libs" else