% PPPP AAA N N GGGG OOO %
% P P A A NN N G O O %
% PPPP AAAAA N N N G GGG O O %
-% P M A A N NN G G O O %
+% P A A N NN G G O O %
% P A A N N GGGG OOO %
% %
% %
% Read Pango Markup Language Format %
% %
% Software Design %
-% John Cristy %
+% Cristy %
% March 2012 %
% %
% %
-% Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2018 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 %
% obtain a copy of the License at %
% %
-% http://www.imagemagick.org/script/license.php %
+% https://www.imagemagick.org/script/license.php %
% %
% Unless required by applicable law or agreed to in writing, software %
% distributed under the License is distributed on an "AS IS" BASIS, %
*/
#include "MagickCore/studio.h"
#include "MagickCore/annotate.h"
+#include "MagickCore/artifact.h"
#include "MagickCore/blob.h"
#include "MagickCore/blob-private.h"
#include "MagickCore/composite-private.h"
#include "MagickCore/image-private.h"
#include "MagickCore/list.h"
#include "MagickCore/magick.h"
-#include "MagickCore/module.h"
#include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
#include "MagickCore/option.h"
#include "MagickCore/pixel-accessor.h"
#include "MagickCore/property.h"
#include "MagickCore/static.h"
#include "MagickCore/string_.h"
#include "MagickCore/string-private.h"
+#include "MagickCore/token.h"
#include "MagickCore/utility.h"
-#if defined(MAGICKCORE_PANGOFT2_DELEGATE)
+#if defined(MAGICKCORE_PANGOCAIRO_DELEGATE)
#include <pango/pango.h>
-#include <pango/pangoft2.h>
+#include <pango/pangocairo.h>
#include <pango/pango-features.h>
#endif
\f
-#if defined(MAGICKCORE_PANGOFT2_DELEGATE)
+#if defined(MAGICKCORE_PANGOCAIRO_DELEGATE)
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
% o exception: return any errors or warnings in this structure.
%
*/
-
-static void PangoSubstitute(FcPattern *pattern,void *context)
-{
- const char
- *option;
-
- option=(const char *) context;
- if (option == (const char *) NULL)
- return;
- FcPatternDel(pattern,FC_HINTING);
- FcPatternAddBool(pattern, FC_HINTING,LocaleCompare(option,"none") != 0);
- FcPatternDel(pattern,FC_AUTOHINT);
- FcPatternAddBool(pattern,FC_AUTOHINT,LocaleCompare(option,"auto") == 0);
-}
-
static Image *ReadPANGOImage(const ImageInfo *image_info,
ExceptionInfo *exception)
{
+ cairo_font_options_t
+ *font_options;
+
+ cairo_surface_t
+ *surface;
+
char
*caption,
*property;
+ cairo_t
+ *cairo_image;
+
const char
*option;
DrawInfo
*draw_info;
- FT_Bitmap
- *canvas;
-
Image
*image;
+ MagickBooleanType
+ status;
+
+ MemoryInfo
+ *pixel_info;
+
PangoAlignment
align;
RectangleInfo
page;
- register Quantum
- *q;
-
register unsigned char
*p;
+ size_t
+ stride;
+
ssize_t
y;
+ unsigned char
+ *pixels;
+
/*
Initialize Image structure.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
(void) ResetImagePage(image,"0x0+0+0");
+ /*
+ Format caption.
+ */
+ option=GetImageOption(image_info,"filename");
+ if (option == (const char *) NULL)
+ property=InterpretImageProperties((ImageInfo *) image_info,image,
+ image_info->filename,exception);
+ else
+ if (LocaleNCompare(option,"pango:",6) == 0)
+ property=InterpretImageProperties((ImageInfo *) image_info,image,option+6,
+ exception);
+ else
+ property=InterpretImageProperties((ImageInfo *) image_info,image,option,
+ exception);
+ (void) SetImageProperty(image,"caption",property,exception);
+ property=DestroyString(property);
+ caption=ConstantString(GetImageProperty(image,"caption",exception));
/*
Get context.
*/
- fontmap=(PangoFontMap *) pango_ft2_font_map_new();
- pango_ft2_font_map_set_resolution((PangoFT2FontMap *) fontmap,
- image->resolution.x,image->resolution.y);
+ fontmap=pango_cairo_font_map_new();
+ pango_cairo_font_map_set_resolution(PANGO_CAIRO_FONT_MAP(fontmap),
+ image->resolution.x == 0.0 ? 90.0 : image->resolution.x);
+ font_options=cairo_font_options_create();
option=GetImageOption(image_info,"pango:hinting");
- pango_ft2_font_map_set_default_substitute((PangoFT2FontMap *) fontmap,
- PangoSubstitute,(char *) option,NULL);
+ if (option != (const char *) NULL)
+ {
+ if (LocaleCompare(option,"none") != 0)
+ cairo_font_options_set_hint_style(font_options,CAIRO_HINT_STYLE_NONE);
+ if (LocaleCompare(option,"full") != 0)
+ cairo_font_options_set_hint_style(font_options,CAIRO_HINT_STYLE_FULL);
+ }
context=pango_font_map_create_context(fontmap);
+ pango_cairo_context_set_font_options(context,font_options);
+ cairo_font_options_destroy(font_options);
option=GetImageOption(image_info,"pango:language");
if (option != (const char *) NULL)
pango_context_set_language(context,pango_language_from_string(option));
RightToLeftDirection ? PANGO_DIRECTION_RTL : PANGO_DIRECTION_LTR);
switch (draw_info->gravity)
{
- case NorthGravity: gravity=PANGO_GRAVITY_NORTH; break;
- case WestGravity: gravity=PANGO_GRAVITY_WEST; break;
- case EastGravity: gravity=PANGO_GRAVITY_EAST; break;
- case SouthGravity: gravity=PANGO_GRAVITY_SOUTH; break;
- default: gravity=PANGO_GRAVITY_AUTO; break;
+ case NorthGravity:
+ {
+ gravity=PANGO_GRAVITY_NORTH;
+ break;
+ }
+ case NorthWestGravity:
+ case WestGravity:
+ case SouthWestGravity:
+ {
+ gravity=PANGO_GRAVITY_WEST;
+ break;
+ }
+ case NorthEastGravity:
+ case EastGravity:
+ case SouthEastGravity:
+ {
+ gravity=PANGO_GRAVITY_EAST;
+ break;
+ }
+ case SouthGravity:
+ {
+ gravity=PANGO_GRAVITY_SOUTH;
+ break;
+ }
+ default:
+ {
+ gravity=PANGO_GRAVITY_AUTO;
+ break;
+ }
}
pango_context_set_base_gravity(context,gravity);
option=GetImageOption(image_info,"pango:gravity-hint");
pango_layout_set_ellipsize(layout,PANGO_ELLIPSIZE_START);
}
option=GetImageOption(image_info,"pango:justify");
- if ((option != (const char *) NULL) && (IsMagickTrue(option) != MagickFalse))
+ if (IsStringTrue(option) != MagickFalse)
pango_layout_set_justify(layout,1);
option=GetImageOption(image_info,"pango:single-paragraph");
- if ((option != (const char *) NULL) && (IsMagickTrue(option) != MagickFalse))
+ if (IsStringTrue(option) != MagickFalse)
pango_layout_set_single_paragraph_mode(layout,1);
option=GetImageOption(image_info,"pango:wrap");
if (option != (const char *) NULL)
}
option=GetImageOption(image_info,"pango:indent");
if (option != (const char *) NULL)
- pango_layout_set_indent(layout,(StringToLong(option)*image->resolution.x*
- PANGO_SCALE+36)/72);
+ pango_layout_set_indent(layout,(int) ((StringToLong(option)*
+ (image->resolution.x == 0.0 ? 90.0 : image->resolution.x)*PANGO_SCALE+36)/
+ 90.0+0.5));
switch (draw_info->align)
{
case CenterAlign: align=PANGO_ALIGN_CENTER; break;
(draw_info->direction == RightToLeftDirection))
align=(PangoAlignment) (PANGO_ALIGN_LEFT+PANGO_ALIGN_RIGHT-align);
pango_layout_set_alignment(layout,align);
- description=pango_font_description_from_string(draw_info->font ==
- (char *) NULL ? "helvetica" : draw_info->font);
- pango_font_description_set_size(description,PANGO_SCALE*draw_info->pointsize);
+ if (draw_info->font == (char *) NULL)
+ description=pango_font_description_new();
+ else
+ description=pango_font_description_from_string(draw_info->font);
+ pango_font_description_set_size(description,(int) (PANGO_SCALE*
+ draw_info->pointsize+0.5));
pango_layout_set_font_description(layout,description);
pango_font_description_free(description);
- property=InterpretImageProperties(image_info,image,image_info->filename,
- exception);
- (void) SetImageProperty(image,"caption",property,exception);
- property=DestroyString(property);
- caption=ConstantString(GetImageProperty(image,"caption",exception));
- /*
- Render caption.
- */
option=GetImageOption(image_info,"pango:markup");
- if ((option != (const char *) NULL) && (IsMagickTrue(option) != MagickFalse))
- pango_layout_set_markup(layout,caption,-1);
- else
+ if ((option != (const char *) NULL) && (IsStringTrue(option) == MagickFalse))
pango_layout_set_text(layout,caption,-1);
+ else
+ {
+ GError
+ *error;
+
+ error=(GError *) NULL;
+ if (pango_parse_markup(caption,-1,0,NULL,NULL,NULL,&error) == 0)
+ (void) ThrowMagickException(exception,GetMagickModule(),CoderError,
+ error->message,"`%s'",image_info->filename);
+ pango_layout_set_markup(layout,caption,-1);
+ }
pango_layout_context_changed(layout);
page.x=0;
page.y=0;
(void) ParseAbsoluteGeometry(image_info->page,&page);
if (image->columns == 0)
{
- pango_layout_get_pixel_extents(layout,NULL,&extent);
- image->columns=extent.x+extent.width;
+ pango_layout_get_extents(layout,NULL,&extent);
+ image->columns=(extent.x+extent.width+PANGO_SCALE/2)/PANGO_SCALE+2*page.x;
}
else
{
image->columns-=2*page.x;
- pango_layout_set_width(layout,(PANGO_SCALE*image->columns*
- image->resolution.x+36.0)/72.0);
+ pango_layout_set_width(layout,(int) ((PANGO_SCALE*image->columns*
+ (image->resolution.x == 0.0 ? 90.0 : image->resolution.x)+45.0)/90.0+
+ 0.5));
}
if (image->rows == 0)
{
- pango_layout_get_pixel_extents(layout,NULL,&extent);
- image->rows=extent.y+extent.height;
+ pango_layout_get_extents(layout,NULL,&extent);
+ image->rows=(extent.y+extent.height+PANGO_SCALE/2)/PANGO_SCALE+2*page.y;
}
else
{
image->rows-=2*page.y;
- pango_layout_set_height(layout,(PANGO_SCALE*image->rows*
- image->resolution.y+36.0)/72.0);
+ pango_layout_set_height(layout,(int) ((PANGO_SCALE*image->rows*
+ (image->resolution.y == 0.0 ? 90.0 : image->resolution.y)+45.0)/90.0+
+ 0.5));
}
+ status=SetImageExtent(image,image->columns,image->rows,exception);
+ if (status == MagickFalse)
+ return(DestroyImageList(image));
/*
- Create canvas.
+ Render markup.
*/
- canvas=(FT_Bitmap *) AcquireMagickMemory(sizeof(*canvas));
- if (canvas == (FT_Bitmap *) NULL)
- {
- draw_info=DestroyDrawInfo(draw_info);
- ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
- }
- canvas->width=image->columns;
- canvas->pitch=(canvas->width+3) & ~3;
- canvas->rows=image->rows;
- canvas->buffer=(unsigned char *) AcquireQuantumMemory(canvas->pitch,
- canvas->rows*sizeof(*canvas->buffer));
- if (canvas->buffer == (unsigned char *) NULL)
+ stride=(size_t) cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32,
+ (int) image->columns);
+ pixel_info=AcquireVirtualMemory(image->rows,stride*sizeof(*pixels));
+ if (pixel_info == (MemoryInfo *) NULL)
{
draw_info=DestroyDrawInfo(draw_info);
- canvas=(FT_Bitmap *) RelinquishMagickMemory(canvas);
+ caption=DestroyString(caption);
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
}
- canvas->num_grays=256;
- canvas->pixel_mode=ft_pixel_mode_grays;
- ResetMagickMemory(canvas->buffer,0x00,canvas->pitch*canvas->rows);
- pango_ft2_render_layout(canvas,layout,0,0);
+ pixels=(unsigned char *) GetVirtualMemoryBlob(pixel_info);
+ surface=cairo_image_surface_create_for_data(pixels,CAIRO_FORMAT_ARGB32,
+ (int) image->columns,(int) image->rows,(int) stride);
+ cairo_image=cairo_create(surface);
+ cairo_set_operator(cairo_image,CAIRO_OPERATOR_CLEAR);
+ cairo_paint(cairo_image);
+ cairo_set_operator(cairo_image,CAIRO_OPERATOR_OVER);
+ cairo_translate(cairo_image,page.x,page.y);
+ cairo_set_source_rgba(cairo_image,QuantumScale*draw_info->fill.red,
+ QuantumScale*draw_info->fill.green,QuantumScale*draw_info->fill.blue,
+ QuantumScale*draw_info->fill.alpha);
+ pango_cairo_show_layout(cairo_image,layout);
+ cairo_destroy(cairo_image);
+ cairo_surface_destroy(surface);
+ g_object_unref(layout);
+ g_object_unref(fontmap);
/*
- Convert caption to image.
+ Convert surface to image.
*/
- image->columns+=2*page.x;
- image->rows+=2*page.y;
- if (SetImageBackgroundColor(image,exception) == MagickFalse)
- {
- draw_info=DestroyDrawInfo(draw_info);
- canvas->buffer=(unsigned char *) RelinquishMagickMemory(canvas->buffer);
- canvas=(FT_Bitmap *) RelinquishMagickMemory(canvas);
- caption=DestroyString(caption);
- image=DestroyImageList(image);
- return((Image *) NULL);
- }
+ (void) SetImageBackgroundColor(image,exception);
+ p=pixels;
GetPixelInfo(image,&fill_color);
- p=canvas->buffer;
- for (y=page.y; y < (ssize_t) (image->rows-page.y); y++)
+ for (y=0; y < (ssize_t) image->rows; y++)
{
+ register Quantum
+ *q;
+
register ssize_t
x;
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
if (q == (Quantum *) NULL)
break;
- q+=page.x*GetPixelChannels(image);
- for (x=page.x; x < (ssize_t) (image->columns-page.x); x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
- MagickRealType
- fill_alpha;
+ double
+ gamma;
- (void) GetFillColor(draw_info,x,y,&fill_color,exception);
- fill_alpha=(MagickRealType) (*p)/(canvas->num_grays-1);
- if (draw_info->text_antialias == MagickFalse)
- fill_alpha=fill_alpha >= 0.5 ? 1.0 : 0.0;
- fill_alpha=fill_alpha*fill_color.alpha;
- CompositePixelOver(image,&fill_color,fill_alpha,q,GetPixelAlpha(image,q),
- q);
- p++;
+ fill_color.blue=(double) ScaleCharToQuantum(*p++);
+ fill_color.green=(double) ScaleCharToQuantum(*p++);
+ fill_color.red=(double) ScaleCharToQuantum(*p++);
+ fill_color.alpha=(double) ScaleCharToQuantum(*p++);
+ /*
+ Disassociate alpha.
+ */
+ gamma=QuantumScale*fill_color.alpha;
+ gamma=PerceptibleReciprocal(gamma);
+ fill_color.blue*=gamma;
+ fill_color.green*=gamma;
+ fill_color.red*=gamma;
+ CompositePixelOver(image,&fill_color,fill_color.alpha,q,(double)
+ GetPixelAlpha(image,q),q);
q+=GetPixelChannels(image);
}
- for ( ; x < (ssize_t) ((canvas->width+3) & ~3); x++)
- p++;
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ if (image->previous == (Image *) NULL)
+ {
+ status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+ image->rows);
+ if (status == MagickFalse)
+ break;
+ }
}
/*
Relinquish resources.
*/
+ pixel_info=RelinquishVirtualMemory(pixel_info);
draw_info=DestroyDrawInfo(draw_info);
- canvas->buffer=(unsigned char *) RelinquishMagickMemory(canvas->buffer);
- canvas=(FT_Bitmap *) RelinquishMagickMemory(canvas);
caption=DestroyString(caption);
return(GetFirstImageInList(image));
}
ModuleExport size_t RegisterPANGOImage(void)
{
char
- version[MaxTextExtent];
+ version[MagickPathExtent];
MagickInfo
*entry;
*version='\0';
#if defined(PANGO_VERSION_STRING)
- (void) FormatLocaleString(version,MaxTextExtent,"Pangoft2 %s",
+ (void) FormatLocaleString(version,MagickPathExtent,"Pangocairo %s",
PANGO_VERSION_STRING);
#endif
- entry=SetMagickInfo("PANGO");
-#if defined(MAGICKCORE_PANGOFT2_DELEGATE)
+ entry=AcquireMagickInfo("PANGO","PANGO","Pango Markup Language");
+#if defined(MAGICKCORE_PANGOCAIRO_DELEGATE)
entry->decoder=(DecodeImageHandler *) ReadPANGOImage;
#endif
- entry->description=ConstantString("Pango Markup Language");
if (*version != '\0')
entry->version=ConstantString(version);
- entry->adjoin=MagickFalse;
- entry->module=ConstantString("PANGO");
+ entry->flags^=CoderAdjoinFlag;
+ entry->flags^=CoderDecoderThreadSupportFlag;
(void) RegisterMagickInfo(entry);
return(MagickImageCoderSignature);
}
projects / imagemagick / blobdiff