perso
/
finalcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

minor fixes

This commit is contained in:
Markus Gans 2020-04-10 22:13:13 +02:00
parent 20c3cf218e
commit ac1ebfefad
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -79,7 +79,7 @@ The calculator example in newfont mode:
Benchmark Benchmark
--------- ---------
Here you can find a test for ![measuring the character speed](doc/benchmark.md#benchmark) in the terminal. Here you can find a test for [measuring the character speed](doc/benchmark.md#benchmark) in the terminal.
Virtual terminal Virtual terminal

2
examples/calculator.cpp
View File

@ -999,7 +999,7 @@ void Calc::onKeyPress (finalcut::FKeyEvent* ev)
else else
{ {
input = input.left(input.getLength() - 1); input = input.left(input.getLength() - 1);
x = lDouble(std::atof(input.c_str())); x = std::strtold(input.c_str(), nullptr);
} }
drawDispay(); drawDispay();

26
src/foptiattr.cpp
View File

@ -1195,19 +1195,19 @@ bool FOptiAttr::hasAttribute (const FChar* const& attr)
{ {
if ( attr ) if ( attr )
{ {
return attr->attr.bit.bold == 1 return attr->attr.bit.bold
|| attr->attr.bit.dim == 1 || attr->attr.bit.dim
|| attr->attr.bit.italic == 1 || attr->attr.bit.italic
|| attr->attr.bit.underline == 1 || attr->attr.bit.underline
|| attr->attr.bit.blink == 1 || attr->attr.bit.blink
|| attr->attr.bit.reverse == 1 || attr->attr.bit.reverse
|| attr->attr.bit.standout == 1 || attr->attr.bit.standout
|| attr->attr.bit.invisible == 1 || attr->attr.bit.invisible
|| attr->attr.bit.protect == 1 || attr->attr.bit.protect
|| attr->attr.bit.crossed_out == 1 || attr->attr.bit.crossed_out
|| attr->attr.bit.dbl_underline == 1 || attr->attr.bit.dbl_underline
|| attr->attr.bit.alt_charset == 1 || attr->attr.bit.alt_charset
|| attr->attr.bit.pc_charset == 1; || attr->attr.bit.pc_charset;
} }
return false; return false;

4
test/fstring-test.cpp
View File

@ -992,11 +992,11 @@ void FStringTest::streamExtractionTest()
float in_12; float in_12;
finalcut::FString("2.71828") >> in_12; finalcut::FString("2.71828") >> in_12;
CPPUNIT_ASSERT ( in_12 == 2.71828f ); CPPUNIT_ASSERT ( std::fabs(in_12 - 2.71828f) <= FLT_EPSILON );
double in_13; double in_13;
finalcut::FString("2.7182818284590452353") >> in_13; finalcut::FString("2.7182818284590452353") >> in_13;
CPPUNIT_ASSERT ( in_13 == 2.7182818284590452353 ); CPPUNIT_ASSERT ( std::fabs(in_13 - 2.7182818284590452353) <= DBL_EPSILON );
finalcut::FString in; finalcut::FString in;
std::istringstream istream("abc"); std::istringstream istream("abc");