diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-11-03 01:44:20 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-11-03 01:44:20 +0000 |
| commit | 4cf12a1d39b9885d14ee7b1c89dc237bb5fb91c0 (patch) | |
| tree | 5a79f1cf7373f8b016e169081044f76e09a227d1 | |
| parent | Allow color widget instead text input in powermask. Simplify the UI (diff) | |
| parent | change assignment to equality (diff) | |
| download | inkscape-4cf12a1d39b9885d14ee7b1c89dc237bb5fb91c0.tar.gz inkscape-4cf12a1d39b9885d14ee7b1c89dc237bb5fb91c0.zip | |
Merge branch 'master' into powerMaskImprovements
| -rw-r--r-- | CMakeScripts/HelperMacros.cmake | 2 | ||||
| -rw-r--r-- | src/libnrtype/FontFactory.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CMakeScripts/HelperMacros.cmake b/CMakeScripts/HelperMacros.cmake index a0bdd9866..54bbf9d09 100644 --- a/CMakeScripts/HelperMacros.cmake +++ b/CMakeScripts/HelperMacros.cmake @@ -29,7 +29,7 @@ macro(add_inkscape_lib name sources) - add_library(${name} ${sources}) + add_library(${name} STATIC ${sources}) # works fine without having the includes # listed is helpful for IDE's (QtCreator/MSVC) diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp index 9c62e5483..90df81261 100644 --- a/src/libnrtype/FontFactory.cpp +++ b/src/libnrtype/FontFactory.cpp @@ -939,7 +939,7 @@ void font_factory::AddFontsDir(char const *utf8dir) conf = pango_fc_font_map_get_config(PANGO_FC_FONT_MAP(fontServer)); # endif FcBool res = FcConfigAppFontAddDir(conf, (FcChar8 const *)dir); - if (res = FcTrue) { + if (res == FcTrue) { g_info("Fonts dir '%s' added successfully.", utf8dir); } else { g_warning("Could not add fonts dir '%s'.", utf8dir); @@ -971,7 +971,7 @@ void font_factory::AddFontFile(char const *utf8file) conf = pango_fc_font_map_get_config(PANGO_FC_FONT_MAP(fontServer)); # endif FcBool res = FcConfigAppFontAddFile(conf, (FcChar8 const *)file); - if (res = FcTrue) { + if (res == FcTrue) { g_info("Font file '%s' added successfully.", utf8file); } else { g_warning("Could not add font file '%s'.", utf8file); |