diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2014-03-21 17:53:05 +0000 |
|---|---|---|
| committer | Johan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl> | 2014-03-21 17:53:05 +0000 |
| commit | de29fdf792fc739be65787538a3bf6da6cd01f8b (patch) | |
| tree | b18243fa18d04d450670659fa5f92becd4c612d1 /src/libnrtype | |
| parent | libcroco: fix pointer signedness errors (diff) | |
| download | inkscape-de29fdf792fc739be65787538a3bf6da6cd01f8b.tar.gz inkscape-de29fdf792fc739be65787538a3bf6da6cd01f8b.zip | |
fix macro redefinition errors
(bzr r13179)
Diffstat (limited to 'src/libnrtype')
| -rw-r--r-- | src/libnrtype/FontFactory.cpp | 6 | ||||
| -rw-r--r-- | src/libnrtype/FontInstance.cpp | 6 | ||||
| -rw-r--r-- | src/libnrtype/Layout-TNG-Input.cpp | 10 |
3 files changed, 17 insertions, 5 deletions
diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp index f05b75aaa..7c0b4ffba 100644 --- a/src/libnrtype/FontFactory.cpp +++ b/src/libnrtype/FontFactory.cpp @@ -8,12 +8,14 @@ * */ -#define PANGO_ENABLE_ENGINE - #ifdef HAVE_CONFIG_H # include "config.h" #endif +#ifndef PANGO_ENABLE_ENGINE +#define PANGO_ENABLE_ENGINE +#endif + #include <glibmm/i18n.h> #include <pango/pangoft2.h> #include "libnrtype/FontFactory.h" diff --git a/src/libnrtype/FontInstance.cpp b/src/libnrtype/FontInstance.cpp index a5b782344..20eca6740 100644 --- a/src/libnrtype/FontInstance.cpp +++ b/src/libnrtype/FontInstance.cpp @@ -8,12 +8,14 @@ * */ -#define PANGO_ENABLE_ENGINE - #ifdef HAVE_CONFIG_H # include "config.h" #endif +#ifndef PANGO_ENABLE_ENGINE +#define PANGO_ENABLE_ENGINE +#endif + #include <ft2build.h> #include FT_OUTLINE_H #include FT_BBOX_H diff --git a/src/libnrtype/Layout-TNG-Input.cpp b/src/libnrtype/Layout-TNG-Input.cpp index c7b0948e8..cb3e6f620 100644 --- a/src/libnrtype/Layout-TNG-Input.cpp +++ b/src/libnrtype/Layout-TNG-Input.cpp @@ -9,7 +9,13 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#ifndef PANGO_ENABLE_ENGINE #define PANGO_ENABLE_ENGINE +#endif #include <gtk/gtk.h> #include "Layout-TNG.h" @@ -25,8 +31,10 @@ namespace Text { void Layout::_clearInputObjects() { - for(std::vector<InputStreamItem*>::iterator it = _input_stream.begin() ; it != _input_stream.end() ; ++it) + for(std::vector<InputStreamItem*>::iterator it = _input_stream.begin() ; it != _input_stream.end() ; ++it) { delete *it; + } + _input_stream.clear(); _input_wrap_shapes.clear(); } |