Skip to content

Commit

Permalink
additional fix for bug #2749.
Browse files Browse the repository at this point in the history 
https://bugzilla.libsdl.org/show_bug.cgi?id=2749#c12
patch from Sylvain Becker.
  • Loading branch information
@sezero
sezero committed Oct 24, 2018
1 parent 50d72e5 commit 71352af
Showing 1 changed file with 18 additions and 21 deletions.
39 changes: 18 additions & 21 deletions SDL_ttf.c
View file
Expand Up @@ -1223,7 +1223,7 @@ int TTF_SizeText(TTF_Font *font, const char *text, int *w, int *h)
return status;
}

int TTF_SizeUTF8(TTF_Font *font, const char *text, int *w, int *h)
static int TTF_SizeUTF8_Internal(TTF_Font *font, const char *text, int *w, int *h, int *xstart)
{
int status;
int x, z;
Expand Down Expand Up @@ -1253,7 +1253,7 @@ int TTF_SizeUTF8(TTF_Font *font, const char *text, int *w, int *h)

/* Load each character and sum it's bounding box */
textlen = SDL_strlen(text);
x= 0;
x = 0;
while (textlen > 0) {
Uint32 c = UTF8_getch(&text, &textlen);
if (c == UNICODE_BOM_NATIVE || c == UNICODE_BOM_SWAPPED) {
Expand Down Expand Up @@ -1319,6 +1319,12 @@ int TTF_SizeUTF8(TTF_Font *font, const char *text, int *w, int *h)
prev_index = glyph->index;
}

/* 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;
}

/* Fill the bounds rectangle */
if (w) {
/* Add outline extra width */
Expand All @@ -1342,6 +1348,10 @@ int TTF_SizeUTF8(TTF_Font *font, const char *text, int *w, int *h)
return status;
}

int TTF_SizeUTF8(TTF_Font *font, const char *text, int *w, int *h) {
return TTF_SizeUTF8_Internal(font, text, w, h, NULL);
}

int TTF_SizeUNICODE(TTF_Font *font, const Uint16 *text, int *w, int *h)
{
int status = -1;
Expand Down Expand Up @@ -1402,7 +1412,7 @@ SDL_Surface *TTF_RenderUTF8_Solid(TTF_Font *font,
TTF_CHECKPOINTER(text, NULL);

/* Get the dimensions of the text surface */
if ((TTF_SizeUTF8(font, text, &width, &height) < 0) || !width) {
if ((TTF_SizeUTF8_Internal(font, text, &width, &height, &xstart) < 0) || !width) {
TTF_SetError("Text has zero width");
return NULL;
}
Expand Down Expand Up @@ -1433,7 +1443,6 @@ SDL_Surface *TTF_RenderUTF8_Solid(TTF_Font *font,

/* Load and render each character */
textlen = SDL_strlen(text);
xstart = 0;
while (textlen > 0) {
Uint32 c = UTF8_getch(&text, &textlen);
if (c == UNICODE_BOM_NATIVE || c == UNICODE_BOM_SWAPPED) {
Expand Down Expand Up @@ -1463,9 +1472,6 @@ SDL_Surface *TTF_RenderUTF8_Solid(TTF_Font *font,

for (row = 0; row < current->rows; ++row) {
/* Make sure we don't go either over, or under the limit */
if ((xstart + glyph->minx) < 0) {
xstart -= (xstart + glyph->minx);
}
if ((row + glyph->yoffset) < 0) {
continue;
}
Expand Down Expand Up @@ -1580,7 +1586,7 @@ SDL_Surface *TTF_RenderUTF8_Shaded(TTF_Font *font,
TTF_CHECKPOINTER(text, NULL);

/* Get the dimensions of the text surface */
if ((TTF_SizeUTF8(font, text, &width, &height) < 0) || !width) {
if ((TTF_SizeUTF8_Internal(font, text, &width, &height, &xstart) < 0) || !width) {
TTF_SetError("Text has zero width");
return NULL;
}
Expand Down Expand Up @@ -1625,7 +1631,6 @@ SDL_Surface *TTF_RenderUTF8_Shaded(TTF_Font *font,

/* Load and render each character */
textlen = SDL_strlen(text);
xstart = 0;
while (textlen > 0) {
Uint32 c = UTF8_getch(&text, &textlen);
if (c == UNICODE_BOM_NATIVE || c == UNICODE_BOM_SWAPPED) {
Expand Down Expand Up @@ -1655,9 +1660,6 @@ SDL_Surface *TTF_RenderUTF8_Shaded(TTF_Font *font,
current = &glyph->pixmap;
for (row = 0; row < current->rows; ++row) {
/* Make sure we don't go either over, or under the limit */
if ((xstart + glyph->minx) < 0) {
xstart -= (xstart + glyph->minx);
}
if ((row + glyph->yoffset) < 0) {
continue;
}
Expand Down Expand Up @@ -1771,7 +1773,7 @@ SDL_Surface *TTF_RenderUTF8_Blended(TTF_Font *font,
TTF_CHECKPOINTER(text, NULL);

/* Get the dimensions of the text surface */
if ((TTF_SizeUTF8(font, text, &width, &height) < 0) || !width) {
if ((TTF_SizeUTF8_Internal(font, text, &width, &height, &xstart) < 0) || !width) {
TTF_SetError("Text has zero width");
return(NULL);
}
Expand Down Expand Up @@ -1807,7 +1809,6 @@ SDL_Surface *TTF_RenderUTF8_Blended(TTF_Font *font,

/* Load and render each character */
textlen = SDL_strlen(text);
xstart = 0;
pixel = (fg.r<<16)|(fg.g<<8)|fg.b;
SDL_FillRect(textbuf, NULL, pixel); /* Initialize with fg and 0 alpha */
while (textlen > 0) {
Expand Down Expand Up @@ -1838,9 +1839,6 @@ SDL_Surface *TTF_RenderUTF8_Blended(TTF_Font *font,

for (row = 0; row < glyph->pixmap.rows; ++row) {
/* Make sure we don't go either over, or under the limit */
if ((xstart + glyph->minx) < 0) {
xstart -= (xstart + glyph->minx);
}
if ((row + glyph->yoffset) < 0) {
continue;
}
Expand Down Expand Up @@ -2099,7 +2097,9 @@ SDL_Surface *TTF_RenderUTF8_Blended_Wrapped(TTF_Font *font,
text = strLines[line];
}
textlen = SDL_strlen(text);
xstart = 0;

/* Initialize xstart */
TTF_SizeUTF8_Internal(font, text, NULL, NULL, &xstart);
while (textlen > 0) {
Uint32 c = UTF8_getch(&text, &textlen);
if (c == UNICODE_BOM_NATIVE || c == UNICODE_BOM_SWAPPED) {
Expand Down Expand Up @@ -2132,9 +2132,6 @@ SDL_Surface *TTF_RenderUTF8_Blended_Wrapped(TTF_Font *font,

for (row = 0; row < glyph->pixmap.rows; ++row) {
/* Make sure we don't go either over, or under the limit */
if ((xstart + glyph->minx) < 0) {
xstart -= (xstart + glyph->minx);
}
if ((row + glyph->yoffset) < 0) {
continue;
}
Expand Down

0 comments on commit 71352af

Please sign in to comment.