Author: spouliot
Date: 2006-03-20 15:45:36 -0500 (Mon, 20 Mar 2006)
New Revision: 58203

Modified:
   trunk/libgdiplus/src/ChangeLog
   trunk/libgdiplus/src/font.c
   trunk/libgdiplus/src/graphics.c
Log:
font.c: Re-work font locking not to leak memory (and not to create a scaled 
font when unlocking). graphics.c: Use CleanString (as String has been freed).

Modified: trunk/libgdiplus/src/ChangeLog
===================================================================
--- trunk/libgdiplus/src/ChangeLog      2006-03-20 20:45:14 UTC (rev 58202)
+++ trunk/libgdiplus/src/ChangeLog      2006-03-20 20:45:36 UTC (rev 58203)
@@ -1,3 +1,9 @@
+2006-03-20  Sebastien Pouliot  <[EMAIL PROTECTED]> 
+ 
+       * font.c: Re-work font locking not to leak memory (and not to create
+       a scaled font when unlocking).
+       * graphics.c: Use CleanString (as String has been freed).
+
 2006-03-20  Sebastien Pouliot  <[EMAIL PROTECTED]>
 
        * graphics.c: Clear the clipping region before data copying into it.

Modified: trunk/libgdiplus/src/font.c
===================================================================
--- trunk/libgdiplus/src/font.c 2006-03-20 20:45:14 UTC (rev 58202)
+++ trunk/libgdiplus/src/font.c 2006-03-20 20:45:36 UTC (rev 58203)
@@ -340,36 +340,30 @@
 }
 
 FT_Face
-gdip_cairo_ft_font_lock_face (cairo_font_face_t *cairofnt)
+gdip_cairo_ft_font_lock_face (cairo_font_face_t *cairofnt, cairo_scaled_font_t 
**scaled_ft)
 {
-       cairo_scaled_font_t *scaled_ft;
+       FT_Face face;
        cairo_matrix_t matrix1, matrix2;
-        cairo_font_options_t *options;
+        cairo_font_options_t *options = NULL;
        
        options = cairo_font_options_create ();
                
-       scaled_ft = cairo_scaled_font_create (cairofnt,
+       *scaled_ft = cairo_scaled_font_create (cairofnt,
                                              &matrix1,
                                              &matrix2,
                                              options);
-       return cairo_ft_scaled_font_lock_face (scaled_ft);
+
+       face = cairo_ft_scaled_font_lock_face (*scaled_ft);
+
+       cairo_font_options_destroy (options);
+       return face;
 }
 
 void
-gdip_cairo_ft_font_unlock_face (cairo_font_face_t *cairofnt)
+gdip_cairo_ft_font_unlock_face (cairo_scaled_font_t* scaled_ft)
 {
-       cairo_scaled_font_t *scaled_ft;
-       cairo_matrix_t matrix1, matrix2;
-       cairo_font_options_t *options = NULL;
-
-       options = cairo_font_options_create (); 
-       
-       scaled_ft = cairo_scaled_font_create (cairofnt,
-                                             &matrix1,
-                                             &matrix2,
-                                             options);
-       
        cairo_ft_scaled_font_unlock_face (scaled_ft);
+       cairo_scaled_font_destroy (scaled_ft);
 }
 
 GpStatus
@@ -389,10 +383,11 @@
        GdipCreateFont (family, 0.0f, style, UnitPoint, &font);
 
        if (font) {
+               cairo_scaled_font_t* scaled_ft;
                FT_Face face;
                TT_VertHeader *pVert;
 
-               face = gdip_cairo_ft_font_lock_face(font->cairofnt);
+               face = gdip_cairo_ft_font_lock_face (font->cairofnt, 
&scaled_ft);
 
                pVert = FT_Get_Sfnt_Table(face, ft_sfnt_vhea);
                if (pVert) {
@@ -402,7 +397,7 @@
                } else {
                        rslt = 0;
                }
-               gdip_cairo_ft_font_unlock_face(font->cairofnt);
+               gdip_cairo_ft_font_unlock_face(scaled_ft);
                GdipDeleteFont (font);
        }
 
@@ -428,17 +423,18 @@
        GdipCreateFont (family, 0.0f, style, UnitPoint, &font);
 
        if (font){
+               cairo_scaled_font_t* scaled_ft;
                 FT_Face face;
                TT_HoriHeader *pHori;
 
-                face = gdip_cairo_ft_font_lock_face(font->cairofnt);
+               face = gdip_cairo_ft_font_lock_face (font->cairofnt, 
&scaled_ft);
 
                pHori = FT_Get_Sfnt_Table (face, ft_sfnt_hhea);
 
                if (pHori)
                        rslt = pHori->Ascender;
 
-               gdip_cairo_ft_font_lock_face(font->cairofnt);
+               gdip_cairo_ft_font_unlock_face(scaled_ft);
                GdipDeleteFont (font);
        }
 
@@ -464,17 +460,18 @@
        GdipCreateFont (family, 0.0f, style, UnitPoint, &font);
 
        if (font){
+               cairo_scaled_font_t* scaled_ft;
                 FT_Face face;
                TT_HoriHeader* pHori;
 
-                face = gdip_cairo_ft_font_lock_face(font->cairofnt);
+               face = gdip_cairo_ft_font_lock_face (font->cairofnt, 
&scaled_ft);
 
                pHori = FT_Get_Sfnt_Table (face, ft_sfnt_hhea);
 
                if (pHori)
                        rslt = -pHori->Descender;
 
-               gdip_cairo_ft_font_unlock_face(font->cairofnt);
+               gdip_cairo_ft_font_unlock_face(scaled_ft);
                GdipDeleteFont (font);
        }
 
@@ -500,10 +497,11 @@
        GdipCreateFont (family, 0.0f, style, UnitPoint, &font);
 
        if (font){
+               cairo_scaled_font_t* scaled_ft;
                 FT_Face face;
                TT_HoriHeader *pHori;
 
-                face = gdip_cairo_ft_font_lock_face(font->cairofnt);
+               face = gdip_cairo_ft_font_lock_face (font->cairofnt, 
&scaled_ft);
 
                pHori = FT_Get_Sfnt_Table (face, ft_sfnt_hhea);
                if (pHori) {
@@ -514,7 +512,7 @@
                        rslt = 0;
                }
 
-               gdip_cairo_ft_font_unlock_face(font->cairofnt);
+               gdip_cairo_ft_font_unlock_face(scaled_ft);
                GdipDeleteFont (font);
        }
 

Modified: trunk/libgdiplus/src/graphics.c
===================================================================
--- trunk/libgdiplus/src/graphics.c     2006-03-20 20:45:14 UTC (rev 58202)
+++ trunk/libgdiplus/src/graphics.c     2006-03-20 20:45:36 UTC (rev 58203)
@@ -2256,7 +2256,7 @@
 #endif
                /* Remember where to wrap next, but only if wrapping allowed */
                if (((fmt->formatFlags & StringFormatFlagsNoWrap)==0) && 
(CurrentDetail->Flags & STRING_DETAIL_BREAK)) {
-                       if (String[i] == ' ') {
+                       if (CleanString[i] == ' ') {
                                WrapPoint=i+1;  /* We skip the break char 
itself, keeping it at the end of the old line */
                        } else {
                                WrapPoint=i;

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to