From a3ff8e1104706dc86e269bbb5690fcc1f31fa47d Mon Sep 17 00:00:00 2001
From: Oliver Behnke <oliver.behnke@aei.mpg.de>
Date: Wed, 25 Nov 2020 13:03:07 +0100
Subject: [PATCH] Use a regular instead of a function-style cast (MinGW
complains otherwise)
---
src/starsphere/Starsphere.cpp | 4 ++--
src/starsphere/StarsphereRadio.cpp | 4 ++--
src/starsphere/StarsphereS5R3.cpp | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/starsphere/Starsphere.cpp b/src/starsphere/Starsphere.cpp
index 79c00ea..0704e26 100644
--- a/src/starsphere/Starsphere.cpp
+++ b/src/starsphere/Starsphere.cpp
@@ -654,7 +654,7 @@ void Starsphere::initialize(const int width, const int height, const float scale
m_FontHeader = new OGLFT::TranslucentTexture(
&m_FontResource->data()->at(0),
m_FontResource->data()->size(),
- 20, uint(DESIGN_DPI) );
+ 20, (FT_UInt) DESIGN_DPI );
if ( m_FontHeader == 0 || !m_FontHeader->isValid() ) {
cerr << "Could not construct header font face from in memory resource!" << endl;
@@ -667,7 +667,7 @@ void Starsphere::initialize(const int width, const int height, const float scale
m_FontText = new OGLFT::TranslucentTexture(
&m_FontResource->data()->at(0),
m_FontResource->data()->size(),
- 16, uint(DESIGN_DPI) );
+ 16, (FT_UInt) DESIGN_DPI );
if ( m_FontText == 0 || !m_FontText->isValid() ) {
cerr << "Could not construct text font face from in memory resource!" << endl;
diff --git a/src/starsphere/StarsphereRadio.cpp b/src/starsphere/StarsphereRadio.cpp
index 17e265f..4848974 100644
--- a/src/starsphere/StarsphereRadio.cpp
+++ b/src/starsphere/StarsphereRadio.cpp
@@ -76,7 +76,7 @@ void StarsphereRadio::initialize(const int width, const int height, const float
m_FontLogo1 = new OGLFT::TranslucentTexture(
&m_FontResource->data()->at(0),
m_FontResource->data()->size(),
- 36, uint(DESIGN_DPI) );
+ 36, (FT_UInt) DESIGN_DPI );
if ( m_FontLogo1 == 0 || !m_FontLogo1->isValid() ) {
cerr << "Could not construct logo1 font face from in memory resource!" << endl;
@@ -89,7 +89,7 @@ void StarsphereRadio::initialize(const int width, const int height, const float
m_FontLogo2 = new OGLFT::TranslucentTexture(
&m_FontResource->data()->at(0),
m_FontResource->data()->size(),
- 15.5, uint(DESIGN_DPI) );
+ 15.5, (FT_UInt) DESIGN_DPI );
if ( m_FontLogo2 == 0 || !m_FontLogo2->isValid() ) {
cerr << "Could not construct logo2 font face from in memory resource!" << endl;
diff --git a/src/starsphere/StarsphereS5R3.cpp b/src/starsphere/StarsphereS5R3.cpp
index cbee93a..b7aabe9 100644
--- a/src/starsphere/StarsphereS5R3.cpp
+++ b/src/starsphere/StarsphereS5R3.cpp
@@ -58,7 +58,7 @@ void StarsphereS5R3::initialize(const int width, const int height, const float s
m_FontLogo1 = new OGLFT::TranslucentTexture(
&m_FontResource->data()->at(0),
m_FontResource->data()->size(),
- 36, uint(DESIGN_DPI) );
+ 36, (FT_UInt) DESIGN_DPI );
if ( m_FontLogo1 == 0 || !m_FontLogo1->isValid() ) {
cerr << "Could not construct logo1 font face from in memory resource!" << endl;
@@ -71,7 +71,7 @@ void StarsphereS5R3::initialize(const int width, const int height, const float s
m_FontLogo2 = new OGLFT::TranslucentTexture(
&m_FontResource->data()->at(0),
m_FontResource->data()->size(),
- 16, uint(DESIGN_DPI) );
+ 16, (FT_UInt) DESIGN_DPI );
if ( m_FontLogo2 == 0 || !m_FontLogo2->isValid() ) {
cerr << "Could not construct logo2 font face from in memory resource!" << endl;
--
GitLab