...

[imagemagick] / MagickCore / draw-private.h

diff --git a/MagickCore/draw-private.h b/MagickCore/draw-private.h
index 1beae0da7c9c2b53ef48bb27b05b96328313b604..1ec280c76b955f3b0234968bd29e2aa5f4cb9976 100644 (file)
--- a/MagickCore/draw-private.h
+++ b/MagickCore/draw-private.h
@@ -1,5 +1,5 @@
 /*
 /*

-  Copyright 1999-2014 ImageMagick Studio LLC, a non-profit organization
+  Copyright 1999-2017 ImageMagick Studio LLC, a non-profit organization

   dedicated to making software imaging solutions freely available.
   
   You may not use this file except in compliance with the License.
   dedicated to making software imaging solutions freely available.
   
   You may not use this file except in compliance with the License.


@@ -15,8 +15,8 @@
 
   MagickCore private image drawing methods.
 */
 
   MagickCore private image drawing methods.
 */

-#ifndef _MAGICKCORE_DRAW_PRIVATE_H
-#define _MAGICKCORE_DRAW_PRIVATE_H
+#ifndef MAGICKCORE_DRAW_PRIVATE_H
+#define MAGICKCORE_DRAW_PRIVATE_H

 
 #include "MagickCore/cache.h"
 #include "MagickCore/image.h"
 
 #include "MagickCore/cache.h"
 #include "MagickCore/image.h"


@@ -26,47 +26,39 @@
 extern "C" {
 #endif
 
 extern "C" {
 #endif
 

-static inline MagickBooleanType GetFillColor(const DrawInfo *draw_info,
-  const ssize_t x,const ssize_t y,PixelInfo *fill,ExceptionInfo *exception)
+static inline void GetFillColor(const DrawInfo *draw_info,const ssize_t x,
+  const ssize_t y,PixelInfo *fill,ExceptionInfo *exception)

 {
   if (draw_info->fill_pattern == (Image *) NULL)
     {
       *fill=draw_info->fill;
 {
   if (draw_info->fill_pattern == (Image *) NULL)
     {
       *fill=draw_info->fill;

-      return(MagickTrue);
+      return;

     }
   {
     Image
       *pattern;
 
     }
   {
     Image
       *pattern;
 

-    MagickBooleanType
-      status;
-

     pattern=draw_info->fill_pattern;
     pattern=draw_info->fill_pattern;

-    status=GetOneVirtualPixelInfo(pattern,TileVirtualPixelMethod,x+
+    (void) GetOneVirtualPixelInfo(pattern,TileVirtualPixelMethod,x+

       pattern->tile_offset.x,y+pattern->tile_offset.y,fill,exception);
       pattern->tile_offset.x,y+pattern->tile_offset.y,fill,exception);

-    return(status);

   }
 }
 
   }
 }
 

-static inline MagickBooleanType GetStrokeColor(const DrawInfo *draw_info,
-  const ssize_t x,const ssize_t y,PixelInfo *stroke,ExceptionInfo *exception)
+static inline void GetStrokeColor(const DrawInfo *draw_info,const ssize_t x,
+  const ssize_t y,PixelInfo *stroke,ExceptionInfo *exception)

 {
   if (draw_info->stroke_pattern == (Image *) NULL)
     {
       *stroke=draw_info->stroke;
 {
   if (draw_info->stroke_pattern == (Image *) NULL)
     {
       *stroke=draw_info->stroke;

-      return(MagickTrue);
+      return;

     }
   {
     Image
       *pattern;
 
     }
   {
     Image
       *pattern;
 

-    MagickBooleanType
-      status;
-

     pattern=draw_info->stroke_pattern;
     pattern=draw_info->stroke_pattern;

-    status=GetOneVirtualPixelInfo(pattern,TileVirtualPixelMethod,x+
+    (void) GetOneVirtualPixelInfo(pattern,TileVirtualPixelMethod,x+

       pattern->tile_offset.x,y+pattern->tile_offset.y,stroke,exception);
       pattern->tile_offset.x,y+pattern->tile_offset.y,stroke,exception);

-    return(status);

   }
 }
 
   }
 }