summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexei Podtelezhnikov <apodtele@gmail.com>2023-03-05 22:05:24 -0500
committerAlexei Podtelezhnikov <apodtele@gmail.com>2023-03-05 22:05:24 -0500
commitfc01e7dd6710efade138d41b832dcd3f5893e3f9 (patch)
tree0d989ee8a39993372793f1eb33fadda3ee87fbbb
parent70946f6dc6774fad2424bd8349a4e192cd4fd6fa (diff)
downloadfreetype2-fc01e7dd6710efade138d41b832dcd3f5893e3f9.tar.gz
Fix a couple of MSVC warnings.
* src/base/ftcalc.c (FT_MulAddFix): Add cast. * src/sfnt/ttcolr.c (tt_face_get_colorline_stops, read_paint): Ditto.
-rw-r--r--src/base/ftcalc.c2
-rw-r--r--src/sfnt/ttcolr.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/base/ftcalc.c b/src/base/ftcalc.c
index 13e74f335..997921883 100644
--- a/src/base/ftcalc.c
+++ b/src/base/ftcalc.c
@@ -1103,7 +1103,7 @@
for ( i = 0; i < count; ++i )
temp += (FT_Int64)s[i] * f[i];
- return ( temp + 0x8000 ) >> 16;
+ return (FT_Int32)( ( temp + 0x8000 ) >> 16 );
#else
temp.hi = 0;
temp.lo = 0;
diff --git a/src/sfnt/ttcolr.c b/src/sfnt/ttcolr.c
index 057f9bd65..69ccf0ee7 100644
--- a/src/sfnt/ttcolr.c
+++ b/src/sfnt/ttcolr.c
@@ -699,7 +699,7 @@
item_deltas ) )
return 0;
- apaint->u.solid.color.alpha += item_deltas[0];
+ apaint->u.solid.color.alpha += (FT_F2Dot14)item_deltas[0];
}
#endif
@@ -1646,7 +1646,7 @@
return 0;
color_stop->stop_offset += F2DOT14_TO_FIXED( item_deltas[0] );
- color_stop->color.alpha += item_deltas[1];
+ color_stop->color.alpha += (FT_F2Dot14)item_deltas[1];
}
#else
FT_UNUSED( var_index_base );