Changeset 7665

Timestamp:

04/26/12 07:30:17 (14 months ago)

Author:

cristy

Message:

 

Location:

ImageMagick/trunk/MagickWand

Files:

• drawing-wand.c (modified) (15 diffs)
• drawing-wand.h (modified) (1 diff)
• pixel-wand.c (modified) (1 diff)
• wand-view.c (modified) (1 diff)

ImageMagick/trunk/MagickWand/drawing-wand.c

@@ -256 +256 @@
   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 *);
@@ -1595 +1595 @@
 %  The format of the DrawGetFontResolution method is:
 %
-%      DrawBooleanType DrawGetFontResolution(const DrawingWand *wand,
+%      MagickBooleanType DrawGetFontResolution(const DrawingWand *wand,
 %        double *x,double *y)
 %
@@ -1875 +1875 @@
 %
 %      void DrawGetStrokeColor(const DrawingWand *wand,
-$        PixelWand *stroke_color)
+%        PixelWand *stroke_color)
 %
 %  A description of each parameter follows:
@@ -2181 +2181 @@
 %  The format of the DrawGetTextAlignment method is:
 %
-%      AlignType DrawGetTextAlignment(DrawingWand *wand)
+%      AlignType DrawGetTextAlignment(const DrawingWand *wand)
 %
 %  A description of each parameter follows:
@@ -2245 +2245 @@
 %  The format of the DrawGetTextDecoration method is:
 %
-%      DecorationType DrawGetTextDecoration(DrawingWand *wand)
+%      DecorationType DrawGetTextDecoration(const DrawingWand *wand)
 %
 %  A description of each parameter follows:
@@ -2333 +2333 @@
 %                                                                             %
 %                                                                             %
-%   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.
-%
-%  The format of the DrawSetFontKerning method is:
-%
-%      double DrawGetTextInterwordSpacing(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                     %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  DrawGetTextInterlineSpacing() gets the spacing between lines in text.
+%
+%  The format of the DrawGetTextInterlineSpacing method is:
+%
+%      double DrawGetTextInterlineSpacing(DrawingWand *wand)
 %
 %  A description of each parameter follows:
@@ -2408 +2408 @@
 %  The format of the DrawGetVectorGraphics method is:
 %
-%      char *DrawGetVectorGraphics(const DrawingWand *wand)
+%      char *DrawGetVectorGraphics(DrawingWand *wand)
 %
 %  A description of each parameter follows:
@@ -3111 +3111 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  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
@@ -3169 +3169 @@
 %
 %      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:
@@ -3552 +3552 @@
 %  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:
@@ -4760 +4759 @@
 %  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:
@@ -5974 +5973 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  DrawSetTextInterwordSpacing() sets the spacing between line in text.
-%
-%  The format of the DrawSetInterwordSpacing method is:
-%
-%      void DrawSetTextInterwordSpacing(DrawingWand *wand,
+%  DrawSetTextInterlineSpacing() sets the spacing between line in text.
+%
+%  The format of the DrawSetInterlineSpacing method is:
+%
+%      void DrawSetTextInterlineSpacing(DrawingWand *wand,
 %        const double interline_spacing)
 %
@@ -6524 +6523 @@
 %  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:
@@ -6540 +6539 @@
 %
 */
-WandExport void DrawSetViewbox(DrawingWand *wand,ssize_t x1,ssize_t y1,
-  ssize_t x2,ssize_t 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);
+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",x1,y1,x2,y2);
 }
 
@@ -6600 +6598 @@
 %  The format of the NewDrawingWand method is:
 %
-%      DrawingWand NewDrawingWand(void)
+%      DrawingWand *NewDrawingWand(void)
 %
 */

ImageMagick/trunk/MagickWand/drawing-wand.h

@@ -207 +207 @@
   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),

ImageMagick/trunk/MagickWand/pixel-wand.c

@@ -2099 +2099 @@
 %  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:

ImageMagick/trunk/MagickWand/wand-view.c

@@ -398 +398 @@
 %  The format of the GetWandViewException method is:
 %
-%      char *GetWandViewException(const PixelWand *wand_view,
+%      char *GetWandViewException(const WandView *wand_view,
 %        ExceptionType *severity)
 %