← Back to branch summary

~ubuntu-branches/ubuntu/maverick/rrdtool/maverick

« back to all changes in this revision

Viewing changes to src/rrd_gfx.c

  • Committer: Bazaar Package Importer
  • Author(s): Clint Byrum
  • Date: 2010-07-22 08:07:01 UTC
  • mfrom: (1.2.8 upstream) (3.1.6 sid)
  • Revision ID: james.westby@ubuntu.com-20100722080701-k46mgdfz6euxwqsm
Tags: 1.4.3-1ubuntu1
* Merge from debian unstable, Remaining changes:
  - debian/control: Don't build against ruby1.9 as we don't want
    it in main.
* require libdbi >= 0.8.3 to prevent aborts when using dbi datasources

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/rrd_gfx.c
1
1
/****************************************************************************
2
 
 * RRDtool 1.3.8  Copyright by Tobi Oetiker, 1997-2009
 
2
 * RRDtool 1.4.3  Copyright by Tobi Oetiker, 1997-2010
3
3
 ****************************************************************************
4
4
 * rrd_gfx.c  graphics wrapper for rrdtool
5
5
  **************************************************************************/
124
124
    const char *text)
125
125
{
126
126
    PangoLayout  *layout = im->layout;
127
 
    PangoFontDescription *pfd;
 
127
    const PangoFontDescription *pfd;
128
128
    cairo_t  *cr = im->cr;
129
129
 
130
130
    static double last_tabwidth = -1;
154
154
        pango_layout_set_tabs(layout, tab_array);
155
155
        pango_tab_array_free(tab_array);
156
156
    }
157
 
   pfd = (PangoFontDescription*)(pango_layout_get_font_description(layout));
 
157
   pfd = pango_layout_get_font_description(layout);
158
158
 
159
159
   if (!pfd || !pango_font_description_equal (pfd,font_desc)){
160
160
        pango_layout_set_font_description(layout, font_desc);