- add a missing break and reshuffle the code a tiny bit to fix CIDs 514466 and 513487
- don't skip the terminating debug print for ft_glyph_format_bitmap

svn path=/trunk/; revision=64847
This commit is contained in:
Kamil Hornicek 2014-10-20 14:26:47 +00:00
parent 923584ae2a
commit 7d9706dd1f

View file

@ -2083,7 +2083,7 @@ ftGdiGetGlyphOutline(
src += ft_face->glyph->bitmap.pitch; src += ft_face->glyph->bitmap.pitch;
dst += pitch; dst += pitch;
} }
return needed; break;
} }
case ft_glyph_format_outline: case ft_glyph_format_outline:
{ {
@ -2113,11 +2113,7 @@ ftGdiGetGlyphOutline(
{ {
return GDI_ERROR; return GDI_ERROR;
} }
}
default:
DPRINT1("Loaded glyph format %x\n", ft_face->glyph->format);
return GDI_ERROR;
}
start = pvBuf; start = pvBuf;
for (row = 0; row < height; row++) for (row = 0; row < height; row++)
{ {
@ -2128,8 +2124,14 @@ ftGdiGetGlyphOutline(
} }
start += pitch; start += pitch;
} }
break; break;
} }
default:
DPRINT1("Loaded glyph format %x\n", ft_face->glyph->format);
return GDI_ERROR;
}
}
case GGO_NATIVE: case GGO_NATIVE:
{ {