From 0510aca314af0d0f137c7e012d1a0e20e80c0c22 Mon Sep 17 00:00:00 2001 From: seleznevae Date: Sat, 12 Jan 2019 16:18:42 +0300 Subject: [PATCH] [T] Tmp: checking pipeline fail --- .cirrus.yml | 1 + lib/fort.c | 3 ++- src/properties.c | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 91f69ad..65e2c15 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -20,4 +20,5 @@ main_task: - cp fort.c fort.cpp - c++ -Wall -Wextra -Werror -DFT_CONGIG_HAVE_WCHAR fort.cpp -c -o fort.o - rm fort.o + - rm fort.cpp - cd .. \ No newline at end of file diff --git a/lib/fort.c b/lib/fort.c index e470ce3..1bba4ba 100644 --- a/lib/fort.c +++ b/lib/fort.c @@ -2927,7 +2927,8 @@ static fort_status_t set_cell_property_impl(fort_cell_props_t *opt, uint32_t pro if (v == FT_TSTYLE_DEFAULT) { opt->cell_text_style = FT_TSTYLE_DEFAULT; } else { - opt->cell_text_style = (enum ft_text_style)(opt->cell_text_style | v); +// opt->cell_text_style = (enum ft_text_style)(opt->cell_text_style | v); + opt->cell_text_style |= v; } } else if (PROP_IS_SET(property, FT_CPROP_CONT_TEXT_STYLE)) { enum ft_text_style v = (enum ft_text_style)value; diff --git a/src/properties.c b/src/properties.c index a193355..4c8ccea 100644 --- a/src/properties.c +++ b/src/properties.c @@ -471,7 +471,8 @@ static fort_status_t set_cell_property_impl(fort_cell_props_t *opt, uint32_t pro if (v == FT_TSTYLE_DEFAULT) { opt->cell_text_style = FT_TSTYLE_DEFAULT; } else { - opt->cell_text_style = (enum ft_text_style)(opt->cell_text_style | v); +// opt->cell_text_style = (enum ft_text_style)(opt->cell_text_style | v); + opt->cell_text_style |= v; } } else if (PROP_IS_SET(property, FT_CPROP_CONT_TEXT_STYLE)) { enum ft_text_style v = (enum ft_text_style)value;