Werner Lemberg pushed to branch master at FreeType / FreeType Demo Programs
Commits:
-
ae38e951
by Werner Lemberg at 2021-05-26T20:27:22+02:00
4 changed files:
Changes:
| 1 | 1 |
2021-05-23 David Turner <david@freetype.org>
|
| 2 | 2 |
|
| 3 |
- * src/ftmemchk.c: Remove minor compiler warning.
|
|
| 3 |
+ * src/ftmemchk.c: Remove minor compiler warning.
|
|
| 4 | 4 |
|
| 5 |
- Casting a pointer to (long) isn't always correct.
|
|
| 5 |
+ Casting a pointer to (long) isn't always correct.
|
|
| 6 | 6 |
|
| 7 | 7 |
2021-05-23 David Turner <david@freetype.org>
|
| 8 | 8 |
|
| 9 |
- * src/ftpngout.c: Remove compiler warning for Mingw64 toolchain.
|
|
| 9 |
+ * src/ftpngout.c: Remove compiler warning for Mingw64 toolchain.
|
|
| 10 | 10 |
|
| 11 |
- The #pragma statement is only valid with Microsoft Visual C++
|
|
| 11 |
+ The #pragma statement is only valid with Microsoft Visual C++
|
|
| 12 | 12 |
|
| 13 | 13 |
2021-05-23 David Turner <david@freetype.org>
|
| 14 | 14 |
|
| 15 |
- * graph/win32/grwin32.c: Fix compiler warnings
|
|
| 15 |
+ * graph/win32/grwin32.c: Fix compiler warnings.
|
|
| 16 | 16 |
|
| 17 |
- - Redefine the LCS_sRGB macro to properly compile with the Mingw64
|
|
| 18 |
- toolchain and the -Wmultichar warning enabled.
|
|
| 17 |
+ - Redefine the LCS_sRGB macro to properly compile with the Mingw64
|
|
| 18 |
+ toolchain and the -Wmultichar warning enabled.
|
|
| 19 | 19 |
|
| 20 |
- - Add missing return code paths in function.
|
|
| 20 |
+ - Add missing return code paths in function.
|
|
| 21 | 21 |
|
| 22 | 22 |
2021-05-22 David Turner <david@freetype.org>
|
| 23 | 23 |
|
| 24 |
- * src/ftbench.c: Fix get_time() for Mingw64
|
|
| 24 |
+ * src/ftbench.c: Fix get_time() for Mingw64.
|
|
| 25 | 25 |
|
| 26 |
- clock_gettime() cannot be used when cross-compiling for Windows
|
|
| 27 |
- using the Linux Mingw64 toolchain, so ensure the Win32-specific
|
|
| 28 |
- timer code is always used when _WIN32 is defined.
|
|
| 26 |
+ clock_gettime() cannot be used when cross-compiling for Windows
|
|
| 27 |
+ using the Linux Mingw64 toolchain, so ensure the Win32-specific
|
|
| 28 |
+ timer code is always used when _WIN32 is defined.
|
|
| 29 | 29 |
|
| 30 | 30 |
2021-05-24 David Turner <david@freetype.org>
|
| 31 | 31 |
|
| ... | ... | @@ -33,14 +33,14 @@ |
| 33 | 33 |
#define xxSWIZZLE
|
| 34 | 34 |
|
| 35 | 35 |
#ifdef SWIZZLE
|
| 36 |
-#include "grswizzle.h"
|
|
| 36 |
+# include "grswizzle.h"
|
|
| 37 | 37 |
#endif
|
| 38 | 38 |
|
| 39 | 39 |
/* logging facility */
|
| 40 | 40 |
#define xxDEBUG
|
| 41 | 41 |
|
| 42 | 42 |
#ifdef DEBUG
|
| 43 |
-#include <stdarg.h>
|
|
| 43 |
+# include <stdarg.h>
|
|
| 44 | 44 |
|
| 45 | 45 |
static void LogMessage( const char* fmt, ... )
|
| 46 | 46 |
{
|
| ... | ... | @@ -256,13 +256,13 @@ gr_win32_surface_set_icon( grWin32Surface* surface, |
| 256 | 256 |
ICONINFO ici = { TRUE };
|
| 257 | 257 |
HICON hIcon;
|
| 258 | 258 |
|
| 259 |
-/* NOTE: The Mingw64 wingdi.h defines this macro as 'sRGB'
|
|
| 260 |
- * which triggers the -Wmultichar warning during compilation,
|
|
| 261 |
- * so replace it with the corresponding numerical value.
|
|
| 262 |
- */
|
|
| 259 |
+ /* NOTE: The Mingw64 header file `wingdi.h` defines this macro as `sRGB`,
|
|
| 260 |
+ * which triggers the `-Wmultichar` warning during compilation, so replace
|
|
| 261 |
+ * it with the corresponding numerical value.
|
|
| 262 |
+ */
|
|
| 263 | 263 |
#ifdef __MINGW64__
|
| 264 |
-#undef LCS_sRGB
|
|
| 265 |
-#define LCS_sRGB 0x73524742
|
|
| 264 |
+# undef LCS_sRGB
|
|
| 265 |
+# define LCS_sRGB 0x73524742
|
|
| 266 | 266 |
#endif
|
| 267 | 267 |
|
| 268 | 268 |
BITMAPV4HEADER hdr = { sizeof( BITMAPV4HEADER ),
|
| ... | ... | @@ -198,11 +198,11 @@ |
| 198 | 198 |
static double
|
| 199 | 199 |
get_time( void )
|
| 200 | 200 |
{
|
| 201 |
-/* NOTE: When building with the Mingw64 toolchain, _POSIX_TIMERS
|
|
| 202 |
- * will be defined, but clock_gettime() won't, so ensure that the
|
|
| 203 |
- * _WIN32 specific timer code appears first here.
|
|
| 204 |
- */
|
|
| 205 |
-#if defined _WIN32
|
|
| 201 |
+ /* NOTE: When building with the Mingw64 toolchain, `_POSIX_TIMERS` is
|
|
| 202 |
+ * defined, but function `clock_gettime` is not. Ensure that the
|
|
| 203 |
+ * `_WIN32` specific timer code appears first here.
|
|
| 204 |
+ */
|
|
| 205 |
+#if defined _WIN32
|
|
| 206 | 206 |
|
| 207 | 207 |
#ifdef QPC
|
| 208 | 208 |
LARGE_INTEGER ticks;
|
| ... | ... | @@ -147,9 +147,9 @@ |
| 147 | 147 |
#define WIN32_LEAN_AND_MEAN
|
| 148 | 148 |
#include<windows.h>
|
| 149 | 149 |
|
| 150 |
-/* Microsoft Visual C++ specific pragma */
|
|
| 150 |
+ /* Microsoft Visual C++ specific pragma */
|
|
| 151 | 151 |
#ifdef _MSC_VER
|
| 152 |
-#pragma comment (lib,"Gdiplus.lib")
|
|
| 152 |
+# pragma comment (lib,"Gdiplus.lib")
|
|
| 153 | 153 |
#endif
|
| 154 | 154 |
|
| 155 | 155 |
/* Barebone definitions and opaque types to avoid GDI+ (C++) headers */
|