Changeset 7812

Timestamp:

05/06/12 14:59:24 (13 months ago)

Author:

cristy

Message:

 

Location:

ImageMagick/branches/ImageMagick-6

Files:

• ImageMagick.spec (modified) (1 diff)
• config/ImageMagick.rdf (modified) (1 diff)
• config/configure.xml (modified) (1 diff)
• configure (modified) (9 diffs)
• configure.ac (modified) (1 diff)
• libtool (modified) (1 diff)
• magick/cache.c (modified) (1 diff)
• magick/magick-config.h (modified) (3 diffs)
• magick/version.h (modified) (1 diff)
• version.sh (modified) (1 diff)

ImageMagick/branches/ImageMagick-6/ImageMagick.spec

@@ -1 +1 @@
 %global VERSION  6.7.6
-%global Patchlevel  10
+%global Patchlevel  9
 
 Name:           ImageMagick

ImageMagick/branches/ImageMagick-6/config/ImageMagick.rdf

@@ -60 +60 @@
           <created>2012-05-06</created>
           <revision>6.7.6</revision>
-          <patch-level>-10</patch-level>
+          <patch-level>-9</patch-level>
       </Version>
     </release>

ImageMagick/branches/ImageMagick-6/config/configure.xml

@@ -10 +10 @@
   <configure name="VERSION" value="6.7.6"/>
   <configure name="LIB_VERSION" value="0x676"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,7,6,10"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,7,6,9"/>
   <configure name="SVN_REVISION" value="7797" />
   <configure name="RELEASE_DATE" value="2012-05-06"/>

ImageMagick/branches/ImageMagick-6/configure

@@ -1 +1 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for ImageMagick 6.7.6-10.
+# Generated by GNU Autoconf 2.68 for ImageMagick 6.7.6-9.
 #
 # Report bugs to <http://www.imagemagick.org>.
@@ -575 +575 @@
 PACKAGE_NAME='ImageMagick'
 PACKAGE_TARNAME='ImageMagick'
-PACKAGE_VERSION='6.7.6-10'
-PACKAGE_STRING='ImageMagick 6.7.6-10'
+PACKAGE_VERSION='6.7.6-9'
+PACKAGE_STRING='ImageMagick 6.7.6-9'
 PACKAGE_BUGREPORT='http://www.imagemagick.org'
 PACKAGE_URL=''
@@ -1741 +1741 @@
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ImageMagick 6.7.6-10 to adapt to many kinds of systems.
+\`configure' configures ImageMagick 6.7.6-9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1816 +1816 @@
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ImageMagick 6.7.6-10:";;
+     short | recursive ) echo "Configuration of ImageMagick 6.7.6-9:";;
    esac
   cat <<\_ACEOF
@@ -2036 +2036 @@
 if $ac_init_version; then
   cat <<\_ACEOF
-ImageMagick configure 6.7.6-10
+ImageMagick configure 6.7.6-9
 generated by GNU Autoconf 2.68
 
@@ -3079 +3079 @@
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ImageMagick $as_me 6.7.6-10, which was
+It was created by ImageMagick $as_me 6.7.6-9, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
@@ -4102 +4102 @@
 # Define the identity of the package.
  PACKAGE='ImageMagick'
- VERSION='6.7.6-10'
+ VERSION='6.7.6-9'
 
 
@@ -36483 +36483 @@
 # values after options handling.
 ac_log="
-This file was extended by ImageMagick $as_me 6.7.6-10, which was
+This file was extended by ImageMagick $as_me 6.7.6-9, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
@@ -36549 +36549 @@
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ImageMagick config.status 6.7.6-10
+ImageMagick config.status 6.7.6-9
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"

ImageMagick/branches/ImageMagick-6/configure.ac

@@ -20 +20 @@
 m4_define([magick_minor_version], [7])
 m4_define([magick_micro_version], [6])
-m4_define([magick_patchlevel_version], [10])
+m4_define([magick_patchlevel_version], [9])
 m4_define([magick_version],
           [magick_major_version.magick_minor_version.magick_micro_version-magick_patchlevel_version])

ImageMagick/branches/ImageMagick-6/libtool

@@ -2 +2 @@
 
 # libtool - Provide generalized library-building support services.
-# Generated automatically by config.status (ImageMagick) 6.7.6-10
+# Generated automatically by config.status (ImageMagick) 6.7.6-9
 # Libtool was configured on host magick.imagemagick.org:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.

ImageMagick/branches/ImageMagick-6/magick/cache.c

@@ -1984 +1984 @@
       (image->columns != cache_info->columns) ||
       (image->rows != cache_info->rows) ||
-      (cache_info->nexus_info == (NexusInfo **) NULL) ||
-      (cache_info->number_threads < (size_t) GetMagickResourceLimit(ThreadResource)))
+      (cache_info->nexus_info == (NexusInfo **) NULL))
     return(MagickFalse);
   return(MagickTrue);

ImageMagick/branches/ImageMagick-6/magick/magick-config.h

@@ -1303 +1303 @@
 /* Define to the full name and version of this package. */
 #ifndef MAGICKCORE_PACKAGE_STRING
-#define MAGICKCORE_PACKAGE_STRING "ImageMagick 6.7.6-10"
+#define MAGICKCORE_PACKAGE_STRING "ImageMagick 6.7.6-9"
 #endif
 
@@ -1318 +1318 @@
 /* Define to the version of this package. */
 #ifndef MAGICKCORE_PACKAGE_VERSION
-#define MAGICKCORE_PACKAGE_VERSION "6.7.6-10"
+#define MAGICKCORE_PACKAGE_VERSION "6.7.6-9"
 #endif
 
@@ -1508 +1508 @@
 /* Version number of package */
 #ifndef MAGICKCORE_VERSION
-#define MAGICKCORE_VERSION "6.7.6-10"
+#define MAGICKCORE_VERSION "6.7.6-9"
 #endif
 

ImageMagick/branches/ImageMagick-6/magick/version.h

@@ -32 +32 @@
 #define MagickLibVersionText  "6.7.6"
 #define MagickLibVersionNumber  5,0,0
-#define MagickLibAddendum  "-10"
+#define MagickLibAddendum  "-9"
 #define MagickLibInterface  5
 #define MagickLibMinInterface  5

ImageMagick/branches/ImageMagick-6/version.sh

@@ -14 +14 @@
 PACKAGE_PERL_VERSION='6.76'
 PACKAGE_LIB_VERSION="0x676"
-PACKAGE_RELEASE="10"
+PACKAGE_RELEASE="9"
 PACKAGE_LIB_VERSION_NUMBER="6,7,6,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE=`date +%F`