commit 422558142aabb996d8ad1848df7ea4d5a8ade98a
author Behdad Esfahbod <behdad@behdad.org> Mon Sep 19 17:57:02 2011 -0400
committer Behdad Esfahbod <behdad@behdad.org> Mon Sep 19 17:57:02 2011 -0400
tree 8a616c84d95be4932e4d6d6b2360ab6998ffa1c5
parent b5afd8f78e6b372f1bbed469329c1554adb20eea

[util] Account for line-space in surface size

util/options.cc

diff --git a/util/options.cc b/util/options.cc
index a48f606..97be635 100644
--- a/util/options.cc
+++ b/util/options.cc
@@ -640,7 +640,7 @@
   hb_glyph_position_t *pos = hb_buffer_get_glyph_positions (buffer, NULL);
 
   g_string_append_c (gs, '<');
-  for (unsigned int i = 0; i < (int) num_glyphs; i++)
+  for (unsigned int i = 0; i < num_glyphs; i++)
   {
     if (i)
       g_string_append_c (gs, '|');

util/options.hh

diff --git a/util/options.hh b/util/options.hh
index af9bedb..171fbe6 100644
--- a/util/options.hh
+++ b/util/options.hh
@@ -35,7 +35,6 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
-#include <assert.h>
 #include <stdio.h>
 #include <math.h>
 #include <locale.h>

util/view-cairo.cc

diff --git a/util/view-cairo.cc b/util/view-cairo.cc
index 4671147..f766a4f 100644
--- a/util/view-cairo.cc
+++ b/util/view-cairo.cc
@@ -65,7 +65,7 @@
 
   *h = font_extents.ascent
      + font_extents.descent
-     + ((int) lines->len - 1) * font_extents.height;
+     + ((int) lines->len - 1) * (font_extents.height + line_space);
   *w = 0;
   for (unsigned int i = 0; i < lines->len; i++) {
     helper_cairo_line_t &line = g_array_index (lines, helper_cairo_line_t, i);