We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] patch v2

patch_bug_4030_warning_sdl_ttf-v2.diff (text/plain), 16.00 KB, created by Sylvain on 2018-10-29 10:52:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sylvain

Created: 2018-10-29 10:52:11 UTC

Size: 16.00 KB

patch

obsolete

>diff -r 2a7e89771fd0 SDL_ttf.c
>--- a/SDL_ttf.c	Sun Oct 28 14:31:38 2018 -0700
>+++ b/SDL_ttf.c	Mon Oct 29 11:47:14 2018 +0100
>@@ -142,6 +142,7 @@
>     return font->ascent - font->underline_offset - 1;
> }
> 
>+#if 0
> /* Gets the top row of the underline. for a given glyph. The outline
>    is taken into account.
>    Need to update row according to height difference between font and glyph:
>@@ -151,6 +152,7 @@
> {
>     return glyph->maxy - font->underline_offset - 1;
> }
>+#endif
> 
> /* Gets the bottom row of the underline. The outline
>    is taken into account.
>@@ -166,6 +168,7 @@
>     return row;
> }
> 
>+#if 0
> /* Gets the bottom row of the underline. for a given glyph. The outline
>    is taken into account.
>    Need to update row according to height difference between font and glyph:
>@@ -175,6 +178,7 @@
> {
>     return TTF_underline_bottom_row(font) - font->ascent + glyph->maxy;
> }
>+#endif
> 
> /* Gets the top row of the strikethrough. The outline
>    is taken into account.
>@@ -186,6 +190,7 @@
>     return font->height / 2;
> }
> 
>+#if 0
> /* Gets the top row of the strikethrough for a given glyph. The outline
>    is taken into account.
>    Need to update row according to height difference between font and glyph:
>@@ -195,6 +200,7 @@
> {
>     return TTF_strikethrough_top_row(font) - font->ascent + glyph->maxy;
> }
>+#endif
> 
> static void TTF_initLineMectrics(const TTF_Font *font, const SDL_Surface *textbuf, const int row, Uint8 **pdst, int *pheight)
> {
>@@ -264,14 +270,12 @@
> {
>     int line;
>     Uint32 *dst_check = (Uint32*)textbuf->pixels + textbuf->pitch/4 * textbuf->h;
>-    Uint8 *dst8; /* destination, byte version */
>     Uint32 *dst;
>     int height;
>     int col;
>     Uint32 pixel = color | 0xFF000000; /* Amask */
> 
>-    TTF_initLineMectrics(font, textbuf, row, &dst8, &height);
>-    dst = (Uint32 *) dst8;
>+    TTF_initLineMectrics(font, textbuf, row, (Uint8**) &dst, &height);
> 
>     /* Draw line */
>     for (line=height; line>0 && dst < dst_check; --line) {
>@@ -657,7 +661,8 @@
>             cached->advance += font->glyph_overhang;
>         }
>         if (TTF_HANDLE_STYLE_ITALIC(font)) {
>-            cached->maxx += (int)SDL_ceil(font->glyph_italics);
>+            float tmp = SDL_ceilf(font->glyph_italics);
>+            cached->maxx += tmp;
>         }
>         cached->stored |= CACHED_METRICS;
>     }
>@@ -741,7 +746,7 @@
>             dst->width += bump;
>         }
>         if (TTF_HANDLE_STYLE_ITALIC(font)) {
>-            int bump = (int)SDL_ceil(font->glyph_italics);
>+            float bump = SDL_ceilf(font->glyph_italics);
>             dst->pitch += bump;
>             dst->width += bump;
>         }
>@@ -952,7 +957,7 @@
> {
>     size_t bytes = 1;
>     while (*text) {
>-        Uint8 ch = *(Uint8*)text++;
>+        Uint8 ch = *(const Uint8*)text++;
>         if (ch <= 0x7F) {
>             bytes += 1;
>         } else {
>@@ -983,7 +988,7 @@
> static void LATIN1_to_UTF8(const char *src, Uint8 *dst)
> {
>     while (*src) {
>-        Uint8 ch = *(Uint8*)src++;
>+        Uint8 ch = *(const Uint8*)src++;
>         if (ch <= 0x7F) {
>             *dst++ = ch;
>         } else {
>@@ -1220,11 +1225,11 @@
> 
> static int TTF_SizeUTF8_Internal(TTF_Font *font, const char *text, int *w, int *h, int *xstart, int *ystart)
> {
>-    int status;
>-    int x, z;
>-    int minx, maxx;
>-    int miny, maxy;
>-    int min_yoffset;
>+    int status = 0;
>+    int x = 0;
>+    int minx = 0, maxx = 0;
>+    int miny = 0, maxy = 0;
>+    int min_yoffset = 0;
>     int increase_height;
>     c_glyph *glyph;
>     FT_Error error;
>@@ -1235,12 +1240,6 @@
> 
>     TTF_CHECKPOINTER(text, -1);
> 
>-    /* Initialize everything to 0 */
>-    status = 0;
>-    minx = maxx = 0;
>-    miny = maxy = 0;
>-    min_yoffset = 0;
>-
>     /* check kerning */
>     use_kerning = FT_HAS_KERNING(font->face) && font->kerning;
> 
>@@ -1251,7 +1250,6 @@
> 
>     /* Load each character and sum it's bounding box */
>     textlen = SDL_strlen(text);
>-    x = 0;
>     while (textlen > 0) {
>         Uint32 c = UTF8_getch(&text, &textlen);
>         if (c == UNICODE_BOM_NATIVE || c == UNICODE_BOM_SWAPPED) {
>@@ -1272,45 +1270,16 @@
>             x += delta.x >> 6;
>         }
> 
>-#if 0
>-        if ((ch == text) && (glyph->minx < 0)) {
>-        /* Fixes the texture wrapping bug when the first letter
>-         * has a negative minx value or horibearing value.  The entire
>-         * bounding box must be adjusted to be bigger so the entire
>-         * letter can fit without any texture corruption or wrapping.
>-         *
>-         * Effects: First enlarges bounding box.
>-         * Second, xstart has to start ahead of its normal spot in the
>-         * negative direction of the negative minx value.
>-         * (pushes everything to the right).
>-         *
>-         * This will make the memory copy of the glyph bitmap data
>-         * work out correctly.
>-         * */
>-            z -= glyph->minx;
>-        }
>-#endif
>+        minx = SDL_min(minx, x + glyph->minx);
> 
>-        z = x + glyph->minx;
>-        if (minx > z) {
>-            minx = z;
>-        }
>-        if (glyph->advance > glyph->maxx) {
>-            z = x + glyph->advance;
>-        } else {
>-            z = x + glyph->maxx;
>-        }
>-        if (maxx < z) {
>-            maxx = z;
>-        }
>+        maxx = SDL_max(maxx, x + glyph->advance);
>+        maxx = SDL_max(maxx, x + glyph->maxx);
>+
>         x += glyph->advance;
> 
>-        if (glyph->miny < miny) {
>-            miny = glyph->miny;
>-        }
>-        if (glyph->maxy > maxy) {
>-            maxy = glyph->maxy;
>-        }
>+        miny = SDL_min(miny, glyph->miny);
>+        maxy = SDL_max(maxy, glyph->maxy);
>+
>         min_yoffset = SDL_min(min_yoffset, glyph->yoffset);
> 
>         prev_index = glyph->index;
>@@ -1319,13 +1288,13 @@
>     /* Initial x start position: often 0, except when a glyph would be written at
>      * a negative position. In this case an offset is needed for the whole line.*/
>     if (xstart) {
>-       *xstart = (minx < 0)? -minx : 0;
>+        *xstart = (minx < 0)? -minx : 0;
>     }
> 
>     /* Initial y start: compensation for a negative yoffset */
>     increase_height = (min_yoffset < 0)? -min_yoffset : 0;
>     if (ystart) {
>-       *ystart = increase_height;
>+        *ystart = increase_height;
>     }
> 
>     /* Fill the bounds rectangle */
>@@ -1408,7 +1377,6 @@
>     Uint8 *dst_check;
>     unsigned int row, col;
>     c_glyph *glyph;
>-
>     FT_Bitmap *current;
>     FT_Error error;
>     FT_Long use_kerning;
>@@ -1572,8 +1540,8 @@
>     Uint8* dst;
>     Uint8* dst_check;
>     unsigned int row, col;
>-    FT_Bitmap* current;
>     c_glyph *glyph;
>+    FT_Bitmap *current;
>     FT_Error error;
>     FT_Long use_kerning;
>     FT_UInt prev_index = 0;
>@@ -1640,9 +1608,10 @@
>             return NULL;
>         }
>         glyph = font->current;
>+        current = &glyph->pixmap;
>         /* Ensure the width of the pixmap is correct. On some cases,
>          * freetype may report a larger pixmap than possible.*/
>-        width = glyph->pixmap.width;
>+        width = current->width;
>         if (font->outline <= 0 && width > glyph->maxx - glyph->minx) {
>             width = glyph->maxx - glyph->minx;
>         }
>@@ -1653,7 +1622,6 @@
>             xstart += delta.x >> 6;
>         }
> 
>-        current = &glyph->pixmap;
>         for (row = 0; row < current->rows; ++row) {
>             dst = (Uint8 *)textbuf->pixels +
>                 (row + ystart + glyph->yoffset) * textbuf->pitch +
>@@ -1739,7 +1707,7 @@
> SDL_Surface *TTF_RenderUTF8_Blended(TTF_Font *font,
>                 const char *text, SDL_Color fg)
> {
>-    int i;
>+    unsigned int i;
>     int xstart,  ystart;
>     int width, height;
>     SDL_Surface *textbuf;
>@@ -1751,6 +1719,7 @@
>     Uint32 *dst_check;
>     unsigned int row, col;
>     c_glyph *glyph;
>+    FT_Bitmap *current;
>     FT_Error error;
>     FT_Long use_kerning;
>     FT_UInt prev_index = 0;
>@@ -1810,9 +1779,10 @@
>             return NULL;
>         }
>         glyph = font->current;
>+        current = &glyph->pixmap;
>         /* Ensure the width of the pixmap is correct. On some cases,
>          * freetype may report a larger pixmap than possible.*/
>-        width = glyph->pixmap.width;
>+        width = current->width;
>         if (font->outline <= 0 && width > glyph->maxx - glyph->minx) {
>             width = glyph->maxx - glyph->minx;
>         }
>@@ -1823,11 +1793,11 @@
>             xstart += delta.x >> 6;
>         }
> 
>-        for (row = 0; row < glyph->pixmap.rows; ++row) {
>+        for (row = 0; row < current->rows; ++row) {
>             dst = (Uint32 *)textbuf->pixels +
>                 (row + ystart + glyph->yoffset) * textbuf->pitch/4 +
>                 xstart + glyph->minx;
>-            src = (Uint8*)glyph->pixmap.buffer + row * glyph->pixmap.pitch;
>+            src = (Uint8*)current->buffer + row * current->pitch;
>             for (col = width; col > 0 && dst < dst_check; --col) {
>                 alpha = *src++;
>                 *dst++ |= pixel | ((Uint32)alpha_table[alpha] << 24);
>@@ -1907,7 +1877,7 @@
> SDL_Surface *TTF_RenderUTF8_Blended_Wrapped(TTF_Font *font,
>                                     const char *text, SDL_Color fg, Uint32 wrapLength)
> {
>-    int i;
>+    unsigned int i;
>     int xstart, ystart;
>     int width, height;
>     SDL_Surface *textbuf;
>@@ -1919,6 +1889,7 @@
>     Uint32 *dst_check;
>     unsigned int row, col;
>     c_glyph *glyph;
>+    FT_Bitmap *current;
>     FT_Error error;
>     FT_Long use_kerning;
>     FT_UInt prev_index = 0;
>@@ -2093,9 +2064,10 @@
>                 return NULL;
>             }
>             glyph = font->current;
>+            current = &glyph->pixmap;
>             /* Ensure the width of the pixmap is correct. On some cases,
>              * freetype may report a larger pixmap than possible.*/
>-            width = glyph->pixmap.width;
>+            width = current->width;
>             if (font->outline <= 0 && width > glyph->maxx - glyph->minx) {
>                 width = glyph->maxx - glyph->minx;
>             }
>@@ -2106,11 +2078,11 @@
>                 xstart += delta.x >> 6;
>             }
> 
>-            for (row = 0; row < glyph->pixmap.rows; ++row) {
>+            for (row = 0; row < current->rows; ++row) {
>                 dst = (Uint32*)textbuf->pixels +
>                     (rowHeight * line + row + ystart + glyph->yoffset) * textbuf->pitch/4 +
>                     xstart + glyph->minx;
>-                src = (Uint8*)glyph->pixmap.buffer + row * glyph->pixmap.pitch;
>+                src = (Uint8*)current->buffer + row * current->pitch;
>                 for (col = width; col > 0 && dst < dst_check; --col) {
>                     alpha = *src++;
>                     *dst++ |= pixel | ((Uint32)alpha_table[alpha] << 24);
>@@ -2252,7 +2224,7 @@
> int TTF_GetFontKerningSizeGlyphs(TTF_Font *font, Uint16 previous_ch, Uint16 ch)
> {
>     int error;
>-    int glyph_index, prev_index;
>+    FT_UInt glyph_index, prev_index;
>     FT_Vector delta;
> 
>     if (ch == UNICODE_BOM_NATIVE || ch == UNICODE_BOM_SWAPPED) {
>diff -r 2a7e89771fd0 glfont.c
>--- a/glfont.c	Sun Oct 28 14:31:38 2018 -0700
>+++ b/glfont.c	Mon Oct 29 11:47:14 2018 +0100
>@@ -40,11 +40,11 @@
> #define WIDTH   640
> #define HEIGHT  480
> 
>-static char *Usage =
>+#define TTF_GLFONT_USAGE \
> "Usage: %s [-utf8|-unicode] [-b] [-i] [-u] [-fgcol r,g,b] [-bgcol r,g,b] \
>-<font>.ttf [ptsize] [text]\n";
>+<font>.ttf [ptsize] [text]\n"
> 
>-void SDL_GL_Enter2DMode(int width, int height)
>+static void SDL_GL_Enter2DMode(int width, int height)
> {
>     /* Note, there may be other things you need to change,
>        depending on how you have your OpenGL state set up.
>@@ -73,7 +73,7 @@
>     glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
> }
> 
>-void SDL_GL_Leave2DMode()
>+static void SDL_GL_Leave2DMode()
> {
>     glMatrixMode(GL_MODELVIEW);
>     glPopMatrix();
>@@ -95,7 +95,7 @@
>     return value;
> }
> 
>-GLuint SDL_GL_LoadTexture(SDL_Surface *surface, GLfloat *texcoord)
>+static GLuint SDL_GL_LoadTexture(SDL_Surface *surface, GLfloat *texcoord)
> {
>     GLuint texture;
>     int w, h;
>@@ -180,7 +180,7 @@
>     SDL_Window *window;
>     SDL_GLContext context;
>     TTF_Font *font;
>-    SDL_Surface *text;
>+    SDL_Surface *text = NULL;
>     int ptsize;
>     int i, done;
>     SDL_Color white = { 0xFF, 0xFF, 0xFF, 0 };
>@@ -249,7 +249,7 @@
>         if (strcmp(argv[i], "-fgcol") == 0) {
>             int r, g, b;
>             if (sscanf (argv[++i], "%d,%d,%d", &r, &g, &b) != 3) {
>-                fprintf(stderr, Usage, argv0);
>+                fprintf(stderr, TTF_GLFONT_USAGE, argv0);
>                 return(1);
>             }
>             forecol->r = (Uint8)r;
>@@ -259,14 +259,14 @@
>         if (strcmp(argv[i], "-bgcol") == 0) {
>             int r, g, b;
>             if (sscanf (argv[++i], "%d,%d,%d", &r, &g, &b) != 3) {
>-                fprintf(stderr, Usage, argv0);
>+                fprintf(stderr, TTF_GLFONT_USAGE, argv0);
>                 return(1);
>             }
>             backcol->r = (Uint8)r;
>             backcol->g = (Uint8)g;
>             backcol->b = (Uint8)b;
>         } else {
>-            fprintf(stderr, Usage, argv0);
>+            fprintf(stderr, TTF_GLFONT_USAGE, argv0);
>             return(1);
>         }
>     }
>@@ -275,7 +275,7 @@
> 
>     /* Check usage */
>     if (!argv[0]) {
>-        fprintf(stderr, Usage, argv0);
>+        fprintf(stderr, TTF_GLFONT_USAGE, argv0);
>         return(1);
>     }
> 
>@@ -369,9 +369,6 @@
>                     unicode_text, *forecol);
>         }
>         break;
>-        default:
>-        text = NULL; /* This shouldn't happen */
>-        break;
>     }
>     if (text == NULL) {
>         fprintf(stderr, "Couldn't render text: %s\n", SDL_GetError());
>diff -r 2a7e89771fd0 showfont.c
>--- a/showfont.c	Sun Oct 28 14:31:38 2018 -0700
>+++ b/showfont.c	Mon Oct 29 11:47:14 2018 +0100
>@@ -30,12 +30,11 @@
> 
> #define DEFAULT_PTSIZE  18
> #define DEFAULT_TEXT    "The quick brown fox jumped over the lazy dog"
>-#define NUM_COLORS      256
> #define WIDTH   640
> #define HEIGHT  480
> 
>-static char *Usage =
>-"Usage: %s [-solid] [-shaded] [-blended] [-utf8|-unicode] [-b] [-i] [-u] [-s] [-outline size] [-hintlight|-hintmono|-hintnone] [-nokerning] [-fgcol r,g,b,a] [-bgcol r,g,b,a] <font>.ttf [ptsize] [text]\n";
>+#define TTF_SHOWFONT_USAGE \
>+"Usage: %s [-solid] [-shaded] [-blended] [-utf8|-unicode] [-b] [-i] [-u] [-s] [-outline size] [-hintlight|-hintmono|-hintnone] [-nokerning] [-fgcol r,g,b,a] [-bgcol r,g,b,a] <font>.ttf [ptsize] [text]\n"
> 
> typedef enum
> {
>@@ -75,7 +74,7 @@
>     SDL_Window *window;
>     SDL_Renderer *renderer;
>     TTF_Font *font;
>-    SDL_Surface *text;
>+    SDL_Surface *text = NULL;
>     Scene scene;
>     int ptsize;
>     int i, done;
>@@ -139,7 +138,7 @@
>         } else
>         if (strcmp(argv[i], "-outline") == 0) {
>             if (sscanf (argv[++i], "%d", &outline) != 1) {
>-                fprintf(stderr, Usage, argv0);
>+                fprintf(stderr, TTF_SHOWFONT_USAGE, argv0);
>                 return(1);
>             }
>         } else
>@@ -161,7 +160,7 @@
>         if (strcmp(argv[i], "-fgcol") == 0) {
>             int r, g, b, a = 0xFF;
>             if (sscanf (argv[++i], "%d,%d,%d,%d", &r, &g, &b, &a) < 3) {
>-                fprintf(stderr, Usage, argv0);
>+                fprintf(stderr, TTF_SHOWFONT_USAGE, argv0);
>                 return(1);
>             }
>             forecol->r = (Uint8)r;
>@@ -172,7 +171,7 @@
>         if (strcmp(argv[i], "-bgcol") == 0) {
>             int r, g, b, a = 0xFF;
>             if (sscanf (argv[++i], "%d,%d,%d,%d", &r, &g, &b, &a) < 3) {
>-                fprintf(stderr, Usage, argv0);
>+                fprintf(stderr, TTF_SHOWFONT_USAGE, argv0);
>                 return(1);
>             }
>             backcol->r = (Uint8)r;
>@@ -180,7 +179,7 @@
>             backcol->b = (Uint8)b;
>             backcol->a = (Uint8)a;
>         } else {
>-            fprintf(stderr, Usage, argv0);
>+            fprintf(stderr, TTF_SHOWFONT_USAGE, argv0);
>             return(1);
>         }
>     }
>@@ -189,7 +188,7 @@
> 
>     /* Check usage */
>     if (!argv[0]) {
>-        fprintf(stderr, Usage, argv0);
>+        fprintf(stderr, TTF_SHOWFONT_USAGE, argv0);
>         return(1);
>     }
> 
>@@ -318,10 +317,6 @@
>             SDL_free(unicode_text);
>         }
>         break;
>-
>-        default:
>-        text = NULL; /* This shouldn't happen */
>-        break;
>     }
>     if (text == NULL) {
>         fprintf(stderr, "Couldn't render text: %s\n", SDL_GetError());

Actions: View | Diff

Attachments on bug 4030: 3400 | 3409 | 3410

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.