← Back to branch summary

~valavanisalex/ubuntu/oneiric/inkscape/inkscape_0.48.1-2ubuntu4

« back to all changes in this revision

Viewing changes to src/libnrtype/FontFactory.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook, Ted Gould, Kees Cook
  • Date: 2009-06-24 14:00:43 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20090624140043-07stp20mry48hqup
Tags: 0.47~pre0-0ubuntu1
* New upstream release

[ Ted Gould ]
* debian/control: Adding libgsl0 and removing version specifics on boost

[ Kees Cook ]
* debian/watch: updated to run uupdate and mangle pre-release versions.
* Dropped patches that have been taken upstream:
  - 01_mips
  - 02-poppler-0.8.3
  - 03-chinese-inkscape
  - 05_fix_latex_patch
  - 06_gcc-4.4
  - 07_cdr2svg
  - 08_skip-bad-utf-on-pdf-import
  - 09_gtk-clist
  - 10_belarussian
  - 11_libpng
  - 12_desktop
  - 13_slider
  - 100_svg_import_improvements
  - 102_sp_pattern_painter_free
  - 103_bitmap_type_print

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/libnrtype/FontFactory.cpp
8
8
 *
9
9
 */
10
10
 
 
11
#define PANGO_ENABLE_ENGINE
 
12
 
11
13
#include "FontFactory.h"
12
14
#include <libnrtype/font-instance.h>
13
15
 
228
230
    return strcasecmp(a, b);
229
231
}
230
232
 
 
233
/*
 
234
 defined but not used:
 
235
 
231
236
static int
232
237
style_record_compare(void const *aa, void const *bb)
233
238
{
252
257
    }
253
258
    if ( list->records ) g_free(list->records);
254
259
}
 
260
*/
255
261
 
256
262
/**
257
263
 * On Win32 performs a stricmp(a,b), otherwise does a strcasecmp(a,b)
817
823
        res->Ref();
818
824
        AddInCache(res);
819
825
    }
820
 
    res->InitTheFace();
 
826
    if(res)
 
827
        res->InitTheFace();
821
828
    return res;
822
829
}
823
830