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

quiet down SkFontHost_FreeType debug logs

Browse Source 
These seem like ad-hoc debugging aids,
not something that needs to print in all Debug builds?
Maybe even should just be deleted?

Change-Id: I240d85b004ccddac134312d369231015d8234fdf
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/203698
Auto-Submit: Mike Klein <mtklein@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
This commit is contained in:
Mike Klein 2019-03-26 10:41:18 -05:00 committed by Skia Commit-Bot
parent ce9a7af967
commit 3e0141ab70
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/ports/SkFontHost_FreeType.cpp
View File

@ -88,6 +88,12 @@
//#define SK_FONTHOST_FREETYPE_RUNTIME_VERSION
//#define SK_GAMMA_APPLY_TO_A8
#if 1
#define LOG_INFO(...)
#else
#define LOG_INFO SkDEBUGF
#endif
static bool isLCD(const SkScalerContextRec& rec) {
return SkMask::kLCD16_Format == rec.fMaskFormat;
}
@ -337,14 +343,14 @@ static void ft_face_setup_axes(SkFaceRec* rec, const SkFontData& data) {
SkDEBUGCODE(
FT_MM_Var* variations = nullptr;
if (FT_Get_MM_Var(rec->fFace.get(), &variations)) {
SkDEBUGF("INFO: font %s claims variations, but none found.\n",
LOG_INFO("INFO: font %s claims variations, but none found.\n",
rec->fFace->family_name);
return;
}
SkAutoFree autoFreeVariations(variations);
if (static_cast<FT_UInt>(data.getAxisCount()) != variations->num_axis) {
SkDEBUGF("INFO: font %s has %d variations, but %d were specified.\n",
LOG_INFO("INFO: font %s has %d variations, but %d were specified.\n",
rec->fFace->family_name, variations->num_axis, data.getAxisCount());
return;
}
@ -355,7 +361,7 @@ static void ft_face_setup_axes(SkFaceRec* rec, const SkFontData& data) {
coords[i] = data.getAxis()[i];
}
if (FT_Set_Var_Design_Coordinates(rec->fFace.get(), data.getAxisCount(), coords.get())) {
SkDEBUGF("INFO: font %s has variations, but specified variations could not be set.\n",
LOG_INFO("INFO: font %s has variations, but specified variations could not be set.\n",
rec->fFace->family_name);
return;
}
@ -789,7 +795,7 @@ bool SkTypeface_FreeType::onGetKerningPairAdjustments(const uint16_t glyphs[],
/** Returns the bitmap strike equal to or just larger than the requested size. */
static FT_Int chooseBitmapStrike(FT_Face face, FT_F26Dot6 scaleY) {
if (face == nullptr) {
SkDEBUGF("chooseBitmapStrike aborted due to nullptr face.\n");
LOG_INFO("chooseBitmapStrike aborted due to nullptr face.\n");
return -1;
}
@ -833,7 +839,7 @@ SkScalerContext_FreeType::SkScalerContext_FreeType(sk_sp<SkTypeface> typeface,
// load the font file
if (nullptr == fFaceRec) {
SkDEBUGF("Could not create FT_Face.\n");
LOG_INFO("Could not create FT_Face.\n");
return;
}
@ -874,7 +880,7 @@ SkScalerContext_FreeType::SkScalerContext_FreeType(sk_sp<SkTypeface> typeface,
}
break;
default:
SkDebugf("---------- UNKNOWN hinting %d\n", fRec.getHinting());
LOG_INFO("---------- UNKNOWN hinting %d\n", fRec.getHinting());
break;
}
}
@ -917,7 +923,7 @@ SkScalerContext_FreeType::SkScalerContext_FreeType(sk_sp<SkTypeface> typeface,
return size;
}());
if (nullptr == ftSize) {
SkDEBUGF("Could not create FT_Size.\n");
LOG_INFO("Could not create FT_Size.\n");
return;
}
@ -953,7 +959,7 @@ SkScalerContext_FreeType::SkScalerContext_FreeType(sk_sp<SkTypeface> typeface,
} else if (FT_HAS_FIXED_SIZES(fFaceRec->fFace)) {
fStrikeIndex = chooseBitmapStrike(fFaceRec->fFace.get(), scaleY);
if (fStrikeIndex == -1) {
SkDEBUGF("No glyphs for font \"%s\" size %f.\n",
LOG_INFO("No glyphs for font \"%s\" size %f.\n",
fFaceRec->fFace->family_name, fScale.fY);
return;
}
@ -982,7 +988,7 @@ SkScalerContext_FreeType::SkScalerContext_FreeType(sk_sp<SkTypeface> typeface,
// Force this flag off for bitmap only fonts.
fLoadGlyphFlags &= ~FT_LOAD_NO_BITMAP;
} else {
SkDEBUGF("Unknown kind of font \"%s\" size %f.\n", fFaceRec->fFace->family_name, fScale.fY);
LOG_INFO("Unknown kind of font \"%s\" size %f.\n", fFaceRec->fFace->family_name, fScale.fY);
return;
}
@ -1294,7 +1300,7 @@ void SkScalerContext_FreeType::generateMetrics(SkGlyph* glyph) {
}
#ifdef ENABLE_GLYPH_SPEW
SkDEBUGF("Metrics(glyph:%d flags:0x%x) w:%d\n", glyph->getGlyphID(), fLoadGlyphFlags, glyph->fWidth);
LOG_INFO("Metrics(glyph:%d flags:0x%x) w:%d\n", glyph->getGlyphID(), fLoadGlyphFlags, glyph->fWidth);
#endif
}
@ -1904,7 +1910,7 @@ bool SkTypeface_FreeType::Scanner::scanFont(
if (index >= 0) {
weight = commonWeights[index].weight;
} else {
SkDEBUGF("Do not know weight for: %s (%s) \n", face->family_name, psFontInfo.weight);
LOG_INFO("Do not know weight for: %s (%s) \n", face->family_name, psFontInfo.weight);
}
}
@ -1928,7 +1934,7 @@ bool SkTypeface_FreeType::Scanner::GetAxes(FT_Face face, AxisDefinitions* axes)
FT_MM_Var* variations = nullptr;
FT_Error err = FT_Get_MM_Var(face, &variations);
if (err) {
SkDEBUGF("INFO: font %s claims to have variations, but none found.\n",
LOG_INFO("INFO: font %s claims to have variations, but none found.\n",
face->family_name);
return false;
}
@ -1964,7 +1970,7 @@ bool SkTypeface_FreeType::Scanner::GetAxes(FT_Face face, AxisDefinitions* axes)
if (axisDefinition.fTag == coordinate.axis) {
const SkScalar axisValue = SkTPin(coordinate.value, axisMin, axisMax);
if (coordinate.value != axisValue) {
SkDEBUGF("Requested font axis value out of range: "
LOG_INFO("Requested font axis value out of range: "
"%s '%c%c%c%c' %f; pinned to %f.\n",
name.c_str(),
(axisDefinition.fTag >> 24) & 0xFF,
@ -1993,7 +1999,7 @@ bool SkTypeface_FreeType::Scanner::GetAxes(FT_Face face, AxisDefinitions* axes)
}
}
if (!found) {
SkDEBUGF("Requested font axis not found: %s '%c%c%c%c'\n",
LOG_INFO("Requested font axis not found: %s '%c%c%c%c'\n",
name.c_str(),
(skTag >> 24) & 0xFF,
(skTag >> 16) & 0xFF,