From c661b773f8ae37bbdea6da25a57d3626e7113920 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Thu, 3 Jun 2021 18:32:44 -0500 Subject: In thmutil when drawing images, use GDI+ and the actual dimensions. Partial fix for #6155 Fixes #4106 --- src/api/burn/balutil/precomp.h | 7 +++++++ src/api/burn/test/BalUtilUnitTest/precomp.h | 7 +++++++ 2 files changed, 14 insertions(+) (limited to 'src/api') diff --git a/src/api/burn/balutil/precomp.h b/src/api/burn/balutil/precomp.h index 207c8ca6..15142210 100644 --- a/src/api/burn/balutil/precomp.h +++ b/src/api/burn/balutil/precomp.h @@ -3,6 +3,12 @@ #include + +#pragma warning(push) +#pragma warning(disable:4458) // declaration of 'xxx' hides class member +#include +#pragma warning(pop) + #include #include #include @@ -13,6 +19,7 @@ #include #include #include +#include #include #include #include diff --git a/src/api/burn/test/BalUtilUnitTest/precomp.h b/src/api/burn/test/BalUtilUnitTest/precomp.h index a84391f9..f4a35e20 100644 --- a/src/api/burn/test/BalUtilUnitTest/precomp.h +++ b/src/api/burn/test/BalUtilUnitTest/precomp.h @@ -3,10 +3,17 @@ #include + +#pragma warning(push) +#pragma warning(disable:4458) // declaration of 'xxx' hides class member +#include +#pragma warning(pop) + #include #include #include +#include #include #include -- cgit v1.2.3-55-g6feb