Revert "Imported Upstream version 1.2.7"

[platform/upstream/harfbuzz.git] / util / view-cairo.cc

diff --git a/util/view-cairo.cc b/util/view-cairo.cc
index f4f2bc5..160250e 100644 (file)
--- a/util/view-cairo.cc
+++ b/util/view-cairo.cc
@@ -26,76 +26,71 @@
 
 #include "view-cairo.hh"
 
-#include <assert.h>
-
-
 void
-view_cairo_t::render (const font_options_t *font_opts)
+view_cairo_t::get_surface_size (cairo_scaled_font_t *scaled_font,
+                               double *w, double *h)
 {
-  bool vertical = HB_DIRECTION_IS_VERTICAL (direction);
-  int vert  = vertical ? 1 : 0;
-  int horiz = vertical ? 0 : 1;
+  cairo_font_extents_t font_extents;
 
-  int x_sign = font_opts->font_size_x < 0 ? -1 : +1;
-  int y_sign = font_opts->font_size_y < 0 ? -1 : +1;
+  cairo_scaled_font_extents (scaled_font, &font_extents);
 
-  hb_font_t *font = font_opts->get_font();
-  hb_font_extents_t extents;
-  hb_font_get_extents_for_direction (font, direction, &extents);
-
-  double ascent = y_sign * scalbn ((double) extents.ascender, scale_bits);
-  double descent = y_sign * -scalbn ((double) extents.descender, scale_bits);
-  double font_height = y_sign * scalbn ((double) extents.ascender - extents.descender + extents.line_gap, scale_bits);
-  double leading = font_height + view_options.line_space;
-
-  /* Calculate surface size. */
-  double w, h;
-  (vertical ? w : h) = (int) lines->len * leading - view_options.line_space;
-  (vertical ? h : w) = 0;
+  bool vertical = HB_DIRECTION_IS_VERTICAL (direction);
+  (vertical ? *w : *h) = (int) lines->len * (font_extents.height + view_options.line_space) - view_options.line_space;
+  (vertical ? *h : *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);
     double x_advance, y_advance;
     line.get_advance (&x_advance, &y_advance);
     if (vertical)
-      h =  MAX (h, y_sign * y_advance);
+      *h =  MAX (*h, y_advance);
     else
-      w =  MAX (w, x_sign * x_advance);
+      *w =  MAX (*w, x_advance);
   }
 
+  *w += view_options.margin.l + view_options.margin.r;
+  *h += view_options.margin.t + view_options.margin.b;
+}
+
+void
+view_cairo_t::render (const font_options_t *font_opts)
+{
   cairo_scaled_font_t *scaled_font = helper_cairo_create_scaled_font (font_opts);
+  double w, h;
+  get_surface_size (scaled_font, &w, &h);
+  cairo_t *cr = helper_cairo_create_context (w, h, &view_options, &output_options);
+  cairo_set_scaled_font (cr, scaled_font);
+  cairo_scaled_font_destroy (scaled_font);
 
-  /* See if font needs color. */
-  cairo_content_t content = CAIRO_CONTENT_ALPHA;
-  if (helper_cairo_scaled_font_has_color (scaled_font))
-    content = CAIRO_CONTENT_COLOR;
+  draw (cr);
 
-  /* Create surface. */
-  cairo_t *cr = helper_cairo_create_context (w + view_options.margin.l + view_options.margin.r,
-                                            h + view_options.margin.t + view_options.margin.b,
-                                            &view_options, &output_options, content);
-  cairo_set_scaled_font (cr, scaled_font);
+  helper_cairo_destroy_context (cr);
+}
 
-  /* Setup coordinate system. */
+void
+view_cairo_t::draw (cairo_t *cr)
+{
+  cairo_save (cr);
+
+  bool vertical = HB_DIRECTION_IS_VERTICAL (direction);
+  int v = vertical ? 1 : 0;
+  int h = vertical ? 0 : 1;
+  cairo_font_extents_t font_extents;
+  cairo_font_extents (cr, &font_extents);
   cairo_translate (cr, view_options.margin.l, view_options.margin.t);
+  double descent;
   if (vertical)
-    cairo_translate (cr,
-                    w /* We stack lines right to left */
-                    -font_height * .5 /* "ascent" for vertical */,
-                    y_sign < 0 ? h : 0);
+    descent = font_extents.height * (lines->len + .5);
   else
-   {
-    cairo_translate (cr,
-                    x_sign < 0 ? w : 0,
-                    y_sign < 0 ? descent : ascent);
-   }
-
-  /* Draw. */
-  cairo_translate (cr, +vert * leading, -horiz * leading);
+    descent = font_extents.height - font_extents.ascent;
+  cairo_translate (cr, v * descent, h * -descent);
   for (unsigned int i = 0; i < lines->len; i++)
   {
     helper_cairo_line_t &l = g_array_index (lines, helper_cairo_line_t, i);
 
-    cairo_translate (cr, -vert * leading, +horiz * leading);
+    if (i)
+      cairo_translate (cr, v * -view_options.line_space, h * view_options.line_space);
+
+    cairo_translate (cr, v * -font_extents.height, h * font_extents.height);
 
     if (view_options.annotate) {
       cairo_save (cr);
@@ -127,7 +122,5 @@ view_cairo_t::render (const font_options_t *font_opts)
       cairo_show_glyphs (cr, l.glyphs, l.num_glyphs);
   }
 
-  /* Clean up. */
-  helper_cairo_destroy_context (cr);
-  cairo_scaled_font_destroy (scaled_font);
+  cairo_restore (cr);
 }