[cgma-dev] r5754 - cgm/branches/merge-cubit13.1/geom/OCC/patches653

[csverma at mcs.anl.gov]

Author: csverma
Date: 2012-09-26 10:25:19 -0500 (Wed, 26 Sep 2012)
New Revision: 5754

Added:
   cgm/branches/merge-cubit13.1/geom/OCC/patches653/OpenGl_FontMgr.cxx_patch
   cgm/branches/merge-cubit13.1/geom/OCC/patches653/README
Log:
Passed CGM make check with new FTGL

Added: cgm/branches/merge-cubit13.1/geom/OCC/patches653/OpenGl_FontMgr.cxx_patch
===================================================================
--- cgm/branches/merge-cubit13.1/geom/OCC/patches653/OpenGl_FontMgr.cxx_patch	                        (rev 0)
+++ cgm/branches/merge-cubit13.1/geom/OCC/patches653/OpenGl_FontMgr.cxx_patch	2012-09-26 15:25:19 UTC (rev 5754)
@@ -0,0 +1,15 @@
+--- OpenGl_FontMgr.cxx	2012-04-13 07:39:02.000000000 -0500
++++ ../../../rosnew/src/OpenGl/OpenGl_FontMgr.cxx	2012-09-25 13:57:29.461257744 -0500
+@@ -17,9 +17,9 @@
+ 
+ #include <OpenGl_FontMgr.hxx>
+ 
+-#include <FTGLTextureFont.h>        
+-#include <FTLibrary.h>
+-#include <FTFace.h>
++#include <FTGL/FTGLTextureFont.h>        
++#include <FTGL/FTLibrary.h>
++#include <FTGL/FTFace.h>
+ #include <Standard_Stream.hxx>
+ 
+ #undef TRACE

Added: cgm/branches/merge-cubit13.1/geom/OCC/patches653/README
===================================================================
--- cgm/branches/merge-cubit13.1/geom/OCC/patches653/README	                        (rev 0)
+++ cgm/branches/merge-cubit13.1/geom/OCC/patches653/README	2012-09-26 15:25:19 UTC (rev 5754)
@@ -0,0 +1,15 @@
+When you install ftgl library on Ubuntu12.04, some of the header
+files are not correctly copied to the standard location. The new
+FTGL expects them to be /usr/include/FTGL directory.
+
+Go to the source code of the new ftgl and copy all the *.h files
+to the /usr/include/FTGL directory.
+
+Also in the source code of OCC, you need to change the header files
+to FTGL/FTFont.h instead of FTFont.h and this is being done in the
+given patch file.
+
+All the test cases of CGM passed through these changes, so assuming
+that everything was fine, but no rigrous testing was carried out for
+these changes.
+