From: cristy Date: Sat, 17 Apr 2010 01:47:28 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~9628 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3225a07c4cfb8c4232557da0c41b08a3a6ce442b;p=imagemagick --- diff --git a/ImageMagick.spec b/ImageMagick.spec index ebaacd088..b92e2f548 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %define VERSION 6.6.1 -%define Patchlevel 4 +%define Patchlevel 5 Name: ImageMagick Version: %{VERSION} diff --git a/Magick++/lib/CoderInfo.cpp b/Magick++/lib/CoderInfo.cpp index 4083e82a9..9d085566f 100644 --- a/Magick++/lib/CoderInfo.cpp +++ b/Magick++/lib/CoderInfo.cpp @@ -6,7 +6,7 @@ // #define MAGICKCORE_IMPLEMENTATION 1 -#define MAGICK_PLUSPLUS_IMPLEMENTATION 1 +#define MAGICK_PLUSPLUS_IMPLEMENTATION 1 #include "Magick++/Include.h" #include "Magick++/CoderInfo.h" @@ -14,6 +14,26 @@ using namespace std; +// Default constructor +Magick::CoderInfo::CoderInfo ( void ) + : _name(), + _description(), + _isReadable(false), + _isWritable(false), + _isMultiFrame(false) +{ +} + +// Copy constructor +Magick::CoderInfo::CoderInfo ( const Magick::CoderInfo &coder_ ) +{ + _name = coder_._name; + _description = coder_._description; + _isReadable = coder_._isReadable; + _isWritable = coder_._isWritable; + _isMultiFrame = coder_._isMultiFrame; +} + Magick::CoderInfo::CoderInfo ( const std::string &name_ ) : _name(), _description(), @@ -75,6 +95,21 @@ bool Magick::CoderInfo::isMultiFrame( void ) const return _isMultiFrame; } +// Assignment operator +Magick::CoderInfo& Magick::CoderInfo::operator= (const CoderInfo &coder_ ) +{ + // If not being set to ourself + if (this != &coder_) + { + _name = coder_._name; + _description = coder_._description; + _isReadable = coder_._isReadable; + _isWritable = coder_._isWritable; + _isMultiFrame = coder_._isMultiFrame; + } + return *this; +} + // Construct from MagickCore::MagickInfo* Magick::CoderInfo::CoderInfo ( const MagickCore::MagickInfo *magickInfo_ ) : _name(string(magickInfo_->name ? magickInfo_->name : "")), @@ -85,4 +120,3 @@ Magick::CoderInfo::CoderInfo ( const MagickCore::MagickInfo *magickInfo_ ) { // Nothing more to do } - diff --git a/Magick++/lib/Magick++/CoderInfo.h b/Magick++/lib/Magick++/CoderInfo.h index fe67249fa..ce6cfe4e2 100644 --- a/Magick++/lib/Magick++/CoderInfo.h +++ b/Magick++/lib/Magick++/CoderInfo.h @@ -1,6 +1,6 @@ // This may look like C code, but it is really -*- C++ -*- // -// Copyright Bob Friesenhahn, 2001, 2002, 2003 +// Copyright Bob Friesenhahn, 2001, 2002 // // CoderInfo Definition // @@ -8,7 +8,7 @@ // #if !defined (Magick_CoderInfo_header) -#define Magick_CoderInfo_header +#define Magick_CoderInfo_header 1 #include "Magick++/Include.h" #include @@ -25,7 +25,16 @@ namespace Magick FalseMatch // match coder if false }; + // Default constructor + CoderInfo ( void ); + + // Copy constructor + CoderInfo ( const CoderInfo &coder_ ); + + // Construct with coder name CoderInfo ( const std::string &name_ ); + + // Destructor ~CoderInfo ( void ); // Format name @@ -43,6 +52,9 @@ namespace Magick // Format supports multiple frames bool isMultiFrame( void ) const; + // Assignment operator + CoderInfo& operator= (const CoderInfo &coder_ ); + // // Implemementation methods // @@ -50,15 +62,6 @@ namespace Magick private: - // Default constructor (not supported) - CoderInfo ( void ); - - // Copy constructor (not supported) - // CoderInfo ( const CoderInfo &coder_ ); - - // Assignment operator (not supported) - CoderInfo& operator= (const CoderInfo &coder_ ); - std::string _name; std::string _description; bool _isReadable; diff --git a/Makefile.am b/Makefile.am index c6ca184b7..a16ed339c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -324,8 +324,8 @@ $(DIST_ARCHIVE_SRPM) srpm: dist-bzip2 @echo $(DIST_ARCHIVE_SRPM) is ready for distribution. @echo ============================================================== -RPMDIR=redhat -RPMARCH=i386 +RPMDIR=rpmbuild +RPMARCH=$(MAGICK_TARGET_CPU) DIST_ARCHIVE_RPM= \ $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \ diff --git a/Makefile.in b/Makefile.in index 9e0e0aea2..b552d6776 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2357,6 +2357,9 @@ MAGICK_LIB_VERSION_NUMBER = @MAGICK_LIB_VERSION_NUMBER@ MAGICK_LIB_VERSION_TEXT = @MAGICK_LIB_VERSION_TEXT@ MAGICK_LTDLDEPS = @MAGICK_LTDLDEPS@ MAGICK_PCFLAGS = @MAGICK_PCFLAGS@ +MAGICK_TARGET_CPU = @MAGICK_TARGET_CPU@ +MAGICK_TARGET_OS = @MAGICK_TARGET_OS@ +MAGICK_TARGET_VENDOR = @MAGICK_TARGET_VENDOR@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANDelegate = @MANDelegate@ @@ -4611,8 +4614,8 @@ HTML_UNINSTALL_DATA_TARGETS = uninstall-data-html # RPM build support # @RPM_DELEGATE_TRUE@DIST_ARCHIVE_SRPM = $(distdir).src.rpm -@RPM_DELEGATE_TRUE@RPMDIR = redhat -@RPM_DELEGATE_TRUE@RPMARCH = i386 +@RPM_DELEGATE_TRUE@RPMDIR = rpmbuild +@RPM_DELEGATE_TRUE@RPMARCH = $(MAGICK_TARGET_CPU) @RPM_DELEGATE_FALSE@DIST_ARCHIVE_RPM = @RPM_DELEGATE_TRUE@DIST_ARCHIVE_RPM = \ @RPM_DELEGATE_TRUE@ $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \ diff --git a/PerlMagick/Makefile.am b/PerlMagick/Makefile.am index 20aafb3a3..c4dbadc82 100644 --- a/PerlMagick/Makefile.am +++ b/PerlMagick/Makefile.am @@ -50,8 +50,7 @@ $(PERLMAKEFILE): perl-sources $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEMA install-exec-perl: $(PERLMAKEFILE) ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \ - $(MAKE) CC='@CC@' install && \ - $(MAKE) clean && rm -f Makefile.old ) + $(MAKE) CC='@CC@' install ) all-perl: perl-sources diff --git a/config/configure.xml b/config/configure.xml index 80afca39f..a4d968012 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,7 +8,7 @@ - + diff --git a/configure b/configure index f3e1b91e7..7303eb0ea 100755 --- a/configure +++ b/configure @@ -1127,6 +1127,9 @@ MAGICK_LIBRARY_CURRENT_MIN MAGICK_LIBRARY_AGE MAGICK_LIBRARY_REVISION MAGICK_LIBRARY_CURRENT +MAGICK_TARGET_OS +MAGICK_TARGET_VENDOR +MAGICK_TARGET_CPU target_os target_vendor target_cpu @@ -3478,6 +3481,15 @@ test -n "$target_alias" && +MAGICK_TARGET_CPU=$target_cpu + + +MAGICK_TARGET_VENDOR=$target_vendor + + +MAGICK_TARGET_OS=$target_os + + # Substitute library versioning MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE` @@ -9191,13 +9203,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:9194: $ac_compile\"" >&5) + (eval echo "\"\$as_me:9206: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:9197: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:9209: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:9200: output\"" >&5) + (eval echo "\"\$as_me:9212: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -10388,7 +10400,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 10391 "configure"' > conftest.$ac_ext + echo '#line 10403 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -12473,11 +12485,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:12476: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12488: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12480: \$? = $ac_status" >&5 + echo "$as_me:12492: \$? = $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. @@ -12812,11 +12824,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:12815: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12827: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12819: \$? = $ac_status" >&5 + echo "$as_me:12831: \$? = $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. @@ -12917,11 +12929,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:12920: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12932: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12924: \$? = $ac_status" >&5 + echo "$as_me:12936: \$? = $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 @@ -12972,11 +12984,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:12975: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12987: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12979: \$? = $ac_status" >&5 + echo "$as_me:12991: \$? = $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 @@ -15342,7 +15354,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 15345 "configure" +#line 15357 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15438,7 +15450,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 15441 "configure" +#line 15453 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -17394,11 +17406,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:17397: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17409: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17401: \$? = $ac_status" >&5 + echo "$as_me:17413: \$? = $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. @@ -17493,11 +17505,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:17496: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17508: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17500: \$? = $ac_status" >&5 + echo "$as_me:17512: \$? = $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 @@ -17545,11 +17557,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:17548: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17560: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17552: \$? = $ac_status" >&5 + echo "$as_me:17564: \$? = $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 @@ -18957,7 +18969,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18960 "configure" +#line 18972 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/configure.ac b/configure.ac index a958edf76..c8774d89a 100755 --- a/configure.ac +++ b/configure.ac @@ -88,6 +88,15 @@ AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_CANONICAL_TARGET([]) +MAGICK_TARGET_CPU=$target_cpu +AC_SUBST(MAGICK_TARGET_CPU) + +MAGICK_TARGET_VENDOR=$target_vendor +AC_SUBST(MAGICK_TARGET_VENDOR) + +MAGICK_TARGET_OS=$target_os +AC_SUBST(MAGICK_TARGET_OS) + # Substitute library versioning AC_SUBST(MAGICK_LIBRARY_CURRENT)dnl AC_SUBST(MAGICK_LIBRARY_REVISION)dnl diff --git a/libtool b/libtool index 9fd06a47d..76e04a984 100755 --- a/libtool +++ b/libtool @@ -1,7 +1,7 @@ #! /bin/sh # libtool - Provide generalized library-building support services. -# Generated automatically by config.status (ImageMagick) 6.6.1-4 +# Generated automatically by config.status (ImageMagick) 6.6.1-5 # Libtool was configured on host magick.imagemagick.org: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # diff --git a/magick/version.h b/magick/version.h index 40c8eba9c..2f24eeff0 100644 --- a/magick/version.h +++ b/magick/version.h @@ -30,7 +30,7 @@ extern "C" { #define MagickLibVersion 0x661 #define MagickLibVersionText "6.6.1" #define MagickLibVersionNumber 3,0,0 -#define MagickLibAddendum "-4" +#define MagickLibAddendum "-5" #define MagickLibInterface 3 #define MagickLibMinInterface 3 #define MagickReleaseDate "2010-04-16" diff --git a/version.sh b/version.sh index 3c14ebb80..a38aa0db4 100644 --- a/version.sh +++ b/version.sh @@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick' # PACKAGE_NAME (e.g. "1.0.0"). PACKAGE_VERSION='6.6.1' PACKAGE_LIB_VERSION="0x661" -PACKAGE_RELEASE="4" +PACKAGE_RELEASE="5" PACKAGE_LIB_VERSION_NUMBER="6,6,1,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE=`date +%F` PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION" diff --git a/www/ImageMagickObject.html b/www/ImageMagickObject.html index b8b5b7ea3..bd809ee8d 100644 --- a/www/ImageMagickObject.html +++ b/www/ImageMagickObject.html @@ -207,7 +207,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html index 2d2710fc7..58475d9fb 100644 --- a/www/advanced-unix-installation.html +++ b/www/advanced-unix-installation.html @@ -124,7 +124,7 @@