author | sandman <sandman> | 2002-10-22 18:58:52 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-10-22 18:58:52 (UTC) |
commit | 3f8157f49267d07a8e3263fedeb4da32ddbc951e (patch) (unidiff) | |
tree | ab9e8bac8f0484339f48294709d3eb9288d5783e | |
parent | d7cca919f20d602bd755b7690c25e31f6e9520b1 (diff) | |
download | opie-3f8157f49267d07a8e3263fedeb4da32ddbc951e.zip opie-3f8157f49267d07a8e3263fedeb4da32ddbc951e.tar.gz opie-3f8157f49267d07a8e3263fedeb4da32ddbc951e.tar.bz2 |
*** empty log message ***
-rw-r--r-- | freetype/fontfactoryttf_qws.cpp | 19 | ||||
-rw-r--r-- | freetype/fontfactoryttf_qws.h | 3 | ||||
-rw-r--r-- | freetype/freetype.pro | 2 | ||||
-rw-r--r-- | freetype/freetypefactoryimpl.cpp | 2 | ||||
-rw-r--r-- | freetype/opie-freetype.control | 2 |
5 files changed, 17 insertions, 11 deletions
diff --git a/freetype/fontfactoryttf_qws.cpp b/freetype/fontfactoryttf_qws.cpp index 5aa53fb..1f082a9 100644 --- a/freetype/fontfactoryttf_qws.cpp +++ b/freetype/fontfactoryttf_qws.cpp | |||
@@ -35,7 +35,6 @@ | |||
35 | extern "C" { | 35 | extern "C" { |
36 | #include <ft2build.h> | 36 | #include <freetype/freetype.h> |
37 | #include FT_FREETYPE_H | 37 | #include <freetype/ftglyph.h> |
38 | #include FT_GLYPH_H | 38 | #include <freetype/ftoutln.h> |
39 | #include FT_OUTLINE_H | 39 | #include <freetype/ftbbox.h> |
40 | #include FT_BBOX_H | ||
41 | } | 40 | } |
@@ -71,2 +70,4 @@ public: | |||
71 | { | 70 | { |
71 | // When inter-process glyph sharing is implemented, the glyph data | ||
72 | // for this font can be dereferenced here. | ||
72 | } | 73 | } |
@@ -110,3 +111,3 @@ public: | |||
110 | 111 | ||
111 | int width,height,pitch,size = 0; | 112 | int width=0,height=0,pitch=0,size=0; |
112 | FT_Glyph glyph; | 113 | FT_Glyph glyph; |
@@ -157,2 +158,8 @@ public: | |||
157 | 158 | ||
159 | // XXX memory manage me | ||
160 | // At some point inter-process glyph data sharing must be implemented | ||
161 | // and the flag below can be set to prevent Qt from deleting the glyph | ||
162 | // data. | ||
163 | // result.metrics->flags = QGlyphMetrics::RendererOwnsData; | ||
164 | |||
158 | FT_Done_Glyph( glyph ); | 165 | FT_Done_Glyph( glyph ); |
diff --git a/freetype/fontfactoryttf_qws.h b/freetype/fontfactoryttf_qws.h index 4ba8ce5..208ab61 100644 --- a/freetype/fontfactoryttf_qws.h +++ b/freetype/fontfactoryttf_qws.h | |||
@@ -35,4 +35,3 @@ | |||
35 | extern "C" { | 35 | extern "C" { |
36 | #include <ft2build.h> | 36 | #include <freetype/freetype.h> |
37 | #include FT_FREETYPE_H | ||
38 | } | 37 | } |
diff --git a/freetype/freetype.pro b/freetype/freetype.pro index 5800b48..ca7edd3 100644 --- a/freetype/freetype.pro +++ b/freetype/freetype.pro | |||
@@ -7,3 +7,3 @@ TARGET = freetypefactory | |||
7 | DESTDIR = $(OPIEDIR)/plugins/fontfactories | 7 | DESTDIR = $(OPIEDIR)/plugins/fontfactories |
8 | INCLUDEPATH+= $(OPIEDIR)/include | 8 | INCLUDEPATH+= $(QTDIR)/src/3rdparty/freetype/include $(QTDIR)/src/3rdparty/freetype/include/freetype/config $(OPIEDIR)/include |
9 | DEPENDPATH += $(OPIEDIR)/include | 9 | DEPENDPATH += $(OPIEDIR)/include |
diff --git a/freetype/freetypefactoryimpl.cpp b/freetype/freetypefactoryimpl.cpp index 71460b2..24fb13a 100644 --- a/freetype/freetypefactoryimpl.cpp +++ b/freetype/freetypefactoryimpl.cpp | |||
@@ -50,3 +50,3 @@ QRESULT FreeTypeFactoryImpl::queryInterface( const QUuid &uuid, QUnknownInterfac | |||
50 | (*iface)->addRef(); | 50 | (*iface)->addRef(); |
51 | return QS_OK; | 51 | return (*iface) ? QS_OK : QS_FALSE; |
52 | } | 52 | } |
diff --git a/freetype/opie-freetype.control b/freetype/opie-freetype.control index f1ce408..2863adb 100644 --- a/freetype/opie-freetype.control +++ b/freetype/opie-freetype.control | |||
@@ -6,3 +6,3 @@ Architecture: arm | |||
6 | Version: $QPE_VERSION-$SUB_VERSION | 6 | Version: $QPE_VERSION-$SUB_VERSION |
7 | Depends: opie-base ($QPE_VERSION) | 7 | Depends: opie-base ($QPE_VERSION), libfreetype6 |
8 | Description: Freetype fontfactory plugin | 8 | Description: Freetype fontfactory plugin |