improve spcurve::second_point and document its behavior

[inkscape.git] / src / libnrtype / font-instance.h

diff --git a/src/libnrtype/font-instance.h b/src/libnrtype/font-instance.h
index ec58ce1d783abe8f88d3a333a4b9510e43ba56c3..22dd829ae30c3e04cb0390a44966a54211ce7dbd 100644 (file)
--- a/src/libnrtype/font-instance.h
+++ b/src/libnrtype/font-instance.h
@@ -12,6 +12,7 @@
 #include <libnrtype/nrtype-forward.h>
 #include <libnrtype/font-style.h>
 #include <livarot/livarot-forward.h>
+#include "libnr/nr-rect.h"
 
 // the font_instance are the template of several raster_font; they provide metrics and outlines
 // that are drawn by the raster_font, so the raster_font needs info relative to the way the 
@@ -49,7 +50,7 @@ public:
     font_glyph*           glyphs;
 
     font_instance(void);
-    ~font_instance(void);
+    virtual ~font_instance(void);
 
     void                 Ref(void);
     void                 Unref(void);
@@ -77,7 +78,7 @@ public:
     bool                 FontMetrics(double &ascent, double &descent, double &leading);
     bool                 FontSlope(double &run, double &rise);
                                 // for generating slanted cursors for oblique fonts
-    NR::Rect             BBox(int glyph_id);
+    NR::Maybe<NR::Rect>             BBox(int glyph_id);
 
                // creates a rasterfont for the given style
     raster_font*         RasterFont(NR::Matrix const &trs, double stroke_width,