% December 2000 %
% %
% %
-% Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2013 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. You may %
#include "MagickCore/module.h"
#include "MagickWand/MagickWand.h"
+#if defined(__CYGWIN__)
+#undef MAGICKCORE_WMF_DELEGATE
+#endif
+
#if defined(MAGICKCORE_WMF_DELEGATE)
#include "libwmf/api.h"
#include "libwmf/eps.h"
MagickWand
*magick_wand;
- MagickRealType
+ double
height,
width;
DrawSetViewbox(WmfDrawingWand, 0, 0, ddata->image->columns, ddata->image->rows );
(void) FormatLocaleString(comment,MaxTextExtent,"Created by ImageMagick %s",
- GetMagickVersion((unsigned long *) NULL));
+ GetMagickVersion((size_t *) NULL));
DrawComment(WmfDrawingWand,comment);
/* Scale width and height to image */
ddata->pattern_id);
(void) DrawSetFillPatternURL(WmfDrawingWand,pattern_id);
++ddata->pattern_id;
-
DrawRectangle(WmfDrawingWand,
- XC(ddata->bbox.TL.x),YC(ddata->bbox.TL.y),
- XC(ddata->bbox.BR.x),YC(ddata->bbox.BR.y));
+ XC(ddata->bbox.TL.x),YC(ddata->bbox.TL.y),
+ XC(ddata->bbox.BR.x),YC(ddata->bbox.BR.y));
image=DestroyImageList(image);
}
else
(void) FormatLocaleString(pattern_id,MaxTextExtent,"#brush_%lu",
ddata->pattern_id);
-
if ( brush_apply == BrushApplyStroke )
(void) DrawSetStrokePatternURL(WmfDrawingWand,pattern_id);
else
*/
static float lite_font_stringwidth( wmfAPI* API, wmfFont* font, char* str)
{
+#if 0
wmf_magick_t
*ddata = WMF_MAGICK_GetData(API);
image->units = orig_resolution_units;
return stringwidth;
+#else
+ (void) API;
+ (void) font;
+ (void) str;
+
+ return 0;
+#endif
}
/* Map font (similar to wmf_ipa_font_map) */
/* User specified resolution */
resolution_y=DefaultResolution;
- if (image->resolution.y > 0)
+ if (image->resolution.y != 0.0)
{
resolution_y = image->resolution.y;
if (image->units == PixelsPerCentimeterResolution)
resolution_y *= CENTIMETERS_PER_INCH;
}
resolution_x=DefaultResolution;
- if (image->resolution.x > 0)
+ if (image->resolution.x != 0.0)
{
resolution_x = image->resolution.x;
if (image->units == PixelsPerCentimeterResolution)
}
if (image->debug != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " Creating canvas image with size %ldx%ld",
- image->rows,image->columns);
+ " Creating canvas image with size %lux%lu",(unsigned long) image->rows,
+ (unsigned long) image->columns);
/*
* Set solid background color
{
image->background_color = image_info->background_color;
if (image->background_color.alpha != OpaqueAlpha)
- image->matte = MagickTrue;
+ image->alpha_trait = MagickTrue;
(void) SetImageBackgroundColor(image,exception);
}
/*