[Gnash-commit] gnash ChangeLog server/FreetypeRasterizer.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/06/12 23:00:18

Modified files:
        .              : ChangeLog 
        server         : FreetypeRasterizer.cpp 

Log message:
                * server/FreetypeRasterizer.cpp (getRenderedGlyph): don't assume
                  "suspeded_image" is not-null after creation of the 
bitmap_info_alpha
                  instance (those bitmap interfaces needs a big cleanup 
really...).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3513&r2=1.3514
http://cvs.savannah.gnu.org/viewcvs/gnash/server/FreetypeRasterizer.cpp?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3513
retrieving revision 1.3514
diff -u -b -r1.3513 -r1.3514
--- ChangeLog   12 Jun 2007 16:38:35 -0000      1.3513
+++ ChangeLog   12 Jun 2007 23:00:17 -0000      1.3514
@@ -1,5 +1,8 @@
 2007-06-12 Sandro Santilli <address@hidden>
 
+       * server/FreetypeRasterizer.cpp (getRenderedGlyph): don't assume
+         "suspeded_image" is not-null after creation of the bitmap_info_alpha
+         instance (those bitmap interfaces needs a big cleanup really...).
        * testsuite/misc-ming.all/DefineEditTextTest.c:
          Test both embedded and device fonts.
 

Index: server/FreetypeRasterizer.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/FreetypeRasterizer.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/FreetypeRasterizer.cpp       12 Jun 2007 12:33:21 -0000      1.4
+++ server/FreetypeRasterizer.cpp       12 Jun 2007 23:00:18 -0000      1.5
@@ -195,8 +195,8 @@
        std::auto_ptr<image::alpha> im ( draw_bitmap(m_face->glyph->bitmap) );
        bi = render::create_bitmap_info_alpha(im->m_width, im->m_height, 
im->m_data);
 
-       float xmax = float(m_face->glyph->bitmap.width) / 
float(bi->m_suspended_image->m_width);
-       float ymax = float(m_face->glyph->bitmap.rows) / 
float(bi->m_suspended_image->m_height);
+       float xmax = float(m_face->glyph->bitmap.width) / float(im->m_width);
+       float ymax = float(m_face->glyph->bitmap.rows) / float(im->m_height);
 
        float xmin = float(m_face->glyph->metrics.horiBearingX) / 
float(m_face->glyph->metrics.width);
        float ymin = float(m_face->glyph->metrics.horiBearingY) / 
float(m_face->glyph->metrics.height);