AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove SK_FREETYPE_HAS_MM.

Browse Source 
The SK_FREETYPE_HAS_MM define was added to delay the changes to
support GX variation fonts on platforms which did not compile ftmm.c
into their FreeType build. Now that all builds should have this file
the define can be removed.

Review URL: https://codereview.chromium.org/1143133006
This commit is contained in:
bungeman 2015-06-01 12:05:23 -07:00 committed by Commit bot
parent 6df86409ca
commit 4f61fee53a
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ports/SkFontHost_FreeType.cpp
View File

@ -42,10 +42,6 @@
#include FT_TYPE1_TABLES_H
#include FT_XFREE86_H
#if !defined(SK_BUILD_FOR_ANDROID) || defined(SK_ANDROID_FREETYPE_HAS_MM)
# define SK_FREETYPE_HAS_MM 1
#endif
// FT_LOAD_COLOR and the corresponding FT_Pixel_Mode::FT_PIXEL_MODE_BGRA
// were introduced in FreeType 2.5.0.
// The following may be removed once FreeType 2.5.0 is required to build.
@ -279,7 +275,6 @@ SkFaceRec::SkFaceRec(SkStreamAsset* stream, uint32_t fontID)
fFTStream.close = sk_ft_stream_close;
}
#if SK_FREETYPE_HAS_MM
static void ft_face_setup_axes(FT_Face face, const SkFontData& data) {
if (!(face->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS)) {
return;
@ -310,7 +305,6 @@ static void ft_face_setup_axes(FT_Face face, const SkFontData& data) {
return;
}
}
#endif
// Will return 0 on failure
// Caller must lock gFTMutex before calling this function.
@ -356,9 +350,7 @@ static SkFaceRec* ref_ft_face(const SkTypeface* typeface) {
}
SkASSERT(rec->fFace);
#if SK_FREETYPE_HAS_MM
ft_face_setup_axes(rec->fFace, *data);
#endif
rec->fNext = gFaceRecHead;
gFaceRecHead = rec;
@ -1769,7 +1761,6 @@ bool SkTypeface_FreeType::Scanner::scanFont(
*isFixedPitch = FT_IS_FIXED_WIDTH(face);
}
#if SK_FREETYPE_HAS_MM
if (axes && face->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS) {
FT_MM_Var* variations = NULL;
FT_Error err = FT_Get_MM_Var(face, &variations);
@ -1789,7 +1780,6 @@ bool SkTypeface_FreeType::Scanner::scanFont(
(*axes)[i].fMaximum = ftAxis.maximum;
}
}
#endif
FT_Done_Face(face);
return true;