diff --git a/src/common/image.cpp b/src/common/image.cpp index a3c9483767..cc63e385c1 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -668,13 +668,13 @@ wxImage wxImage::ResampleBilinear(int width, int height) const //result lines - dst_data[0] = r1 * dy1 + r2 * dy; - dst_data[1] = g1 * dy1 + g2 * dy; - dst_data[2] = b1 * dy1 + b2 * dy; + dst_data[0] = static_cast(r1 * dy1 + r2 * dy); + dst_data[1] = static_cast(g1 * dy1 + g2 * dy); + dst_data[2] = static_cast(b1 * dy1 + b2 * dy); dst_data += 3; if ( src_alpha ) - *dst_alpha++ = a1 * dy1 + a2 * dy; + *dst_alpha++ = static_cast(a1 * dy1 + a2 * dy); } } diff --git a/src/richtext/richtexthtml.cpp b/src/richtext/richtexthtml.cpp index 6079da35c5..6af5ab0ae5 100644 --- a/src/richtext/richtexthtml.cpp +++ b/src/richtext/richtexthtml.cpp @@ -322,7 +322,7 @@ void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttr& WXUNUSED( str << wxT(">"); // TODO: convert to pixels - int indentPixels = indentLeftMM*10/4; + int indentPixels = static_cast(indentLeftMM*10/4); if ((GetFlags() & wxRICHTEXT_HANDLER_USE_CSS) == 0) {