Title: [235325] trunk/Source/WebCore
Revision
235325
Author
ape...@igalia.com
Date
2018-08-24 12:13:02 -0700 (Fri, 24 Aug 2018)

Log Message

[FreeType] Do not cast through GLib types in FontCustomPlatformDataFreeType.cpp
https://bugs.webkit.org/show_bug.cgi?id=188919

Reviewed by Michael Catanzaro.

No new tests needed.

* platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp:
(WebCore::FontCustomPlatformData::FontCustomPlatformData): Cast
through "void (*)(void)" instead of GCallback to avoid the warning
produced by -Wcast-function-type.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (235324 => 235325)


--- trunk/Source/WebCore/ChangeLog	2018-08-24 19:10:19 UTC (rev 235324)
+++ trunk/Source/WebCore/ChangeLog	2018-08-24 19:13:02 UTC (rev 235325)
@@ -1,3 +1,17 @@
+2018-08-24  Adrian Perez de Castro  <ape...@igalia.com>
+
+        [FreeType] Do not cast through GLib types in FontCustomPlatformDataFreeType.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=188919
+
+        Reviewed by Michael Catanzaro.
+
+        No new tests needed.
+
+        * platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp:
+        (WebCore::FontCustomPlatformData::FontCustomPlatformData): Cast
+        through "void (*)(void)" instead of GCallback to avoid the warning
+        produced by -Wcast-function-type.
+
 2018-08-24  Andy Estes  <aes...@apple.com>
 
         [Apple Pay] Allow $0 totals

Modified: trunk/Source/WebCore/platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp (235324 => 235325)


--- trunk/Source/WebCore/platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp	2018-08-24 19:10:19 UTC (rev 235324)
+++ trunk/Source/WebCore/platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp	2018-08-24 19:13:02 UTC (rev 235325)
@@ -48,7 +48,7 @@
     // this cairo_font_face_t is destroyed, it cleans up the FreeType face as well.
     static cairo_user_data_key_t freeTypeFaceKey;
     cairo_font_face_set_user_data(m_fontFace, &freeTypeFaceKey, freeTypeFace,
-        reinterpret_cast<cairo_destroy_func_t>(reinterpret_cast<GCallback>(FT_Done_Face)));
+        reinterpret_cast<cairo_destroy_func_t>(reinterpret_cast<void(*)(void)>(FT_Done_Face)));
 }
 
 FontCustomPlatformData::~FontCustomPlatformData()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to