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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/06/13 13:38:30

Modified files:
        .              : ChangeLog 
        server         : font.cpp 

Log message:
                * server/font.cpp (add_os_font): use the advance value
                  computed by getGlyph, not getRenderedGlyph (the latter
                  is bogus).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3524&r2=1.3525
http://cvs.savannah.gnu.org/viewcvs/gnash/server/font.cpp?cvsroot=gnash&r1=1.36&r2=1.37

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3524
retrieving revision 1.3525
diff -u -b -r1.3524 -r1.3525
--- ChangeLog   13 Jun 2007 13:15:50 -0000      1.3524
+++ ChangeLog   13 Jun 2007 13:38:28 -0000      1.3525
@@ -1,5 +1,11 @@
 2007-06-13 Sandro Santilli <address@hidden>
 
+       * server/font.cpp (add_os_font): use the advance value
+         computed by getGlyph, not getRenderedGlyph (the latter
+         is bogus).
+
+2007-06-13 Sandro Santilli <address@hidden>
+
        * testsuite/misc-ming.all/loop_test8.c: xchec -> check.
 
 2007-06-13 Sandro Santilli <address@hidden>

Index: server/font.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/font.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- server/font.cpp     13 Jun 2007 10:21:36 -0000      1.36
+++ server/font.cpp     13 Jun 2007 13:38:29 -0000      1.37
@@ -17,13 +17,12 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: font.cpp,v 1.36 2007/06/13 10:21:36 strk Exp $ */
+/* $Id: font.cpp,v 1.37 2007/06/13 13:38:29 strk Exp $ */
 
 // Based on the public domain work of Thatcher Ulrich <address@hidden> 2003
 
 #include "font.h"
 #include "stream.h"
-//#include "impl.h"
 #include "log.h"
 #include "tu_file.h"
 #include "movie_definition.h"
@@ -567,14 +566,18 @@
                assert ( _ftRasterizer.get() );
                assert(m_code_table.find(code) == m_code_table.end());
 
-               float advance;
+               float advance1, advance2;
 
                // Get the vectorial glyph
-               boost::intrusive_ptr<shape_character_def> sh = 
_ftRasterizer->getGlyph(code, advance);
+               boost::intrusive_ptr<shape_character_def> sh = 
_ftRasterizer->getGlyph(code, advance1);
 
                // Get the textured glyph and the advance info
                rect box;
-               boost::intrusive_ptr<bitmap_info> bi ( 
_ftRasterizer->getRenderedGlyph(code, box, advance) );
+               boost::intrusive_ptr<bitmap_info> bi ( 
_ftRasterizer->getRenderedGlyph(code, box, advance2) );
+
+               // Advance must be given relative to the EM, is that correct or 
should we change ?
+               float advance = advance1; // vect
+               //float advance = advance2; // rast
 
                if ( ! sh && ! bi )
                {