X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Flyr_freetype%2Flyr_freetype.h;h=4a32e745393b8e4657e82c27266f48515937cc8a;hb=5ddcf36f04cfbd10fabda4e3c5633cb27cdd4c0a;hp=0d87ab3e9d96b07dc039e55b5c98969b7b7d512c;hpb=cee5940bae97612105db8b7e1ffcf513f9d9150c;p=synfig.git diff --git a/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.h b/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.h index 0d87ab3..4a32e74 100644 --- a/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.h +++ b/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.h @@ -82,24 +82,24 @@ struct TextLine TextLine():width(0) { } void clear_and_free(); - + int actual_height()const { int height(0); - + std::vector::const_iterator iter; for(iter=glyph_table.begin();iter!=glyph_table.end();++iter) { FT_BBox glyph_bbox; - + //FT_Glyph_Get_CBox( glyphs[n], ft_glyph_bbox_pixels, &glyph_bbox ); FT_Glyph_Get_CBox( iter->glyph, ft_glyph_bbox_subpixels, &glyph_bbox ); - + if(glyph_bbox.yMax>height) height=glyph_bbox.yMax; } return height; - } + } }; @@ -129,9 +129,9 @@ private: bool needs_sync_; void sync(); - + mutable synfig::Mutex mutex; - + public: lyr_freetype(); virtual ~lyr_freetype(); @@ -140,7 +140,7 @@ public: virtual ValueBase get_param(const String & param)const; virtual Color get_color(Context context, const synfig::Point &pos)const; virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const; - + virtual Vocab get_param_vocab()const; virtual bool set_version(const String &ver){if(ver=="0.1")old_version=true;return true;}