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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/06/11 13:23:22

Modified files:
        .              : ChangeLog 
        server         : FreetypeRasterizer.cpp FreetypeRasterizer.h 

Log message:
                * server/FreetypeRasterizer.{cpp,h}:
                  Add missing stub for font filename finder method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3508&r2=1.3509
http://cvs.savannah.gnu.org/viewcvs/gnash/server/FreetypeRasterizer.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/FreetypeRasterizer.h?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3508
retrieving revision 1.3509
diff -u -b -r1.3508 -r1.3509
--- ChangeLog   11 Jun 2007 03:24:01 -0000      1.3508
+++ ChangeLog   11 Jun 2007 13:23:21 -0000      1.3509
@@ -1,3 +1,8 @@
+2007-06-11 Sandro Santilli <address@hidden>
+
+       * server/FreetypeRasterizer.{cpp,h}: 
+         Add missing stub for font filename finder method.
+
 2007-06-11 Zou Lunkai <address@hidden>
 
        * gui/sdl_agg_glue.cpp: initialize member variables at construction, 

Index: server/FreetypeRasterizer.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/FreetypeRasterizer.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/FreetypeRasterizer.cpp       8 Jun 2007 21:40:39 -0000       1.1
+++ server/FreetypeRasterizer.cpp       11 Jun 2007 13:23:22 -0000      1.2
@@ -129,7 +129,7 @@
        }
 
        std::string filename;
-       if (get_fontfile(name, filename, bold, italic) == false)
+       if (getFontFilename(name, bold, italic, filename) == false)
        {
                snprintf(buf, maxerrlen, _("Can't find font file for font 
'%s'"), name.c_str());
                buf[maxerrlen-1] = '\0';
@@ -201,6 +201,13 @@
 }
 #endif // ndef(HAVE_LIBFREETYPE)
 
+bool
+FreetypeRasterizer::getFontFilename(const std::string& name,
+               bool bold, bool italic, std::string& filename)
+{
+       // TODO: implement
+       return false;
+}
 
 } // namespace gnash
 

Index: server/FreetypeRasterizer.h
===================================================================
RCS file: /sources/gnash/gnash/server/FreetypeRasterizer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/FreetypeRasterizer.h 8 Jun 2007 21:40:39 -0000       1.1
+++ server/FreetypeRasterizer.h 11 Jun 2007 13:23:22 -0000      1.2
@@ -90,6 +90,28 @@
        // TODO: drop ?
        float get_advance_x(uint16_t code);
 
+       /// Get filename containing given font
+       //
+       /// @param name
+       ///     Font name
+       ///
+       /// @param bold
+       ///     Want bold version
+       ///
+       /// @param italic
+       ///     Want italic version
+       ///
+       /// @param filename
+       ///     Where to return the filename to
+       ///
+       /// @return true if the font was found, false otherwise.
+       ///     Actually, this function should return a default
+       ///     filename in any case, so false should only be
+       ///     returned if not even a default font was found.
+       ///
+       bool getFontFilename(const std::string& name, bool bold, bool italic,
+                       std::string& filename);
+
        static void init();
 
        static void close();