Update of /cvsroot/freevo/freevo/runtime/src
In directory sc8-pr-cvs1:/tmp/cvs-serv5547
Modified Files:
SDL_ttf2-patch2
Log Message:
Updating to apply to CVS 20030613.
Index: SDL_ttf2-patch2
===================================================================
RCS file: /cvsroot/freevo/freevo/runtime/src/SDL_ttf2-patch2,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SDL_ttf2-patch2 28 Jan 2003 03:57:31 -0000 1.1
--- SDL_ttf2-patch2 13 Jun 2003 22:39:51 -0000 1.2
***************
*** 1,5 ****
! --- SDL_ttf-2.0.5/SDL_ttf.c Fri Jan 18 15:46:04 2002
! +++ SDL_ttf-2.0.5-freevo1/SDL_ttf.c Wed Oct 2 22:36:39 2002
! @@ -632,6 +632,8 @@
int x, z;
int minx, maxx;
--- 1,10 ----
! Index: SDL_ttf.c
! ===================================================================
! RCS file: /home/sdlweb/libsdl.org/cvs/SDL_ttf2/SDL_ttf.c,v
! retrieving revision 1.16
! diff -u -r1.16 SDL_ttf.c
! --- SDL_ttf.c 3 May 2003 20:07:53 -0000 1.16
! +++ SDL_ttf.c 13 Jun 2003 22:37:53 -0000
! @@ -830,6 +830,8 @@
int x, z;
int minx, maxx;
***************
*** 10,36 ****
FT_Error error;
! @@ -642,7 +644,8 @@
status = 0;
minx = maxx = 0;
miny = maxy = 0;
! -
! + max_height = 0;
! +
/* Load each character and sum it's bounding box */
! x= 0;
! for ( ch=text; *ch; ++ch ) {
! @@ -652,6 +655,11 @@
}
glyph = font->current;
+ rows = glyph->maxy - glyph->miny;
! +
! + if ( max_height < (rows + glyph->yoffset) ) {
! + max_height = (rows + glyph->yoffset);
! + }
! z = x + glyph->minx;
! if ( minx > z ) {
! minx = z;
! @@ -685,7 +693,14 @@
#if 0 /* This is correct, but breaks many applications */
*h = (maxy - miny);
--- 15,40 ----
FT_Error error;
! @@ -841,6 +843,7 @@
status = 0;
minx = maxx = 0;
miny = maxy = 0;
! + max_height = 0;
! swapped = TTF_byteswapped;
!
/* Load each character and sum it's bounding box */
! @@ -871,6 +874,12 @@
}
glyph = font->current;
+ rows = glyph->maxy - glyph->miny;
! + if ( max_height < (rows + glyph->yoffset) ) {
! + max_height = (rows + glyph->yoffset);
! + }
! +
! +
! 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
! @@ -922,7 +931,14 @@
#if 0 /* This is correct, but breaks many applications */
*h = (maxy - miny);
***************
*** 48,52 ****
}
return status;
! @@ -760,11 +775,10 @@
FT_Error error;
--- 52,56 ----
}
return status;
! @@ -1000,11 +1016,10 @@
FT_Error error;
***************
*** 61,65 ****
/* Create the target surface */
textbuf = SDL_AllocSurface(SDL_SWSURFACE, width, height, 8, 0, 0, 0, 0);
! @@ -964,11 +978,10 @@
FT_Error error;
--- 65,69 ----
/* Create the target surface */
textbuf = SDL_AllocSurface(SDL_SWSURFACE, width, height, 8, 0, 0, 0, 0);
! @@ -1233,11 +1248,10 @@
FT_Error error;
***************
*** 74,78 ****
/* Create the target surface */
textbuf = SDL_AllocSurface(SDL_SWSURFACE, width, height, 8, 0, 0, 0, 0);
! @@ -1168,11 +1181,10 @@
FT_Error error;
--- 78,82 ----
/* Create the target surface */
textbuf = SDL_AllocSurface(SDL_SWSURFACE, width, height, 8, 0, 0, 0, 0);
! @@ -1466,11 +1480,10 @@
FT_Error error;
-------------------------------------------------------
This SF.NET email is sponsored by: eBay
Great deals on office technology -- on eBay now! Click here:
http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
