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

patch_bug_4266_yoffset_v2.patch (text/plain), 4.49 KB, created by Sylvain on 2018-10-11 12:03:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sylvain

Created: 2018-10-11 12:03:29 UTC

Size: 4.49 KB

patch

obsolete

>diff -r 8c0d97042815 SDL_ttf.c
>--- a/SDL_ttf.c	Thu Sep 27 00:35:32 2018 -0700
>+++ b/SDL_ttf.c	Thu Oct 11 14:01:36 2018 +0200
>@@ -1223,12 +1223,17 @@
>     return status;
> }
> 
>+/* offset to compensate negative yoffset, for the last string processed with TTF_Size() 
>+ * https://bugzilla.libsdl.org/show_bug.cgi?id=4266 */
>+static int g_padding_yoffset;
>+
> int TTF_SizeUTF8(TTF_Font *font, const char *text, int *w, int *h)
> {
>     int status;
>     int x, z;
>     int minx, maxx;
>     int miny, maxy;
>+    int min_yoffset;
>     c_glyph *glyph;
>     FT_Error error;
>     FT_Long use_kerning;
>@@ -1242,6 +1247,7 @@
>     status = 0;
>     minx = maxx = 0;
>     miny = maxy = 0;
>+    min_yoffset = 0;
> 
>     /* check kerning */
>     use_kerning = FT_HAS_KERNING(font->face) && font->kerning;
>@@ -1316,9 +1322,16 @@
>         if (glyph->maxy > maxy) {
>             maxy = glyph->maxy;
>         }
>+        if (glyph->yoffset < min_yoffset) {
>+            min_yoffset = glyph->yoffset;
>+        }
>+
>         prev_index = glyph->index;
>     }
> 
>+    /* Remember the padding for the current string */
>+    g_padding_yoffset = (min_yoffset < 0 ? - min_yoffset : 0);
>+
>     /* Fill the bounds rectangle */
>     if (w) {
>         /* Add outline extra width */
>@@ -1338,6 +1351,9 @@
>                 *h = bottom_row;
>             }
>         }
>+
>+        /* Take into account the padding for negative yoffset */
>+        *h += g_padding_yoffset; 
>     }
>     return status;
> }
>@@ -1466,14 +1482,11 @@
>             if ((xstart + glyph->minx) < 0) {
>                 xstart -= (xstart + glyph->minx);
>             }
>-            if ((row + glyph->yoffset) < 0) {
>-                continue;
>-            }
>-            if ((row + glyph->yoffset) >= textbuf->h) {
>+            if ((row + glyph->yoffset + g_padding_yoffset) >= textbuf->h) {
>                 continue;
>             }
>             dst = (Uint8 *)textbuf->pixels +
>-                (row+glyph->yoffset) * textbuf->pitch +
>+                (row + glyph->yoffset + g_padding_yoffset) * textbuf->pitch +
>                 xstart + glyph->minx;
>             src = current->buffer + row * current->pitch;
>             for (col = width; col > 0 && dst < dst_check; --col) {
>@@ -1658,14 +1671,11 @@
>             if ((xstart + glyph->minx) < 0) {
>                 xstart -= (xstart + glyph->minx);
>             }
>-            if ((row + glyph->yoffset) < 0) {
>-                continue;
>-            }
>-            if ((row + glyph->yoffset) >= textbuf->h) {
>+            if ((row + glyph->yoffset + g_padding_yoffset) >= textbuf->h) {
>                 continue;
>             }
>             dst = (Uint8 *)textbuf->pixels +
>-                (row+glyph->yoffset) * textbuf->pitch +
>+                (row + glyph->yoffset + g_padding_yoffset) * textbuf->pitch +
>                 xstart + glyph->minx;
>             src = current->buffer + row * current->pitch;
>             for (col = width; col > 0 && dst < dst_check; --col) {
>@@ -1841,14 +1851,11 @@
>             if ((xstart + glyph->minx) < 0) {
>                 xstart -= (xstart + glyph->minx);
>             }
>-            if ((row + glyph->yoffset) < 0) {
>-                continue;
>-            }
>-            if ((row + glyph->yoffset) >= textbuf->h) {
>+            if ((row + glyph->yoffset + g_padding_yoffset) >= textbuf->h) {
>                 continue;
>             }
>             dst = (Uint32 *)textbuf->pixels +
>-                (row+glyph->yoffset) * textbuf->pitch/4 +
>+                (row + glyph->yoffset + g_padding_yoffset) * textbuf->pitch/4 +
>                 xstart + glyph->minx;
>             src = (Uint8*)glyph->pixmap.buffer + row * glyph->pixmap.pitch;
>             for (col = width; col > 0 && dst < dst_check; --col) {
>@@ -2135,14 +2142,11 @@
>                 if ((xstart + glyph->minx) < 0) {
>                     xstart -= (xstart + glyph->minx);
>                 }
>-                if ((row + glyph->yoffset) < 0) {
>-                    continue;
>-                }
>-                if ((row + glyph->yoffset) >= textbuf->h) {
>+                if ((row + glyph->yoffset + g_padding_yoffset) >= textbuf->h) {
>                     continue;
>                 }
>                 dst = ((Uint32*)textbuf->pixels + rowSize * line) +
>-                        (row+glyph->yoffset) * textbuf->pitch/4 +
>+                        (row + glyph->yoffset + g_padding_yoffset) * textbuf->pitch/4 +
>                         xstart + glyph->minx;
>                 src = (Uint8*)glyph->pixmap.buffer + row * glyph->pixmap.pitch;
>                 for (col = width; col > 0 && dst < dst_check; --col) {

Actions: View | Diff

Attachments on bug 4266: 3308 | 3357 | 3360 | 3363 | 3364 | 3396 | 3397 | 3398

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.