(no commit message)

diff --git a/MagickCore/cache-view.c b/MagickCore/cache-view.c
index 5127bdb89e479e17d582b3cc435ce7687b4eddf3..84eecb1f1b860918010e19023e534befaf2e3477 100644 (file)
--- a/MagickCore/cache-view.c
+++ b/MagickCore/cache-view.c
@@ -160,7 +160,7 @@ MagickExport CacheView *AcquireVirtualCacheView(const Image *image,
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   (void) exception;
-  cache_view=(CacheView *) AcquireQuantumMemory(1,sizeof(*cache_view));
+  cache_view=(CacheView *) AcquireAlignedMemory(1,sizeof(*cache_view));
   if (cache_view == (CacheView *) NULL)
     ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
   (void) ResetMagickMemory(cache_view,0,sizeof(*cache_view));
@@ -207,7 +207,7 @@ MagickExport CacheView *CloneCacheView(const CacheView *cache_view)
   if (cache_view->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
       cache_view->image->filename);
-  clone_view=(CacheView *) AcquireQuantumMemory(1,sizeof(*clone_view));
+  clone_view=(CacheView *) AcquireAlignedMemory(1,sizeof(*clone_view));
   if (clone_view == (CacheView *) NULL)
     ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
   (void) ResetMagickMemory(clone_view,0,sizeof(*clone_view));
@@ -255,7 +255,7 @@ MagickExport CacheView *DestroyCacheView(CacheView *cache_view)
       cache_view->number_threads);
   cache_view->image=DestroyImage(cache_view->image);
   cache_view->signature=(~MagickSignature);
-  cache_view=(CacheView *) RelinquishMagickMemory(cache_view);
+  cache_view=(CacheView *) RelinquishAlignedMemory(cache_view);
   return(cache_view);
 }
 \f

diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index 05d3b0e4b84d32c68b290ff2b4ce11c80484f85f..8368f9364632b435d79f855fe9c8a8917690f930 100644 (file)
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -1271,6 +1271,21 @@
 /* Define to prepend to default font search path. */
 /* #undef MAGICK_FONT_PATH */
 
+/* Target Host CPU */
+#ifndef MAGICKCORE_MAGICK_TARGET_CPU
+#define MAGICKCORE_MAGICK_TARGET_CPU x86_64
+#endif
+
+/* Target Host OS */
+#ifndef MAGICKCORE_MAGICK_TARGET_OS
+#define MAGICKCORE_MAGICK_TARGET_OS linux-gnu
+#endif
+
+/* Target Host Vendor */
+#ifndef MAGICKCORE_MAGICK_TARGET_VENDOR
+#define MAGICKCORE_MAGICK_TARGET_VENDOR unknown
+#endif
+
 /* Magick API method prefix */
 /* #undef NAMESPACE_PREFIX */
 

diff --git a/MagickCore/memory.c b/MagickCore/memory.c
index 4b6f01ef1774e6990db73c820165d43dcbdbbc84..fa6bdcb89d4222e4933e07d86838136faf0ac68d 100644 (file)
--- a/MagickCore/memory.c
+++ b/MagickCore/memory.c
@@ -188,6 +188,9 @@ static MagickBooleanType
 */
 MagickExport void *AcquireAlignedMemory(const size_t count,const size_t quantum)
 {
+#define AlignedExtent(size,alignment) \
+  (((size)+((alignment)-1)) & ~((alignment)-1))
+
   size_t
     alignment,
     extent,
@@ -204,11 +207,11 @@ MagickExport void *AcquireAlignedMemory(const size_t count,const size_t quantum)
     }
   memory=NULL;
   alignment=CACHE_LINE_SIZE;
-  extent=(size+alignment-1)+sizeof(void *);
-  if ((size == 0) || (alignment < sizeof(void *)) || (extent <= size))
+  extent=AlignedExtent(size,alignment);
+  if ((size == 0) || (alignment < sizeof(void *)) || (extent < size))
     return((void *) NULL);
 #if defined(MAGICKCORE_HAVE_POSIX_MEMALIGN)
-  if (posix_memalign(&memory,alignment,size) != 0)
+  if (posix_memalign(&memory,alignment,extent) != 0)
     memory=NULL;
 #elif defined(MAGICKCORE_HAVE__ALIGNED_MALLOC)
   memory=_aligned_malloc(size,alignment);
@@ -217,12 +220,15 @@ MagickExport void *AcquireAlignedMemory(const size_t count,const size_t quantum)
     void
       *p;
 
-    p=malloc(extent);
-    if (p != NULL)
+    extent=(size+alignment-1)+sizeof(void *);
+    if (extent > size)
       {
-        memory=(void *) (((size_t) p+sizeof(void *)+alignment-1) &
-          ~(alignment-1));
-        *((void **) memory-1)=p;
+        p=malloc(extent);
+        if (p != NULL)
+          {
+            memory=(void *) AlignedExtent((size_t) p+sizeof(void *),alignment);
+            *((void **) memory-1)=p;
+          }
       }
   }
 #endif

diff --git a/MagickCore/semaphore.c b/MagickCore/semaphore.c
index 755f0c799f373f5f01eb97e7fff89990ef360db7..97b3aea0de2513106e2926d8ae04eaa2ac33bbfa 100644 (file)
--- a/MagickCore/semaphore.c
+++ b/MagickCore/semaphore.c
@@ -125,6 +125,9 @@ MagickExport void AcquireSemaphoreInfo(SemaphoreInfo **semaphore_info)
 
 static void *AcquireSemaphoreMemory(const size_t count,const size_t quantum)
 {
+#define AlignedExtent(size,alignment) \
+  (((size)+((alignment)-1)) & ~((alignment)-1))
+
   size_t
     alignment,
     extent,
@@ -141,11 +144,11 @@ static void *AcquireSemaphoreMemory(const size_t count,const size_t quantum)
     }
   memory=NULL;
   alignment=CACHE_LINE_SIZE;
-  extent=(size+alignment-1)+sizeof(void *);
-  if ((size == 0) || (alignment < sizeof(void *)) || (extent <= size))
+  extent=AlignedExtent(size,alignment);
+  if ((size == 0) || (alignment < sizeof(void *)) || (extent < size))
     return((void *) NULL);
 #if defined(MAGICKCORE_HAVE_POSIX_MEMALIGN)
-  if (posix_memalign(&memory,alignment,size) != 0)
+  if (posix_memalign(&memory,alignment,extent) != 0)
     memory=NULL;
 #elif defined(MAGICKCORE_HAVE__ALIGNED_MALLOC)
   memory=_aligned_malloc(size,alignment);
@@ -154,12 +157,15 @@ static void *AcquireSemaphoreMemory(const size_t count,const size_t quantum)
     void
       *p;
 
-    p=malloc(extent);
-    if (p != NULL)
+    extent=(size+alignment-1)+sizeof(void *);
+    if (extent > size)
       {
-        memory=(void *) (((size_t) p+sizeof(void *)+alignment-1) &
-          ~(alignment-1));
-        *((void **) memory-1)=p;
+        p=malloc(extent);
+        if (p != NULL)
+          {
+            memory=(void *) AlignedExtent((size_t) p+sizeof(void *),alignment);
+            *((void **) memory-1)=p;
+          }
       }
   }
 #endif

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 8924db8f301666876d0de33b006ddc434831d2db..9b7d08fdf0ecb764d1e2753228289af25d024974 100644 (file)
--- 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  "8726"
+#define MagickSVNRevision  "8756"
 #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-07-28"
+#define MagickReleaseDate  "2012-07-29"
 #define MagickChangeDate   "20110801"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/config/ImageMagick.rdf b/config/ImageMagick.rdf
index b08d55f4d53ec3ae122ceb1cdf163d790659237c..6aa2b3c3f353dcc2cd562f2f5952065f9fb56d3d 100644 (file)
--- a/config/ImageMagick.rdf
+++ b/config/ImageMagick.rdf
@@ -5,7 +5,7 @@
     <name>ImageMagick</name>
     <shortdesc xml:lang="en">ImageMagick: convert, edit, and compose images.</shortdesc>
     <homepage rdf:resource="http://www.imagemagick.org/"/>
-    <created>2012-07-28</created>
+    <created>2012-07-29</created>
 
     <description xml:lang="en">
 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
     <release>
       <Version>
           <name>stable</name>
-          <created>2012-07-28</created>
+          <created>2012-07-29</created>
           <revision>7.0.0</revision>
           <patch-level>-0</patch-level>
       </Version>

diff --git a/config/config.h.in b/config/config.h.in
index 314b78a3dcd04d426081c85648a995fa0217929f..47874f163c16a62e4015fb25d8c2491833c6e55c 100644 (file)
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -836,6 +836,15 @@
 /* Define to prepend to default font search path. */
 #undef MAGICK_FONT_PATH
 
+/* Target Host CPU */
+#undef MAGICK_TARGET_CPU
+
+/* Target Host OS */
+#undef MAGICK_TARGET_OS
+
+/* Target Host Vendor */
+#undef MAGICK_TARGET_VENDOR
+
 /* Magick API method prefix */
 #undef NAMESPACE_PREFIX
 

diff --git a/config/configure.xml b/config/configure.xml
index 58fe37a2fb4e2bd8290fd9afbfe1c0ccc5f1e7db..18b11797d3a05fffc80927e5d6f704d4da25a9da 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,8 +10,8 @@
   <configure name="VERSION" value="7.0.0"/>
   <configure name="LIB_VERSION" value="0x700"/>
   <configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
-  <configure name="SVN_REVISION" value="8726" />
-  <configure name="RELEASE_DATE" value="2012-07-28"/>
+  <configure name="SVN_REVISION" value="8756" />
+  <configure name="RELEASE_DATE" value="2012-07-29"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>

diff --git a/configure b/configure
index c2823cff685f3a025aad18cc109368a53cff7a94..7c6f130058070119b83f31aaef04a44e2e25b30a 100755 (executable)
--- a/configure
+++ b/configure
@@ -3640,18 +3640,33 @@ test -n "$target_alias" &&
 MAGICK_TARGET_CPU=$host_cpu
 
 
+cat >>confdefs.h <<_ACEOF
+#define MAGICK_TARGET_CPU $MAGICK_TARGET_CPU
+_ACEOF
+
+
 MAGICK_TARGET_VENDOR=$host_vendor
 
 
+cat >>confdefs.h <<_ACEOF
+#define MAGICK_TARGET_VENDOR $MAGICK_TARGET_VENDOR
+_ACEOF
+
+
 MAGICK_TARGET_OS=$host_os
 
 
+cat >>confdefs.h <<_ACEOF
+#define MAGICK_TARGET_OS $MAGICK_TARGET_OS
+_ACEOF
+
+
 # Substitute library versioning
 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=8726
+MAGICK_SVN_REVISION=8756
 
 
 

diff --git a/configure.ac b/configure.ac
index ebb09d009b107e41b60787a5de6406f80b62c0d5..3d52d55074dc0c675dd3321476773960b115c068 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -100,12 +100,15 @@ AC_CANONICAL_TARGET
 
 MAGICK_TARGET_CPU=$host_cpu
 AC_SUBST(MAGICK_TARGET_CPU)
+AC_DEFINE_UNQUOTED(MAGICK_TARGET_CPU,$MAGICK_TARGET_CPU,[Target Host CPU])
 
 MAGICK_TARGET_VENDOR=$host_vendor
 AC_SUBST(MAGICK_TARGET_VENDOR)
+AC_DEFINE_UNQUOTED(MAGICK_TARGET_VENDOR,$MAGICK_TARGET_VENDOR,[Target Host Vendor])
 
 MAGICK_TARGET_OS=$host_os
 AC_SUBST(MAGICK_TARGET_OS)
+AC_DEFINE_UNQUOTED(MAGICK_TARGET_OS,$MAGICK_TARGET_OS,[Target Host OS])
 
 # Substitute library versioning
 AC_SUBST(MAGICK_LIBRARY_CURRENT)dnl