| LASi.h | LASi.h | |||
|---|---|---|---|---|
| skipping to change at line 14 | skipping to change at line 14 | |||
| /** @file | /** @file | |||
| * Defines oPostscriptStream and PostscriptDocument and various | * Defines oPostscriptStream and PostscriptDocument and various | |||
| * stream manipulators. | * stream manipulators. | |||
| */ | */ | |||
| #include <string> | #include <string> | |||
| #include <ostream> | #include <ostream> | |||
| #include <sstream> | #include <sstream> | |||
| #include <map> | #include <map> | |||
| #include <pango/pango.h> | #include <pango/pango.h> | |||
| #include <freetype/ftglyph.h> | #include <ft2build.h> | |||
| #include FT_GLYPH_H | ||||
| class FreetypeGlyphMgr; | class FreetypeGlyphMgr; | |||
| class ContextMgr; | class ContextMgr; | |||
| // These macros are needed for Visual C++ and other Windows compilers as we ll | // These macros are needed for Visual C++ and other Windows compilers as we ll | |||
| // as gcc 4.x or higher with -fvisibility=hidden option. | // as gcc 4.x or higher with -fvisibility=hidden option. | |||
| // All functions/classes marked with LASIDLLIMPEXP can be imported | // All functions/classes marked with LASIDLLIMPEXP can be imported | |||
| // from/exported to the Windows dll/gcc shared library. | // from/exported to the Windows dll/gcc shared library. | |||
| // Has no impact on other platforms. | // Has no impact on other platforms. | |||
| // Details handled identically to PLplot include/pldll.h(.in) | // Details handled identically to PLplot include/pldll.h(.in) | |||
| skipping to change at line 224 | skipping to change at line 225 | |||
| /** Pointer to a function that takes a reference to a glyph | /** Pointer to a function that takes a reference to a glyph | |||
| * and to x and y coordinates. | * and to x and y coordinates. | |||
| * May return new x and y coordinates. | * May return new x and y coordinates. | |||
| */ | */ | |||
| typedef void (PostscriptDocument::*GLYPH_FUNC)( | typedef void (PostscriptDocument::*GLYPH_FUNC)( | |||
| const GlyphMap::value_type&, void* contextData); | const GlyphMap::value_type&, void* contextData); | |||
| void invoke_glyph_routine(const GlyphMap::value_type&, void* contextD ata); | void invoke_glyph_routine(const GlyphMap::value_type&, void* contextD ata); | |||
| void accrue_dimensions( const GlyphMap::value_type&, void* contextDat a1); | void accrue_dimensions( const GlyphMap::value_type&, void* contextDat a); | |||
| /** Decomposes string into glyphs and applies GLYPH_FUNC to each glyp h. | /** Decomposes string into glyphs and applies GLYPH_FUNC to each glyp h. | |||
| */ | */ | |||
| void for_each_glyph_do(const std::string&, const GLYPH_FUNC, void* co ntextData, | void for_each_glyph_do(const std::string&, const GLYPH_FUNC, void* co ntextData, | |||
| bool applyOffset = false); | bool applyOffset = false); | |||
| PangoContext* pangoContext() const; | PangoContext* pangoContext() const; | |||
| /** @returns name of Postscript glyph routine | /** @returns name of Postscript glyph routine | |||
| */ | */ | |||
| End of changes. 2 change blocks. | ||||
| 2 lines changed or deleted | 3 lines changed or added | |||