(no commit message)

diff --git a/MagickWand/drawing-wand.c b/MagickWand/drawing-wand.c
index a7d31d957b9e15f9e646779a97f973558ef0c556..68eed0d0c8a5ff0f3fde7a509950ff69058a1064 100644 (file)
--- a/MagickWand/drawing-wand.c
+++ b/MagickWand/drawing-wand.c
@@ -255,8 +255,8 @@ struct _DrawVTable
   void (*DrawSetTextDecoration)(DrawingWand *,const DecorationType);
   void (*DrawSetTextUnderColor)(DrawingWand *,const PixelWand *);
   void (*DrawTranslate)(DrawingWand *,const double,const double);
-  void (*DrawSetViewbox)(DrawingWand *,size_t,size_t,
-    size_t,size_t);
+  void (*DrawSetViewbox)(DrawingWand *,const double,const double,
+    const double,const double);
   void (*PeekDrawingWand)(DrawingWand *);
   MagickBooleanType (*PopDrawingWand)(DrawingWand *);
   MagickBooleanType (*PushDrawingWand)(DrawingWand *);
@@ -1594,7 +1594,7 @@ WandExport char *DrawGetFontFamily(const DrawingWand *wand)
 %
 %  The format of the DrawGetFontResolution method is:
 %
-%      DrawBooleanType DrawGetFontResolution(const DrawingWand *wand,
+%      MagickBooleanType DrawGetFontResolution(const DrawingWand *wand,
 %        double *x,double *y)
 %
 %  A description of each parameter follows:
@@ -1874,7 +1874,7 @@ WandExport MagickBooleanType DrawGetStrokeAntialias(const DrawingWand *wand)
 %  The format of the DrawGetStrokeColor method is:
 %
 %      void DrawGetStrokeColor(const DrawingWand *wand,
-$        PixelWand *stroke_color)
+%        PixelWand *stroke_color)
 %
 %  A description of each parameter follows:
 %
@@ -2180,7 +2180,7 @@ WandExport double DrawGetStrokeWidth(const DrawingWand *wand)
 %
 %  The format of the DrawGetTextAlignment method is:
 %
-%      AlignType DrawGetTextAlignment(DrawingWand *wand)
+%      AlignType DrawGetTextAlignment(const DrawingWand *wand)
 %
 %  A description of each parameter follows:
 %
@@ -2244,7 +2244,7 @@ WandExport MagickBooleanType DrawGetTextAntialias(const DrawingWand *wand)
 %
 %  The format of the DrawGetTextDecoration method is:
 %
-%      DecorationType DrawGetTextDecoration(DrawingWand *wand)
+%      DecorationType DrawGetTextDecoration(const DrawingWand *wand)
 %
 %  A description of each parameter follows:
 %
@@ -2332,17 +2332,17 @@ WandExport double DrawGetTextKerning(DrawingWand *wand)
 %                                                                             %
 %                                                                             %
 %                                                                             %
-%   D r a w G e t T e x t I n t e r L i n e S p a c i n g                     %
+%   D r a w G e t T e x t I n t e r l i n e S p a c i n g                     %
 %                                                                             %
 %                                                                             %
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  DrawGetTextInterwordSpacing() gets the spacing between lines in text.
+%  DrawGetTextInterlineSpacing() gets the spacing between lines in text.
 %
-%  The format of the DrawSetFontKerning method is:
+%  The format of the DrawGetTextInterlineSpacing method is:
 %
-%      double DrawGetTextInterwordSpacing(DrawingWand *wand)
+%      double DrawGetTextInterlineSpacing(DrawingWand *wand)
 %
 %  A description of each parameter follows:
 %
@@ -2407,7 +2407,7 @@ WandExport double DrawGetTextInterwordSpacing(DrawingWand *wand)
 %
 %  The format of the DrawGetVectorGraphics method is:
 %
-%      char *DrawGetVectorGraphics(const DrawingWand *wand)
+%      char *DrawGetVectorGraphics(DrawingWand *wand)
 %
 %  A description of each parameter follows:
 %
@@ -3110,7 +3110,7 @@ WandExport void DrawPathCurveToQuadraticBezierSmoothAbsolute(DrawingWand *wand,
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  DrawPathCurveToQuadraticBezierSmoothAbsolute() draws a quadratic Bezier
+%  DrawPathCurveToQuadraticBezierSmoothRelative() draws a quadratic Bezier
 %  curve (using relative coordinates) from the current point to (x,y). The
 %  control point is assumed to be the reflection of the control point on the
 %  previous command relative to the current point. (If there is no previous
@@ -3168,7 +3168,7 @@ WandExport void DrawPathCurveToQuadraticBezierSmoothRelative(DrawingWand *wand,
 %  The format of the DrawPathCurveToSmoothAbsolute method is:
 %
 %      void DrawPathCurveToSmoothAbsolute(DrawingWand *wand,
-%        const double x2const double y2,const double x,const double y)
+%        const double x2,const double y2,const double x,const double y)
 %
 %  A description of each parameter follows:
 %
@@ -3551,8 +3551,7 @@ WandExport void DrawPathLineToRelative(DrawingWand *wand,const double x,
 %
 %  The format of the DrawPathLineToHorizontalAbsolute method is:
 %
-%      void DrawPathLineToHorizontalAbsolute(DrawingWand *wand,
-%        const PathMode mode,const double x)
+%      void DrawPathLineToHorizontalAbsolute(DrawingWand *wand,const double x)
 %
 %  A description of each parameter follows:
 %
@@ -4759,8 +4758,8 @@ WandExport void DrawSetFillAlpha(DrawingWand *wand,const double fill_alpha)
 %
 %  The format of the DrawSetFontResolution method is:
 %
-%      DrawBooleanType DrawSetFontResolution(DrawingWand *wand,
-%        const double x_resolution,const doubtl y_resolution)
+%      MagickBooleanType DrawSetFontResolution(DrawingWand *wand,
+%        const double x_resolution,const double y_resolution)
 %
 %  A description of each parameter follows:
 %
@@ -5973,11 +5972,11 @@ WandExport void DrawSetTextKerning(DrawingWand *wand,const double kerning)
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  DrawSetTextInterwordSpacing() sets the spacing between line in text.
+%  DrawSetTextInterlineSpacing() sets the spacing between line in text.
 %
-%  The format of the DrawSetInterwordSpacing method is:
+%  The format of the DrawSetInterlineSpacing method is:
 %
-%      void DrawSetTextInterwordSpacing(DrawingWand *wand,
+%      void DrawSetTextInterlineSpacing(DrawingWand *wand,
 %        const double interline_spacing)
 %
 %  A description of each parameter follows:
@@ -6523,8 +6522,8 @@ WandExport void DrawTranslate(DrawingWand *wand,const double x,const double y)
 %
 %  The format of the DrawSetViewbox method is:
 %
-%      void DrawSetViewbox(DrawingWand *wand,size_t x1,
-%        size_t y1,size_t x2,size_t y2)
+%      void DrawSetViewbox(DrawingWand *wand,const double x1,const double y1,
+%        const double x2,const double y2)
 %
 %  A description of each parameter follows:
 %
@@ -6539,15 +6538,14 @@ WandExport void DrawTranslate(DrawingWand *wand,const double x,const double y)
 %    o y2: bottom y ordinate
 %
 */
-WandExport void DrawSetViewbox(DrawingWand *wand,ssize_t x1,ssize_t y1,
-  ssize_t x2,ssize_t y2)
+WandExport void DrawSetViewbox(DrawingWand *wand,const double x1,
+  const double y1,const double x2,const double y2)
 {
   assert(wand != (DrawingWand *) NULL);
   assert(wand->signature == WandSignature);
   if (wand->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
-  (void) MvgPrintf(wand,"viewbox %.20g %.20g %.20g %.20g\n",(double) x1,
-    (double) y1,(double) x2,(double) y2);
+  (void) MvgPrintf(wand,"viewbox %.20g %.20g %.20g %.20g\n",x1,y1,x2,y2);
 }
 \f
 /*
@@ -6599,7 +6597,7 @@ WandExport MagickBooleanType IsDrawingWand(const DrawingWand *wand)
 %
 %  The format of the NewDrawingWand method is:
 %
-%      DrawingWand NewDrawingWand(void)
+%      DrawingWand *NewDrawingWand(void)
 %
 */
 WandExport DrawingWand *NewDrawingWand(void)

diff --git a/MagickWand/drawing-wand.h b/MagickWand/drawing-wand.h
index 15eec247efb0bf96d3180008b59964215f0a933d..5d203130a2a025396c1cad31dd30384df61e0185 100644 (file)
--- a/MagickWand/drawing-wand.h
+++ b/MagickWand/drawing-wand.h
@@ -206,7 +206,8 @@ extern WandExport void
   DrawSetTextDecoration(DrawingWand *,const DecorationType),
   DrawSetTextEncoding(DrawingWand *,const char *),
   DrawSetTextUnderColor(DrawingWand *,const PixelWand *),
-  DrawSetViewbox(DrawingWand *,ssize_t,ssize_t,ssize_t,ssize_t),
+  DrawSetViewbox(DrawingWand *,const double,const double,const double,
+    const double),
   DrawSkewX(DrawingWand *,const double),
   DrawSkewY(DrawingWand *,const double),
   DrawTranslate(DrawingWand *,const double,const double);

diff --git a/MagickWand/pixel-wand.c b/MagickWand/pixel-wand.c
index 65e1a704d95bb1ffd58b9d7cccc5d4564b9ab35d..15c5255cb02a848e0ac32d058141210ccb7cfc2d 100644 (file)
--- a/MagickWand/pixel-wand.c
+++ b/MagickWand/pixel-wand.c
@@ -2098,7 +2098,7 @@ WandExport void PixelSetMagentaQuantum(PixelWand *wand,const Quantum magenta)
 %
 %  The format of the PixelSetPixelColor method is:
 %
-%      PixelSetPixelColor(PixelWand *wand,const PixelInfo *color)
+%      void PixelSetPixelColor(PixelWand *wand,const PixelInfo *color)
 %
 %  A description of each parameter follows:
 %

diff --git a/MagickWand/wand-view.c b/MagickWand/wand-view.c
index 43fbd5ea661ec5f0fe5d525203d4df5885daafdc..316cc59fc3a4039335bb2750c3866257e2335f37 100644 (file)
--- a/MagickWand/wand-view.c
+++ b/MagickWand/wand-view.c
@@ -397,7 +397,7 @@ WandExport MagickBooleanType DuplexTransferWandViewIterator(WandView *source,
 %
 %  The format of the GetWandViewException method is:
 %
-%      char *GetWandViewException(const PixelWand *wand_view,
+%      char *GetWandViewException(const WandView *wand_view,
 %        ExceptionType *severity)
 %
 %  A description of each parameter follows: