diff --git a/cppan.yml b/cppan.yml index 977bb7e87b..5833008723 100644 --- a/cppan.yml +++ b/cppan.yml @@ -224,12 +224,6 @@ projects: dependencies: - common_training - pvt.cppan.demo.unicode.icu.i18n - options: - any: - link_libraries: - win32: - private: - - Shlwapi lstmeval: files: training/lstmeval.cpp diff --git a/training/CMakeLists.txt b/training/CMakeLists.txt index 27cb469f84..d0128c1a53 100644 --- a/training/CMakeLists.txt +++ b/training/CMakeLists.txt @@ -196,9 +196,6 @@ target_link_libraries (unicharset_training common_training ${ICU_LIBRARIES else() target_link_libraries (unicharset_training common_training pvt.cppan.demo.unicode.icu.i18n) endif() -if (WIN32) -target_link_libraries (unicharset_training Shlwapi) -endif() project_group (unicharset_training "Training Tools") diff --git a/training/pango_font_info.cpp b/training/pango_font_info.cpp index 48e4d77dac..3e56218a87 100644 --- a/training/pango_font_info.cpp +++ b/training/pango_font_info.cpp @@ -46,16 +46,6 @@ #include "pango/pangocairo.h" #include "pango/pangofc-font.h" -#ifdef _MSC_VER -#ifndef strcasecmp -#define strcasecmp stricmp -#endif -#include -#ifndef strcasestr -#define strcasestr StrStrIA -#endif -#endif - STRING_PARAM_FLAG(fontconfig_tmpdir, "/tmp", "Overrides fontconfig default temporary dir"); @@ -232,10 +222,6 @@ bool PangoFontInfo::ParseFontDescription(const PangoFontDescription *desc) { == PANGO_VARIANT_SMALL_CAPS); is_bold_ = (pango_font_description_get_weight(desc) >= PANGO_WEIGHT_BOLD); - // We don't have a way to detect whether a font is of type Fraktur. The fonts - // we currently use all have "Fraktur" in their family name, so we do a - // fragile but functional check for that here. - is_fraktur_ = (strcasestr(family, "Fraktur") != nullptr); return true; } diff --git a/training/pango_font_info.h b/training/pango_font_info.h index af6ee98512..aef68459dc 100644 --- a/training/pango_font_info.h +++ b/training/pango_font_info.h @@ -109,7 +109,6 @@ class PangoFontInfo { bool is_italic() const { return is_italic_; } bool is_smallcaps() const { return is_smallcaps_; } bool is_monospace() const { return is_monospace_; } - bool is_fraktur() const { return is_fraktur_; } FontTypeEnum font_type() const { return font_type_; } int resolution() const { return resolution_; } @@ -132,7 +131,6 @@ class PangoFontInfo { bool is_italic_; bool is_smallcaps_; bool is_monospace_; - bool is_fraktur_; FontTypeEnum font_type_; // The Pango description that was used to initialize the instance. PangoFontDescription* desc_;