From 3ac1d78f419c71b4e9ea8a105ee48efc4ca164be Mon Sep 17 00:00:00 2001 From: Chris Young Date: Fri, 15 Jan 2016 20:43:12 +0000 Subject: [PATCH 1/4] Fix some incorrect type usage --- amiga/font_bitmap.c | 20 ++++++++++---------- amiga/gui.c | 2 +- amiga/options.h | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/amiga/font_bitmap.c b/amiga/font_bitmap.c index d9459b029..a114bd9bd 100644 --- a/amiga/font_bitmap.c +++ b/amiga/font_bitmap.c @@ -100,11 +100,11 @@ static void ami_font_bm_close(struct TextFont *bmfont) CloseFont(bmfont); } -static size_t ami_font_bm_convert_local_to_utf8_offset(const char *utf8string, int length, size_t offset) +static size_t ami_font_bm_convert_local_to_utf8_offset(const char *utf8string, size_t length, UWORD offset) { size_t chr = 0; - for(int i = 0; i < offset; i++) { + for(WORD i = 0; i < offset; i++) { chr = utf8_next(utf8string, length, chr); } @@ -129,7 +129,7 @@ static bool amiga_bm_nsfont_width(const plot_font_style_t *fstyle, return false; } - *width = TextLength(glob->rp, localtext, strlen(localtext)); + *width = (int)TextLength(glob->rp, localtext, (UWORD)strlen(localtext)); free(localtext); ami_font_bm_close(bmfont); @@ -156,7 +156,7 @@ static bool amiga_bm_nsfont_position_in_string(const plot_font_style_t *fstyle, struct TextExtent extent; struct TextFont *bmfont; char *localtext = NULL; - size_t co = 0; + UWORD co = 0; if((glob == NULL) || (glob->rp == NULL)) return false; @@ -168,7 +168,7 @@ static bool amiga_bm_nsfont_position_in_string(const plot_font_style_t *fstyle, return false; } - co = TextFit(glob->rp, localtext, strlen(localtext), + co = TextFit(glob->rp, localtext, (UWORD)strlen(localtext), &extent, NULL, 1, x, 32767); *char_offset = ami_font_bm_convert_local_to_utf8_offset(string, length, co); *actual_x = extent.te_Extent.MaxX; @@ -208,7 +208,7 @@ static bool amiga_bm_nsfont_split(const plot_font_style_t *fstyle, int x, size_t *char_offset, int *actual_x) { struct TextExtent extent; - size_t co, offset; + UWORD co, offset; char *charp; char *localtext; @@ -222,7 +222,7 @@ static bool amiga_bm_nsfont_split(const plot_font_style_t *fstyle, return false; } - offset = TextFit(glob->rp, localtext, strlen(localtext), + offset = TextFit(glob->rp, localtext, (UWORD)strlen(localtext), &extent, NULL, 1, x, 32767); co = offset; @@ -243,8 +243,8 @@ static bool amiga_bm_nsfont_split(const plot_font_style_t *fstyle, } } - if((co > 0) && (co <= strlen(localtext))) { - *actual_x = TextLength(glob->rp, localtext, co); + if((co > 0) && (co < strlen(localtext))) { + *actual_x = (int)TextLength(glob->rp, localtext, co); *char_offset = ami_font_bm_convert_local_to_utf8_offset(string, length, co); } else { *actual_x = x; @@ -269,7 +269,7 @@ static ULONG amiga_bm_nsfont_text(struct RastPort *rp, const char *string, ULONG if(bmfont == NULL) return 0; if(utf8_to_local_encoding(string, length, &localtext) == NSERROR_OK) { Move(rp, dx, dy); - Text(rp, localtext, strlen(localtext)); + Text(rp, localtext, (UWORD)strlen(localtext)); free(localtext); } diff --git a/amiga/gui.c b/amiga/gui.c index 6744d997d..c775e0a65 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -4996,7 +4996,7 @@ static void gui_window_set_status(struct gui_window *g, const char *text) if(utf8text == NULL) return; GetAttr(GA_Width, g->shared->objects[GID_STATUS], (ULONG *)&size); - chars = TextFit(&scrn->RastPort, utf8text, strlen(utf8text), + chars = TextFit(&scrn->RastPort, utf8text, (UWORD)strlen(utf8text), &textex, NULL, 1, size - 4, scrn->RastPort.TxHeight); utf8text[chars] = 0; diff --git a/amiga/options.h b/amiga/options.h index 728f6d4d1..b92eab074 100644 --- a/amiga/options.h +++ b/amiga/options.h @@ -63,7 +63,7 @@ NSOPTION_STRING(font_surrogate, NULL) NSOPTION_STRING(font_unicode_file, NULL) NSOPTION_BOOL(font_unicode_only, false) NSOPTION_BOOL(font_antialiasing, true) -NSOPTION_BOOL(use_diskfont, false) +NSOPTION_BOOL(use_diskfont, false) NSOPTION_BOOL(drag_save_icons, true) NSOPTION_INTEGER(hotlist_window_xpos, 0) NSOPTION_INTEGER(hotlist_window_ypos, 0) From 652c02ef086dac60a1d6e216d79d27825d8ef21d Mon Sep 17 00:00:00 2001 From: Chris Young Date: Fri, 15 Jan 2016 20:48:55 +0000 Subject: [PATCH 2/4] git probs --- amiga/font_bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amiga/font_bitmap.c b/amiga/font_bitmap.c index a114bd9bd..3f6380d52 100644 --- a/amiga/font_bitmap.c +++ b/amiga/font_bitmap.c @@ -104,7 +104,7 @@ static size_t ami_font_bm_convert_local_to_utf8_offset(const char *utf8string, s { size_t chr = 0; - for(WORD i = 0; i < offset; i++) { + for(int i = 0; i < offset; i++) { chr = utf8_next(utf8string, length, chr); } From 20c176b57848bf2639a98d836237eee4abe8cf5a Mon Sep 17 00:00:00 2001 From: Chris Young Date: Fri, 15 Jan 2016 20:50:16 +0000 Subject: [PATCH 3/4] git probs --- amiga/font_bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amiga/font_bitmap.c b/amiga/font_bitmap.c index 3f6380d52..903e8da64 100644 --- a/amiga/font_bitmap.c +++ b/amiga/font_bitmap.c @@ -104,7 +104,7 @@ static size_t ami_font_bm_convert_local_to_utf8_offset(const char *utf8string, s { size_t chr = 0; - for(int i = 0; i < offset; i++) { + for(size_t i = 0; i < offset; i++) { chr = utf8_next(utf8string, length, chr); } From f275267d6b88101ed660dc447e2c1bad7f0cf215 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Fri, 15 Jan 2016 20:51:37 +0000 Subject: [PATCH 4/4] fix incorrect type usage --- amiga/font_bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amiga/font_bitmap.c b/amiga/font_bitmap.c index 903e8da64..173d0afc0 100644 --- a/amiga/font_bitmap.c +++ b/amiga/font_bitmap.c @@ -104,7 +104,7 @@ static size_t ami_font_bm_convert_local_to_utf8_offset(const char *utf8string, s { size_t chr = 0; - for(size_t i = 0; i < offset; i++) { + for(UWORD i = 0; i < offset; i++) { chr = utf8_next(utf8string, length, chr); }