3rd-party/libfort
1
0
Fork 0
Code Releases Activity

[T] Tmp: checking pipeline fail

Browse Source
This commit is contained in:
seleznevae 2019-01-12 16:18:42 +03:00
parent 38cb3db339
commit 0510aca314
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cirrus.yml
View File

@ -20,4 +20,5 @@ main_task:
- cp fort.c fort.cpp - cp fort.c fort.cpp
- c++ -Wall -Wextra -Werror -DFT_CONGIG_HAVE_WCHAR fort.cpp -c -o fort.o - c++ -Wall -Wextra -Werror -DFT_CONGIG_HAVE_WCHAR fort.cpp -c -o fort.o
- rm fort.o - rm fort.o
- rm fort.cpp
- cd .. - cd ..

3
lib/fort.c
View File

@ -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) { if (v == FT_TSTYLE_DEFAULT) {
opt->cell_text_style = FT_TSTYLE_DEFAULT; opt->cell_text_style = FT_TSTYLE_DEFAULT;
} else { } 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)) { } else if (PROP_IS_SET(property, FT_CPROP_CONT_TEXT_STYLE)) {
enum ft_text_style v = (enum ft_text_style)value; enum ft_text_style v = (enum ft_text_style)value;

3
src/properties.c
View File

@ -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) { if (v == FT_TSTYLE_DEFAULT) {
opt->cell_text_style = FT_TSTYLE_DEFAULT; opt->cell_text_style = FT_TSTYLE_DEFAULT;
} else { } 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)) { } else if (PROP_IS_SET(property, FT_CPROP_CONT_TEXT_STYLE)) {
enum ft_text_style v = (enum ft_text_style)value; enum ft_text_style v = (enum ft_text_style)value;