diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2012-12-13 04:17:37 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2012-12-13 04:17:37 +0000 |
| commit | 991279702f188995eaf339994394ba0ea4d9e7a6 (patch) | |
| tree | 4cda11330822097aae2cb256602343fe2a918f12 /src/libnrtype | |
| parent | preliminary release of the EMF import text reassembly feature. (diff) | |
| parent | Migrate document metadata from NotbookPage to Gtk::Grid and drop dead code (diff) | |
| download | inkscape-991279702f188995eaf339994394ba0ea4d9e7a6.tar.gz inkscape-991279702f188995eaf339994394ba0ea4d9e7a6.zip | |
merge from trunk (r11952)
(bzr r11668.1.46)
Diffstat (limited to 'src/libnrtype')
| -rw-r--r-- | src/libnrtype/FontFactory.cpp | 7 | ||||
| -rw-r--r-- | src/libnrtype/FontInstance.cpp | 7 | ||||
| -rw-r--r-- | src/libnrtype/Layout-TNG-Input.cpp | 6 | ||||
| -rw-r--r-- | src/libnrtype/Layout-TNG-Output.cpp | 6 |
4 files changed, 0 insertions, 26 deletions
diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp index 76a3df0e8..ed1e1dc5c 100644 --- a/src/libnrtype/FontFactory.cpp +++ b/src/libnrtype/FontFactory.cpp @@ -22,13 +22,6 @@ #include "libnrtype/font-instance.h" #include "util/unordered-containers.h" -#if !PANGO_VERSION_CHECK(1,24,0) -#define PANGO_WEIGHT_THIN static_cast<PangoWeight>(100) -#define PANGO_WEIGHT_BOOK static_cast<PangoWeight>(380) -#define PANGO_WEIGHT_MEDIUM static_cast<PangoWeight>(500) -#define PANGO_WEIGHT_ULTRAHEAVY static_cast<PangoWeight>(1000) -#endif - typedef INK_UNORDERED_MAP<PangoFontDescription*, font_instance*, font_descr_hash, font_descr_equal> FaceMapType; // need to avoid using the size field diff --git a/src/libnrtype/FontInstance.cpp b/src/libnrtype/FontInstance.cpp index f8b2c3b9d..4ca8bf2a0 100644 --- a/src/libnrtype/FontInstance.cpp +++ b/src/libnrtype/FontInstance.cpp @@ -27,13 +27,6 @@ #include "livarot/Path.h" #include "util/unordered-containers.h" -#if !PANGO_VERSION_CHECK(1,24,0) -#define PANGO_WEIGHT_THIN static_cast<PangoWeight>(100) -#define PANGO_WEIGHT_BOOK static_cast<PangoWeight>(380) -#define PANGO_WEIGHT_MEDIUM static_cast<PangoWeight>(500) -#define PANGO_WEIGHT_ULTRAHEAVY static_cast<PangoWeight>(1000) -#endif - struct font_style_hash : public std::unary_function<font_style, size_t> { size_t operator()(font_style const &x) const; diff --git a/src/libnrtype/Layout-TNG-Input.cpp b/src/libnrtype/Layout-TNG-Input.cpp index 07bf207c8..10310b4aa 100644 --- a/src/libnrtype/Layout-TNG-Input.cpp +++ b/src/libnrtype/Layout-TNG-Input.cpp @@ -19,12 +19,6 @@ #include "sp-string.h" #include "FontFactory.h" -#if !PANGO_VERSION_CHECK(1,24,0) -#define PANGO_WEIGHT_THIN static_cast<PangoWeight>(100) -#define PANGO_WEIGHT_BOOK static_cast<PangoWeight>(380) -#define PANGO_WEIGHT_MEDIUM static_cast<PangoWeight>(500) -#define PANGO_WEIGHT_ULTRAHEAVY static_cast<PangoWeight>(1000) -#endif namespace Inkscape { namespace Text { diff --git a/src/libnrtype/Layout-TNG-Output.cpp b/src/libnrtype/Layout-TNG-Output.cpp index 1d293e360..9e75473ce 100644 --- a/src/libnrtype/Layout-TNG-Output.cpp +++ b/src/libnrtype/Layout-TNG-Output.cpp @@ -22,12 +22,6 @@ #include <2geom/pathvector.h> #include "libunicode-convert/unicode-convert.h" -#if !PANGO_VERSION_CHECK(1,24,0) -#define PANGO_WEIGHT_THIN static_cast<PangoWeight>(100) -#define PANGO_WEIGHT_BOOK static_cast<PangoWeight>(380) -#define PANGO_WEIGHT_MEDIUM static_cast<PangoWeight>(500) -#define PANGO_WEIGHT_ULTRAHEAVY static_cast<PangoWeight>(1000) -#endif namespace Inkscape { namespace Extension { |