Hi Robert,
On Thursday 04 March 2010, Robert Osfield wrote:
> I've just checked in an osgQt lib into svn/trunk, it only contains the
> parts required for webkit/graphicsview integration right now. I'm now
> looking at your submission. Would the plugin still be required in
> QFontImplementation makes it's way into include/osgQt?
No, the plugin is not required.
In the current implementation of osgText might need some adjustments to make
that work.
As far as I can tell, osgText::Font::readFontFile does a osgText::findFontFile
call which requires the font file to be on disk.
For the qfont meta loader this is obviously not true.
Attached is the diff is at least required to make the reader find '.qfont
files'.
This still throws some warning messages.
Will deliver a better change withotu warnings for that tomorrow ...
Greetings and thanks!
Mathias
--
Dr. Mathias Fröhlich, science + computing ag, Software Solutions
Hagellocher Weg 71-75, D-72070 Tuebingen, Germany
Phone: +49 7071 9457-268, Fax: +49 7071 9457-511
--
Vorstand/Board of Management:
Dr. Bernd Finkbeiner, Dr. Roland Niemeier,
Dr. Arno Steitz, Dr. Ingrid Zech
Vorsitzender des Aufsichtsrats/
Chairman of the Supervisory Board:
Michel Lepert
Sitz/Registered Office: Tuebingen
Registergericht/Registration Court: Stuttgart
Registernummer/Commercial Register No.: HRB 382196
Index: src/osgText/Font.cpp
===================================================================
--- src/osgText/Font.cpp (revision 11149)
+++ src/osgText/Font.cpp (working copy)
@@ -92,7 +92,8 @@
if (filename=="") return 0;
std::string foundFile = findFontFile(filename);
- if (foundFile.empty()) return 0;
+ if (foundFile.empty())
+ foundFile = filename;
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(s_FontFileMutex);
@@ -152,7 +153,8 @@
if (filename=="") return 0;
std::string foundFile = findFontFile(filename);
- if (foundFile.empty()) return 0;
+ if (foundFile.empty())
+ foundFile = filename;
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(s_FontFileMutex);
_______________________________________________
osg-submissions mailing list
[email protected]
http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
