ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Fix Tategaki rotation. 

Tategaki does not ignore orientation rotation, instead it always
rotates affect glyphs by 90 degrees inside their cell.
This commit is contained in:
Aric Stewart 2013-05-24 11:00:25 -05:00 committed by Alexandre Julliard
parent 6bab3afc34
commit cf891b04a0
1 changed files with 43 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
dlls/gdi32/freetype.c
View File

@ -5923,6 +5923,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format,
double widthRatio = 1.0; double widthRatio = 1.0;
FT_Matrix transMat = identityMat; FT_Matrix transMat = identityMat;
FT_Matrix transMatUnrotated; FT_Matrix transMatUnrotated;
FT_Matrix transMatTategaki;
BOOL needsTransform = FALSE; BOOL needsTransform = FALSE;
BOOL tategaki = (font->name[0] == '@'); BOOL tategaki = (font->name[0] == '@');
UINT original_index; UINT original_index;
@ -6015,10 +6016,23 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format,
/* Rotation transform */ /* Rotation transform */
transMatUnrotated = transMat; transMatUnrotated = transMat;
if(font->orientation && !tategaki) { transMatTategaki = transMat;
if(font->orientation || tategaki) {
FT_Matrix rotationMat; FT_Matrix rotationMat;
FT_Matrix taterotationMat;
FT_Vector vecAngle; FT_Vector vecAngle;
angle = FT_FixedFromFloat((double)font->orientation / 10.0);
double orient = font->orientation / 10.0;
double tate_orient = 0.f;
if (tategaki)
tate_orient = ((font->orientation+900)%3600)/10.0;
else
tate_orient = font->orientation/10.0;
if (orient)
{
angle = FT_FixedFromFloat(orient);
pFT_Vector_Unit(&vecAngle, angle); pFT_Vector_Unit(&vecAngle, angle);
rotationMat.xx = vecAngle.x; rotationMat.xx = vecAngle.x;
rotationMat.xy = -vecAngle.y; rotationMat.xy = -vecAngle.y;
@ -6026,6 +6040,19 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format,
rotationMat.yy = rotationMat.xx; rotationMat.yy = rotationMat.xx;
pFT_Matrix_Multiply(&rotationMat, &transMat); pFT_Matrix_Multiply(&rotationMat, &transMat);
}
if (tate_orient)
{
angle = FT_FixedFromFloat(tate_orient);
pFT_Vector_Unit(&vecAngle, angle);
taterotationMat.xx = vecAngle.x;
taterotationMat.xy = -vecAngle.y;
taterotationMat.yx = -taterotationMat.xy;
taterotationMat.yy = taterotationMat.xx;
pFT_Matrix_Multiply(&taterotationMat, &transMatTategaki);
}
needsTransform = TRUE; needsTransform = TRUE;
} }
@ -6039,6 +6066,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format,
worldMat.yy = FT_FixedFromFloat(font->font_desc.matrix.eM22); worldMat.yy = FT_FixedFromFloat(font->font_desc.matrix.eM22);
pFT_Matrix_Multiply(&worldMat, &transMat); pFT_Matrix_Multiply(&worldMat, &transMat);
pFT_Matrix_Multiply(&worldMat, &transMatUnrotated); pFT_Matrix_Multiply(&worldMat, &transMatUnrotated);
pFT_Matrix_Multiply(&worldMat, &transMatTategaki);
needsTransform = TRUE; needsTransform = TRUE;
} }
@ -6052,6 +6080,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format,
extraMat.yy = FT_FixedFromFIXED(lpmat->eM22); extraMat.yy = FT_FixedFromFIXED(lpmat->eM22);
pFT_Matrix_Multiply(&extraMat, &transMat); pFT_Matrix_Multiply(&extraMat, &transMat);
pFT_Matrix_Multiply(&extraMat, &transMatUnrotated); pFT_Matrix_Multiply(&extraMat, &transMatUnrotated);
pFT_Matrix_Multiply(&extraMat, &transMatTategaki);
needsTransform = TRUE; needsTransform = TRUE;
} }
@ -6117,7 +6146,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format,
vec.x = metrics.horiBearingX + xc * metrics.width; vec.x = metrics.horiBearingX + xc * metrics.width;
vec.y = metrics.horiBearingY - yc * metrics.height; vec.y = metrics.horiBearingY - yc * metrics.height;
TRACE("Vec %ld,%ld\n", vec.x, vec.y); TRACE("Vec %ld,%ld\n", vec.x, vec.y);
pFT_Vector_Transform(&vec, &transMat); pFT_Vector_Transform(&vec, &transMatTategaki);
if(xc == 0 && yc == 0) { if(xc == 0 && yc == 0) {
left = right = vec.x; left = right = vec.x;
top = bottom = vec.y; top = bottom = vec.y;
@ -6224,7 +6253,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format,
ft_bitmap.buffer = buf; ft_bitmap.buffer = buf;
if(needsTransform) if(needsTransform)
pFT_Outline_Transform(&ft_face->glyph->outline, &transMat); pFT_Outline_Transform(&ft_face->glyph->outline, &transMatTategaki);
pFT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom ); pFT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom );
@ -6280,7 +6309,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format,
ft_bitmap.buffer = buf; ft_bitmap.buffer = buf;
if(needsTransform) if(needsTransform)
pFT_Outline_Transform(&ft_face->glyph->outline, &transMat); pFT_Outline_Transform(&ft_face->glyph->outline, &transMatTategaki);
pFT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom ); pFT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom );
@ -6385,7 +6414,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format,
rgb = (format == WINE_GGO_HRGB_BITMAP || format == WINE_GGO_VRGB_BITMAP); rgb = (format == WINE_GGO_HRGB_BITMAP || format == WINE_GGO_VRGB_BITMAP);
if ( needsTransform ) if ( needsTransform )
pFT_Outline_Transform (&ft_face->glyph->outline, &transMat); pFT_Outline_Transform (&ft_face->glyph->outline, &transMatTategaki);
if ( pFT_Library_SetLcdFilter ) if ( pFT_Library_SetLcdFilter )
pFT_Library_SetLcdFilter( library, lcdfilter ); pFT_Library_SetLcdFilter( library, lcdfilter );
@ -6484,7 +6513,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format,
if(buflen == 0) buf = NULL; if(buflen == 0) buf = NULL;
if (needsTransform && buf) { if (needsTransform && buf) {
pFT_Outline_Transform(outline, &transMat); pFT_Outline_Transform(outline, &transMatTategaki);
} }
for(contour = 0; contour < outline->n_contours; contour++) { for(contour = 0; contour < outline->n_contours; contour++) {