[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash/server font.h
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash/server font.h |
Date: |
Tue, 24 Jul 2007 17:45:03 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/07/24 17:45:03
Modified files:
server : font.h
Log message:
style: chop a tab, update copyright info
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/font.h?cvsroot=gnash&r1=1.26&r2=1.27
Patches:
Index: font.h
===================================================================
RCS file: /sources/gnash/gnash/server/font.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- font.h 11 Jul 2007 16:16:51 -0000 1.26
+++ font.h 24 Jul 2007 17:45:03 -0000 1.27
@@ -1,9 +1,23 @@
-// font.h -- Thatcher Ulrich <address@hidden> 2003
+// font.h -- font class, for Gnash
+//
+// Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
-// This source code has been donated to the Public Domain. Do
-// whatever you want with it.
-
-// A font type for gnash.
+// Based on the public domain work of Thatcher Ulrich <address@hidden> 2003
#ifndef GNASH_FONT_H
@@ -25,19 +39,21 @@
#include <map>
+// Forward declarations
class tu_file;
namespace gnash {
- class movie;
- class shape_character_def;
- class stream;
+class movie;
+class shape_character_def;
+class stream;
- /// class for holding (cached) textured glyph info.
- class texture_glyph // : public ref_counted
- {
- public:
+/// class for holding (cached) textured glyph info.
+class texture_glyph // : public ref_counted
+{
+
+public:
texture_glyph() : m_bitmap_info(NULL) {}
@@ -66,9 +82,9 @@
#endif
- // too early to make these private, fontlib directly accesses
- // them, postponed.
- //private:
+// too early to make these private, fontlib directly accesses
+// them, postponed.
+//private:
boost::intrusive_ptr<bitmap_info> m_bitmap_info;
@@ -77,13 +93,13 @@
// the origin of the glyph box, in uv coords
point m_uv_origin;
- };
+};
- // @@ replace this with a flat hash, or else a sorted array
- // (binary search)
- class kerning_pair
- {
- public:
+// @@ replace this with a flat hash, or else a sorted array
+// (binary search)
+class kerning_pair
+{
+public:
uint16_t m_char0, m_char1;
bool operator==(const kerning_pair& k) const
@@ -92,11 +108,11 @@
}
- };
+};
- // for use in standard algorithms
- inline bool operator < (const kerning_pair& p1, const kerning_pair& p2)
- {
+// for use in standard algorithms
+inline bool operator < (const kerning_pair& p1, const kerning_pair& p2)
+{
if ( p1.m_char0 < p2.m_char0 )
{
return true;
@@ -110,16 +126,16 @@
{
return false;
}
- }
+}
- /// \brief
- /// A 'font' definition as read from SWF::DefineFont,
- /// SWF::DefineFont2 or SWF::DefineFont3 tags.
- /// Includes definitions from SWF::DefineFontInfo tags
- ///
- class font : public resource
- {
- public:
+/// \brief
+/// A 'font' definition as read from SWF::DefineFont,
+/// SWF::DefineFont2 or SWF::DefineFont3 tags.
+/// Includes definitions from SWF::DefineFontInfo tags
+///
+class font : public resource
+{
+public:
font();
// Create a device-font only font, using the given name to find
it
@@ -235,7 +251,7 @@
float get_leading() const { return m_leading; }
float get_descent() const { return m_descent; }
- private:
+private:
void read_code_table(stream* in);
/// Read a DefineFont2 or DefineFont3 tag
@@ -293,7 +309,7 @@
std::auto_ptr<FreetypeGlyphsProvider> _ftProvider;
- protected:
+protected:
#ifdef GNASH_USE_GC
/// Mark reachable resources (for the GC)
@@ -304,7 +320,7 @@
///
void markReachableResources() const;
#endif // GNASH_USE_GC
- };
+};
} // end namespace gnash
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash/server font.h,
Sandro Santilli <=