diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2012-11-26 06:56:29 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2012-11-26 06:56:29 +0000 |
| commit | 0f140e037d3b84ca7664c9a18b5bd977b912d6c2 (patch) | |
| tree | 559b8b9215dcf4a688a480ae1dc3f557d3036d05 /src/libnrtype | |
| parent | merge from trunk (r11871) (diff) | |
| parent | Fix undo history entry for layer renaming to be consistent with 'Rename Layer... (diff) | |
| download | inkscape-0f140e037d3b84ca7664c9a18b5bd977b912d6c2.tar.gz inkscape-0f140e037d3b84ca7664c9a18b5bd977b912d6c2.zip | |
merge from trunk (r11903)
(bzr r11668.1.42)
Diffstat (limited to 'src/libnrtype')
| -rw-r--r-- | src/libnrtype/FontFactory.cpp | 4 | ||||
| -rw-r--r-- | src/libnrtype/Makefile_insert | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp index 8de9d4795..76a3df0e8 100644 --- a/src/libnrtype/FontFactory.cpp +++ b/src/libnrtype/FontFactory.cpp @@ -276,7 +276,7 @@ family_name_compare(char const *a, char const *b) #endif } -void noop(...) {} +static void noop(...) {} //#define PANGO_DEBUG g_print #define PANGO_DEBUG noop @@ -285,7 +285,7 @@ void noop(...) {} ///////////////////// FontFactory #ifndef USE_PANGO_WIN32 // the substitute function to tell fontconfig to enforce outline fonts -void FactorySubstituteFunc(FcPattern *pattern,gpointer /*data*/) +static void FactorySubstituteFunc(FcPattern *pattern,gpointer /*data*/) { FcPatternAddBool(pattern, "FC_OUTLINE",FcTrue); //char *fam = NULL; diff --git a/src/libnrtype/Makefile_insert b/src/libnrtype/Makefile_insert index 7cd99e1a8..0ce8f1fd5 100644 --- a/src/libnrtype/Makefile_insert +++ b/src/libnrtype/Makefile_insert @@ -11,7 +11,6 @@ ink_common_sources += \ libnrtype/nr-type-pos-def.h \ libnrtype/nr-type-primitives.cpp \ libnrtype/nr-type-primitives.h \ - libnrtype/nrtype-forward.h \ libnrtype/FontFactory.cpp \ libnrtype/FontFactory.h \ libnrtype/FontInstance.cpp \ |