[Gnash-commit] gnash ChangeLog server/FreetypeGlyphsProvider.c...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/09/14 08:49:56

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

Log message:
                * server/FreetypeGlyphsProvider.{cpp,h}: use USE_FREETYPE 
instead
                  of HAVE_FREETYPE2 ..

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4318&r2=1.4319
http://cvs.savannah.gnu.org/viewcvs/gnash/server/FreetypeGlyphsProvider.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/FreetypeGlyphsProvider.h?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4318
retrieving revision 1.4319
diff -u -b -r1.4318 -r1.4319
--- ChangeLog   14 Sep 2007 07:33:50 -0000      1.4318
+++ ChangeLog   14 Sep 2007 08:49:55 -0000      1.4319
@@ -1,5 +1,7 @@
 2007-09-14 Sandro Santilli <address@hidden>
 
+       * server/FreetypeGlyphsProvider.{cpp,h}: use USE_FREETYPE instead
+         of HAVE_FREETYPE2 ..
        * macros/freetype.m4: don't miss to add a -I to cflags; add a note
          about the non-sense of the way we check for /usr/include.
 

Index: server/FreetypeGlyphsProvider.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/FreetypeGlyphsProvider.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/FreetypeGlyphsProvider.cpp   10 Sep 2007 16:53:29 -0000      1.12
+++ server/FreetypeGlyphsProvider.cpp   14 Sep 2007 08:49:56 -0000      1.13
@@ -28,7 +28,7 @@
 #include "DynamicShape.h"
 #include "log.h"
 
-#ifdef HAVE_FREETYPE2 
+#ifdef USE_FREETYPE 
 # include <ft2build.h>
 # include FT_OUTLINE_H
 # include FT_BBOX_H
@@ -63,7 +63,7 @@
 
 namespace gnash {
 
-#ifdef HAVE_FREETYPE2 
+#ifdef USE_FREETYPE 
 
 /// Outline glyph walker/decomposer, for drawing an FT_Outline to DynamicShape
 //
@@ -305,9 +305,9 @@
 #endif
 }
 
-#endif // HAVE_FREETYPE2 
+#endif // USE_FREETYPE 
 
-#ifdef HAVE_FREETYPE2 
+#ifdef USE_FREETYPE 
 // static
 std::auto_ptr<FreetypeGlyphsProvider>
 FreetypeGlyphsProvider::createFace(const std::string& name, bool bold, bool 
italic)
@@ -325,16 +325,16 @@
        return ret;
 
 }
-#else // ndef HAVE_FREETYPE2 
+#else // ndef USE_FREETYPE 
 std::auto_ptr<FreetypeGlyphsProvider>
 FreetypeGlyphsProvider::createFace(const std::string&, bool, bool)
 {
        log_error("Freetype not supported");
        return std::auto_ptr<FreetypeGlyphsProvider>(NULL);
 }
-#endif // ndef HAVE_FREETYPE2 
+#endif // ndef USE_FREETYPE 
 
-#ifdef HAVE_FREETYPE2 
+#ifdef USE_FREETYPE 
 FreetypeGlyphsProvider::FreetypeGlyphsProvider(const std::string& name, bool 
bold, bool italic)
        :
        m_face(NULL)
@@ -383,14 +383,14 @@
        log_debug("EM square for font '%s' is %d, scale is thus %g", 
name.c_str(), m_face->units_per_EM, scale);
 #endif
 }
-#else // ndef(HAVE_FREETYPE2)
+#else // ndef(USE_FREETYPE)
 FreetypeGlyphsProvider::FreetypeGlyphsProvider(const std::string&, bool, bool)
 {
        assert(0); // should never be called
 }
-#endif // ndef HAVE_FREETYPE2 
+#endif // ndef USE_FREETYPE 
 
-#ifdef HAVE_FREETYPE2
+#ifdef USE_FREETYPE
 boost::intrusive_ptr<shape_character_def>
 FreetypeGlyphsProvider::getGlyph(uint16_t code, float& advance)
 {
@@ -453,17 +453,17 @@
 
        return sh.get();
 }
-#else // ndef(HAVE_FREETYPE2)
+#else // ndef(USE_FREETYPE)
 boost::intrusive_ptr<shape_character_def>
 FreetypeGlyphsProvider::getGlyph(uint16_t, float& advance)
 {
        assert(0); // should never be called... 
 }
-#endif // ndef(HAVE_FREETYPE2)
+#endif // ndef(USE_FREETYPE)
 
 FreetypeGlyphsProvider::~FreetypeGlyphsProvider()
 {
-#ifdef HAVE_FREETYPE2 
+#ifdef USE_FREETYPE 
        if ( m_face )
        {
                if ( FT_Done_Face(m_face) != 0 )
@@ -471,7 +471,7 @@
                        log_error("Could not release FT face resources");
                }
        }
-#endif // ndef(HAVE_FREETYPE2)
+#endif // ndef(USE_FREETYPE)
 }
 
 } // namespace gnash

Index: server/FreetypeGlyphsProvider.h
===================================================================
RCS file: /sources/gnash/gnash/server/FreetypeGlyphsProvider.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/FreetypeGlyphsProvider.h     10 Aug 2007 21:28:50 -0000      1.4
+++ server/FreetypeGlyphsProvider.h     14 Sep 2007 08:49:56 -0000      1.5
@@ -23,18 +23,13 @@
 #include "config.h"
 #endif
 
-
-#ifdef HAVE_FREETYPE_FREETYPE_H
-# define HAVE_FREETYPE2 1
-#endif
-
 #include "rect.h"
 #include "smart_ptr.h" // for intrusive_ptr
 
 #include <string>
 #include <memory> // for auto_ptr
 
-#ifdef HAVE_FREETYPE2 
+#ifdef USE_FREETYPE 
 # include <ft2build.h>
 # include FT_FREETYPE_H
 # include FT_GLYPH_H
@@ -121,7 +116,7 @@
        ///
        FreetypeGlyphsProvider(const std::string& fontname, bool bold, bool 
italic);
 
-#ifdef HAVE_FREETYPE2 
+#ifdef USE_FREETYPE 
 
        /// Scale factor to make the freetype glyph metrix match our 1024 EM 
square
        /// coordinate space. Not all font faces have am EM square of 1024, so 
we
@@ -165,7 +160,7 @@
        static FT_Library       m_lib;
        FT_Face m_face;
 
-#endif // HAVE_FREETYPE2
+#endif // USE_FREETYPE
 
 };