← Back to branch summary

~saiarcot895/ubuntu/trusty/openscenegraph/armhf-support

« back to all changes in this revision

Viewing changes to OpenSceneGraph/src/osgWrappers/osgText/Text.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alberto Luaces
  • Date: 2010-05-03 21:42:01 UTC
  • mfrom: (1.1.9 upstream) (2.1.11 sid)
  • Revision ID: james.westby@ubuntu.com-20100503214201-iy060qxb94vsfv87
Tags: 2.8.3-3
http://bugs.debian.org/580079
* Added README.source. Thanks Manuel Montecelo.
* Removed FindGDAL.cmake file supplied by upstream since it does not
  detect current libgdal1-1.6.0. The script provided by CMake works
  fine.
* Removed openthreads-doc since OpenThreads documentation is shared with
  OpenSceneGraph's, hence this package was empty.
* Now ccache handling is being done automatically by CMake.
* Drop conflict dependencies with previous versions to let them coexist
  with current ones (Closes: #580079 #580081).

Show diffs side-by-side

added added

removed removed

Lines of Context:
OpenSceneGraph/src/osgWrappers/osgText/Text.cpp
28
28
#undef OUT
29
29
#endif
30
30
 
 
31
TYPE_NAME_ALIAS(std::map< osg::ref_ptr< osgText::Font::GlyphTexture > COMMA  osgText::Text::GlyphQuads >, osgText::Text::TextureGlyphQuadMap)
 
32
 
31
33
BEGIN_ENUM_REFLECTOR(osgText::Text::BackdropType)
32
34
        I_DeclaringFile("osgText/Text");
33
35
        I_EnumLabel(osgText::Text::DROP_SHADOW_BOTTOM_RIGHT);
57
59
        I_EnumLabel(osgText::Text::OVERALL);
58
60
END_REFLECTOR
59
61
 
60
 
TYPE_NAME_ALIAS(std::map< osg::ref_ptr< osgText::Font::GlyphTexture > COMMA  osgText::Text::GlyphQuads >, osgText::Text::TextureGlyphQuadMap)
61
 
 
62
62
BEGIN_OBJECT_REFLECTOR(osgText::Text)
63
63
        I_DeclaringFile("osgText/Text");
64
64
        I_BaseType(osgText::TextBase);
74
74
                  __osg_Object_P1__cloneType,
75
75
                  "Clone the type of an object, with Object* return type. ",
76
76
                  "Must be defined by derived classes. ");
77
 
        I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 
77
        I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
78
78
                  Properties::VIRTUAL,
79
79
                  __osg_Object_P1__clone__C5_osg_CopyOp_R1,
80
80
                  "Clone an object, with Object* return type. ",