[Git][freetype/freetype-demos][master] 4 commits: * src/ftbench.c: Fix g

David Turner pushed to branch master at FreeType / FreeType Demo Programs

Commits:

3825e638

by David Turner at 2021-05-26T15:32:28+02:00

* src/ftbench.c: Fix get_time() for Mingw64

clock_gettime() cannot be used when cross-compiling for Windows
using the Linux Mingw64 toolchain, so ensure the Win32-specific
timer code is always used when _WIN32 is defined.

501ac20f

by David Turner at 2021-05-26T15:32:54+02:00

* graph/win32/grwin32.c: Fix compiler warnings

- Redefine the LCS_sRGB macro to properly compile with the Mingw64
  toolchain and the -Wmultichar warning enabled.

- Add missing return code paths in function.

3d1095e6

by David Turner at 2021-05-26T15:33:16+02:00

* src/ftpngout.c: Remove compiler warning for Mingw64 toolchain.

The #pragma statement is only valid with Microsoft Visual C++

51c0b8ac

by David Turner at 2021-05-26T15:33:37+02:00

* src/ftmemchk.c: Remove minor compiler warning.

Casting a pointer to (long) isn't always correct.

Changes:

ChangeLog

 +2021-05-23  David Turner  <david@freetype.org>
++
 +        * src/ftmemchk.c: Remove minor compiler warning.
++
 +        Casting a pointer to (long) isn't always correct.
++
 +2021-05-23  David Turner  <david@freetype.org>
++
 +        * src/ftpngout.c: Remove compiler warning for Mingw64 toolchain.
++
 +        The #pragma statement is only valid with Microsoft Visual C++
++
 +2021-05-23  David Turner  <david@freetype.org>
++
 +        * graph/win32/grwin32.c: Fix compiler warnings
++
 +        - Redefine the LCS_sRGB macro to properly compile with the Mingw64
 +         toolchain and the -Wmultichar warning enabled.
++
 +        - Add missing return code paths in function.
++
 +2021-05-22  David Turner  <david@freetype.org>
++
 +        * src/ftbench.c: Fix get_time() for Mingw64
++
 +        clock_gettime() cannot be used when cross-compiling for Windows
 +        using the Linux Mingw64 toolchain, so ensure the Win32-specific
 +        timer code is always used when _WIN32 is defined.
++
 -05-24  David Turner  <david@freetype.org>
  	[build] Add Meson build files and documentation.

graph/win32/grwin32.c

@@ -256,6 +256,15 @@ gr_win32_surface_set_icon( grWin32Surface*  surface,
    ICONINFO  ici = { TRUE };
    HICON     hIcon;
 +/* NOTE: The Mingw64 wingdi.h defines this macro as 'sRGB'
 + * which triggers the -Wmultichar warning during compilation,
 + * so replace it with the corresponding numerical value.
 + */
 +#ifdef __MINGW64__
 +#undef  LCS_sRGB
 +#define LCS_sRGB 0x73524742
 +#endif
++
    BITMAPV4HEADER  hdr = { sizeof( BITMAPV4HEADER ),
 , 0, 1, 32, BI_BITFIELDS, 0, 0, 0, 0, 0,
 x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000,
@@ -297,6 +306,8 @@ gr_win32_surface_set_icon( grWin32Surface*  surface,
    case ICON_BIG:
      surface->bIcon = hIcon;
      return s[0];
 +  default:
 +    return 0;  /* should not happen */
+   }
+ }

src/ftbench.c

@@ -198,19 +198,11 @@
    static double
    get_time( void )
+   {
 -#if defined _POSIX_TIMERS && _POSIX_TIMERS > 0
 -    struct timespec  tv;
+-
+-
 -#ifdef _POSIX_CPUTIME
 -    clock_gettime( CLOCK_PROCESS_CPUTIME_ID, &tv );
 -#else
 -    clock_gettime( CLOCK_REALTIME, &tv );
 -#endif /* _POSIX_CPUTIME */
+-
 -    return 1E6 * (double)tv.tv_sec + 1E-3 * (double)tv.tv_nsec;
+-
 -#elif defined _WIN32
 +/* NOTE: When building with the Mingw64 toolchain, _POSIX_TIMERS
 + * will be defined, but clock_gettime() won't, so ensure that the
 + * _WIN32 specific timer code appears first here.
 + */
 +#if defined _WIN32
  #ifdef QPC
      LARGE_INTEGER  ticks;
@@ -238,6 +230,18 @@
  #endif
 +#elif defined _POSIX_TIMERS && _POSIX_TIMERS > 0
 +    struct timespec  tv;
++
++
 +#ifdef _POSIX_CPUTIME
 +    clock_gettime( CLOCK_PROCESS_CPUTIME_ID, &tv );
 +#else
 +    clock_gettime( CLOCK_REALTIME, &tv );
 +#endif /* _POSIX_CPUTIME */
++
 +    return 1E6 * (double)tv.tv_sec + 1E-3 * (double)tv.tv_nsec;
++
  #else
      /* clock() accuracy has improved since glibc 2.18 */
      return 1E6 * (double)clock() / (double)CLOCKS_PER_SEC;

src/ftmemchk.c


     {
       if ( block->base == base && block->size != 0 )
       {
-        fprintf( stderr, "duplicate memory block at %08lx\n", (long)block->base );
+        fprintf( stderr, "duplicate memory block at %p\n", block->base );
         exit(1);
       }
     }

src/ftpngout.c

@@ -147,7 +147,10 @@
  #define WIN32_LEAN_AND_MEAN
  #include<windows.h>
 +/* Microsoft Visual C++ specific pragma */
 +#ifdef _MSC_VER
  #pragma comment (lib,"Gdiplus.lib")
 +#endif
   /* Barebone definitions and opaque types to avoid GDI+ (C++) headers */

From:	David Turner (@david.freetype)
Subject:	[Git][freetype/freetype-demos][master] 4 commits: * src/ftbench.c: Fix get_time() for Mingw64
Date:	Wed, 26 May 2021 13:45:24 +0000

...	...	@@ -66,7 +66,7 @@ void record_my_block( void* base, long size )
66	66	{
67	67	if ( block->base == base && block->size != 0 )
68	68	{
69		- fprintf( stderr, "duplicate memory block at %08lx\n", (long)block->base );
	69	+ fprintf( stderr, "duplicate memory block at %p\n", block->base );
70	70	exit(1);
71	71	}
72	72	}