(no commit message)

diff --git a/MagickCore/distribute-cache.c b/MagickCore/distribute-cache.c
index 1aceee3ff3bda5be91c2e5faac2374a148b7bc5a..9d2810c8c015759ce87c33e4aa30e644a5494b0b 100644 (file)
--- a/MagickCore/distribute-cache.c
+++ b/MagickCore/distribute-cache.c
@@ -69,6 +69,7 @@
 #include "MagickCore/splay-tree.h"
 #include "MagickCore/string_.h"
 #include "MagickCore/string-private.h"
+#include "MagickCore/version.h"
 #if defined(MAGICKCORE_HAVE_SOCKET)
 #include <netinet/in.h>
 #include <netdb.h>
@@ -246,17 +247,19 @@ static int ConnectPixelCacheServer(const char *hostname,const int port,
   if (count != -1)
     {
       MagickSizeType
-        hdri,
-        quantum_depth;
+        signature;
 
       (void) memcpy(p,secret,(size_t) count);
       p+=count;
-      quantum_depth=MAGICKCORE_QUANTUM_DEPTH;
-      (void) memcpy(p,&quantum_depth,sizeof(quantum_depth));
-      p+=sizeof(quantum_depth);
-      hdri=MAGICKCORE_HDRI_ENABLE;
-      (void) memcpy(p,&hdri,sizeof(hdri));
-      p+=sizeof(hdri);
+      signature=MagickLibVersion;
+      (void) memcpy(p,&signature,sizeof(signature));
+      p+=sizeof(signature);
+      signature=MAGICKCORE_QUANTUM_DEPTH;
+      (void) memcpy(p,&signature,sizeof(signature));
+      p+=sizeof(signature);
+      signature=MAGICKCORE_HDRI_ENABLE;
+      (void) memcpy(p,&signature,sizeof(signature));
+      p+=sizeof(signature);
       *session_key=CRC64(session,p-session);
     }
   if (*session_key == 0)
@@ -764,10 +767,9 @@ static void *DistributePixelCacheClient(void *socket)
     count;
 
   MagickSizeType
-    hdri,
-    quantum_depth,
     key,
-    session_key;
+    session_key,
+    signature;
 
   register unsigned char
     *p;
@@ -798,12 +800,15 @@ static void *DistributePixelCacheClient(void *socket)
   secret=GetRandomKey(random_info,DPCSessionKeyLength);
   (void) memcpy(p,GetStringInfoDatum(secret),DPCSessionKeyLength);
   p+=DPCSessionKeyLength;
-  quantum_depth=MAGICKCORE_QUANTUM_DEPTH;
-  (void) memcpy(p,&quantum_depth,sizeof(quantum_depth));
-  p+=sizeof(quantum_depth);
-  hdri=MAGICKCORE_HDRI_ENABLE;
-  (void) memcpy(p,&hdri,sizeof(hdri));
-  p+=sizeof(hdri);
+  signature=MagickLibVersion;
+  (void) memcpy(p,&signature,sizeof(signature));
+  p+=sizeof(signature);
+  signature=MAGICKCORE_QUANTUM_DEPTH;
+  (void) memcpy(p,&signature,sizeof(signature));
+  p+=sizeof(signature);
+  signature=MAGICKCORE_HDRI_ENABLE;
+  (void) memcpy(p,&signature,sizeof(signature));
+  p+=sizeof(signature);
   session_key=CRC64(session,p-session);
   random_info=DestroyRandomInfo(random_info);
   exception=AcquireExceptionInfo();
@@ -827,6 +832,7 @@ static void *DistributePixelCacheClient(void *socket)
       {
         status=OpenDistributeCache(registry,client_socket,session_key,
           exception);
+        count=dpc_send(client_socket,sizeof(status),(unsigned char *) &status);
         break;
       }
       case 'r':
@@ -866,6 +872,7 @@ static void *DistributePixelCacheClient(void *socket)
     if (command == 'd')
       break;
   }
+  count=dpc_send(client_socket,sizeof(status),(unsigned char *) &status);
   (void) close(client_socket);
   exception=DestroyExceptionInfo(exception);
   registry=DestroySplayTree(registry);
@@ -1081,6 +1088,9 @@ MagickPrivate int GetDistributeCachePort(const DistributeCacheInfo *server_info)
 MagickPrivate MagickBooleanType OpenDistributePixelCache(
   DistributeCacheInfo *server_info,Image *image)
 {
+  MagickBooleanType
+    status;
+
   MagickOffsetType
     count;
 
@@ -1110,7 +1120,11 @@ MagickPrivate MagickBooleanType OpenDistributePixelCache(
   count=dpc_send(server_info->file,p-message,message);
   if (count != (MagickOffsetType) (p-message))
     return(MagickFalse);
-  return(MagickTrue);
+  status=MagickFalse;
+  count=dpc_read(server_info->file,sizeof(status),(unsigned char *) &status);
+  if (count != (MagickOffsetType) sizeof(status))
+    return(MagickFalse);
+  return(status);
 }
 \f
 /*
@@ -1166,7 +1180,7 @@ MagickPrivate MagickOffsetType ReadDistributePixelCacheMetacontent(
   assert(server_info->signature == MagickSignature);
   assert(region != (RectangleInfo *) NULL);
   assert(metacontent != (unsigned char *) NULL);
-  if (length != (size_t) length)
+  if (length > SSIZE_MAX)
     return(-1);
   p=message;
   *p++='R';
@@ -1241,7 +1255,7 @@ MagickPrivate MagickOffsetType ReadDistributePixelCachePixels(
   assert(server_info->signature == MagickSignature);
   assert(region != (RectangleInfo *) NULL);
   assert(pixels != (unsigned char *) NULL);
-  if (length != (size_t) length)
+  if (length > SSIZE_MAX)
     return(-1);
   p=message;
   *p++='r';
@@ -1367,7 +1381,7 @@ MagickPrivate MagickOffsetType WriteDistributePixelCacheMetacontent(
   assert(server_info->signature == MagickSignature);
   assert(region != (RectangleInfo *) NULL);
   assert(metacontent != (unsigned char *) NULL);
-  if (length != (size_t) length)
+  if (length > SSIZE_MAX)
     return(-1);
   p=message;
   *p++='W';
@@ -1442,7 +1456,7 @@ MagickPrivate MagickOffsetType WriteDistributePixelCachePixels(
   assert(server_info->signature == MagickSignature);
   assert(region != (RectangleInfo *) NULL);
   assert(pixels != (const unsigned char *) NULL);
-  if (length != (size_t) length)
+  if (length > SSIZE_MAX)
     return(-1);
   p=message;
   *p++='w';

diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index 3990722a78b75518523ef07bcb33c4da0106afbf..6b0cc36fc9fb01cd22e504e835796d02061f7a80 100644 (file)
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -1590,6 +1590,8 @@ MagickExport Image *EdgeImage(const Image *image,const double radius,
     ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
   kernel_info->width=width;
   kernel_info->height=width;
+  kernel_info->x=(ssize_t) width/2;
+  kernel_info->y=(ssize_t) width/2;
   kernel_info->values=(MagickRealType *) MagickAssumeAligned(
     AcquireAlignedMemory(kernel_info->width,kernel_info->width*
     sizeof(*kernel_info->values)));
@@ -1680,6 +1682,8 @@ MagickExport Image *EmbossImage(const Image *image,const double radius,
     ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
   kernel_info->width=width;
   kernel_info->height=width;
+  kernel_info->x=(ssize_t) width/2;
+  kernel_info->y=(ssize_t) width/2;
   kernel_info->values=(MagickRealType *) MagickAssumeAligned(
     AcquireAlignedMemory(kernel_info->width,kernel_info->width*
     sizeof(*kernel_info->values)));
@@ -1777,6 +1781,8 @@ MagickExport Image *GaussianBlurImage(const Image *image,const double radius,
   (void) ResetMagickMemory(kernel_info,0,sizeof(*kernel_info));
   kernel_info->width=width;
   kernel_info->height=width;
+  kernel_info->x=(ssize_t) width/2;
+  kernel_info->y=(ssize_t) width/2;
   kernel_info->signature=MagickSignature;
   kernel_info->values=(MagickRealType *) MagickAssumeAligned(
     AcquireAlignedMemory(kernel_info->width,kernel_info->width*
@@ -3523,6 +3529,8 @@ MagickExport Image *SharpenImage(const Image *image,const double radius,
   (void) ResetMagickMemory(kernel_info,0,sizeof(*kernel_info));
   kernel_info->width=width;
   kernel_info->height=width;
+  kernel_info->x=(ssize_t) width/2;
+  kernel_info->y=(ssize_t) width/2;
   kernel_info->signature=MagickSignature;
   kernel_info->values=(MagickRealType *) MagickAssumeAligned(
     AcquireAlignedMemory(kernel_info->width,kernel_info->width*