Warning cleanup.

[inkscape.git] / src / widgets / font-selector.cpp

diff --git a/src/widgets/font-selector.cpp b/src/widgets/font-selector.cpp
index 5c6aa35e736c982bab00ca4dac62950d17d81cc8..502c34790357b0bc58cf654f4e5b606b4ec63df1 100644 (file)
--- a/src/widgets/font-selector.cpp
+++ b/src/widgets/font-selector.cpp
@@ -626,7 +626,7 @@ static gint sp_font_preview_expose(GtkWidget *widget, GdkEventExpose *event)
 
             font_instance *tface = fprev->rfont->daddy;
 
-            double theSize = NR::expansion(fprev->rfont->style.transform);
+            double theSize = fprev->rfont->style.transform.descrim();
 
             gchar const *p;
             if (fprev->phrase) {
@@ -671,7 +671,7 @@ static gint sp_font_preview_expose(GtkWidget *widget, GdkEventExpose *event)
                         hpos[len] = base_pt[0];
                         len++;
                         if ( curF ) {
-                            boost::optional<NR::Rect> nbbox = curF->BBox(str_text->glyph_text[i].gl);
+                            Geom::OptRect nbbox = curF->BBox(str_text->glyph_text[i].gl);
                             if (nbbox) {
                                 bbox.x0 = MIN(bbox.x0, base_pt[Geom::X] + theSize * (nbbox->min())[0]);
                                 bbox.y0 = MIN(bbox.y0, base_pt[Geom::Y] - theSize * (nbbox->max())[1]);