From d0df6ac433ada2c50c5b506f8d77f5d2480e1533 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sat, 29 Nov 2014 08:23:36 +0100 Subject: [PATCH] Synchronize with FreeType. This corresponds to commits 9ee6a0a0851334a50e9fc54e382adc468533c140, `Fix compiler warning to conversion specifiers in debug messages.', 02b8e7e8d751605b133568b86fbb5dff48b6b5a5, `*/*: s/Invalid_Argument/Invalid_Size_Handle/ where appropriate.', and 6689a009ced7442c121df1224b3c529e81dc5017, `[Savannah bug #43682] Properly handle missing return errors.'. --- lib/tahints.c | 10 +++++----- lib/taloader.c | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/tahints.c b/lib/tahints.c index d52a63a..f2845c6 100644 --- a/lib/tahints.c +++ b/lib/tahints.c @@ -206,7 +206,7 @@ ta_glyph_hints_dump_points(TA_GlyphHints hints) " | xfit | yfit | flags ]\n")); for (point = points; point < limit; point++) - TA_LOG((" [ %5d | %5d | %5d | %6.2f | %6.2f" + TA_LOG((" [ %5ld | %5d | %5d | %6.2f | %6.2f" " | %5.2f | %5.2f | %c ]\n", point - points, point->fx, @@ -279,8 +279,8 @@ ta_glyph_hints_dump_segments(TA_GlyphHints hints) TA_LOG((" (none)\n")); for (seg = segments; seg < limit; seg++) - TA_LOG((" [ %5d | %5.2g | %5s | %4d" - " | %4d | %4d | %5d | %4d" + TA_LOG((" [ %5ld | %5.2g | %5s | %4ld" + " | %4ld | %4ld | %5ld | %4ld" " | %6d | %5d | %11s ]\n", seg - segments, dimension == TA_DIMENSION_HORZ ? (int)seg->first->ox / 64.0 @@ -329,8 +329,8 @@ ta_glyph_hints_dump_edges(TA_GlyphHints hints) TA_LOG((" (none)\n")); for (edge = edges; edge < limit; edge++) - TA_LOG((" [ %5d | %5.2g | %5s | %4d" - " | %5d | %c | %5.2f | %5.2f | %11s ]\n", + TA_LOG((" [ %5ld | %5.2g | %5s | %4ld" + " | %5ld | %c | %5.2f | %5.2f | %11s ]\n", edge - edges, (int)edge->opos / 64.0, ta_dir_str((TA_Direction)edge->dir), diff --git a/lib/taloader.c b/lib/taloader.c index ef5db5f..1ac2d30 100644 --- a/lib/taloader.c +++ b/lib/taloader.c @@ -145,8 +145,8 @@ ta_loader_load_g(TA_Loader loader, loader->trans_delta = internal->glyph_delta; inverse = loader->trans_matrix; - FT_Matrix_Invert(&inverse); - FT_Vector_Transform(&loader->trans_delta, &inverse); + if (!FT_Matrix_Invert(&inverse)) + FT_Vector_Transform(&loader->trans_delta, &inverse); } #endif @@ -507,7 +507,7 @@ ta_loader_load_glyph(FONT* font, if (!size) - return FT_Err_Invalid_Argument; + return FT_Err_Invalid_Size_Handle; memset(&scaler, 0, sizeof (TA_ScalerRec)); -- 2.11.4.GIT