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

Fix more new Clang warnings

Browse Source 
Change-Id: I82a13744669a6b5c23e23e6a719ec79878114dab
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/418697
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
This commit is contained in:
Brian Osman 2021-06-15 13:19:08 -04:00 committed by Skia Commit-Bot
parent c03dc7e638
commit 3d5483a547
4 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/skparagraph/src/Run.h
View File

@ -279,6 +279,7 @@ public:
Cluster(TextRange textRange) : fTextRange(textRange), fGraphemeRange(EMPTY_RANGE) { }
Cluster(const Cluster&) = default;
~Cluster() = default;
SkScalar sizeToChar(TextIndex ch) const;

2
src/core/SkGlyphRunPainter.h
View File

@ -67,6 +67,8 @@ public:
class BitmapDevicePainter {
public:
BitmapDevicePainter() = default;
BitmapDevicePainter(const BitmapDevicePainter&) = default;
virtual ~BitmapDevicePainter() = default;
virtual void paintPaths(

9
src/utils/win/SkDWrite.cpp
View File

@ -14,6 +14,11 @@
#include <dwrite.h>
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wcast-function-type"
#endif
static IDWriteFactory* gDWriteFactory = nullptr;
static void release_dwrite_factory() {
@ -126,4 +131,8 @@ HRESULT SkGetGetUserDefaultLocaleNameProc(SkGetUserDefaultLocaleNameProc* proc)
return S_OK;
}
#if defined(__clang__)
#pragma clang diagnostic pop
#endif
#endif//defined(SK_BUILD_FOR_WIN)

9
src/utils/win/SkWGL_win.cpp
View File

@ -276,6 +276,11 @@ SkWGLExtensions::SkWGLExtensions() {
SkASSERT(dummyGLRC);
wglMakeCurrent(dummyDC, dummyGLRC);
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wcast-function-type"
#endif
GET_PROC(GetExtensionsString, ARB);
GET_PROC(ChoosePixelFormat, ARB);
GET_PROC(GetPixelFormatAttribiv, ARB);
@ -287,6 +292,10 @@ SkWGLExtensions::SkWGLExtensions() {
GET_PROC(ReleasePbufferDC, ARB);
GET_PROC(DestroyPbuffer, ARB);
#if defined(__clang__)
#pragma clang diagnostic pop
#endif
wglMakeCurrent(dummyDC, nullptr);
wglDeleteContext(dummyGLRC);
destroy_dummy_window(dummyWND);