stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8233707: systemScale.cpp could not compile with VS2019

Browse Source 
Reviewed-by: serb, aivanov
This commit is contained in:
Yasumasa Suenaga 2019-11-20 09:28:31 +09:00
parent 877e269895
commit 0d30eb4fa9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/java.desktop/windows/native/common/awt/systemscale/systemScale.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -93,7 +93,10 @@ void GetScreenDpi(HMONITOR hmon, float *dpiX, float *dpiY)
__uuidof(ID2D1Factory), NULL, __uuidof(ID2D1Factory), NULL,
&m_pDirect2dFactory); &m_pDirect2dFactory);
if (res == S_OK) { if (res == S_OK) {
#pragma warning(push)
#pragma warning(disable : 4996) // GetDesktopDpi is deprecated.
m_pDirect2dFactory->GetDesktopDpi(dpiX, dpiY); m_pDirect2dFactory->GetDesktopDpi(dpiX, dpiY);
#pragma warning(pop)
m_pDirect2dFactory->Release(); m_pDirect2dFactory->Release();
} }
} }