diff options
| -rw-r--r-- | src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx | 4 | ||||
| -rw-r--r-- | test/utf8.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx index 82bf2078a..c5a6e0308 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx @@ -223,11 +223,11 @@ Fl_GDI_Font_Descriptor::Fl_GDI_Font_Descriptor(const char* name, Fl_Fontsize fsi case ' ': break; default: name--; } - int wn = fl_utf8toUtf16(name, strlen(name), wstr, wstr_len); + int wn = fl_utf8toUtf16(name, (unsigned int)strlen(name), wstr, wstr_len); if (wn >= wstr_len) { wstr = (unsigned short*) realloc(wstr, sizeof(unsigned short) * (wn + 1)); wstr_len = wn + 1; - wn = fl_utf8toUtf16(name, strlen(name), wstr, wstr_len); + wn = fl_utf8toUtf16(name, (unsigned int)strlen(name), wstr, wstr_len); } fid = CreateFontW( diff --git a/test/utf8.cxx b/test/utf8.cxx index f77245597..eab5a547a 100644 --- a/test/utf8.cxx +++ b/test/utf8.cxx @@ -577,7 +577,7 @@ int main(int argc, char** argv) latin1, (unsigned int)strlen(latin1)); utf8[l] = '\0'; strcat(utf8, emoji); - l = strlen(utf8); + l = (int)strlen(utf8); make_font_chooser(); extra_font = FL_TIMES_BOLD_ITALIC; |