UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-25 16:50:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

[poincare] Resolve bug in complex write to text

Browse Source 
Change-Id: Ie5bc2cf4def9b8d9b9712e4ad6a5b3deee2d5abd
This commit is contained in:
Émilie Feral
2017-06-07 10:24:49 +02:00
parent a644a9274b
commit dd00d89b64
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
poincare/src/complex.cpp
View File

@@ -179,16 +179,19 @@ Complex::Complex(float a, float b) :
int Complex::convertComplexToText(char * buffer, int bufferSize, FloatDisplayMode displayMode, ComplexFormat complexFormat) const {
assert(displayMode != FloatDisplayMode::Default);
int numberOfChars = 0;
if (isnan(m_a) || isnan(m_b)) {
return convertFloatToText(NAN, buffer, bufferSize, k_numberOfSignificantDigits, displayMode);
}
if (complexFormat == ComplexFormat::Polar) {
if (r() != 1.0f || th() == 0.0f) {
numberOfChars = convertFloatToText(r(), buffer, bufferSize, k_numberOfSignificantDigits, displayMode);
if (r() != 0.0f && th() != 0.0f && !isnan(th()) && bufferSize > numberOfChars+1) {
if (r() != 0.0f && th() != 0.0f && bufferSize > numberOfChars+1) {
buffer[numberOfChars++] = '*';
// Ensure that the string is null terminated even if buffer size is to small
buffer[numberOfChars] = 0;
}
}
if (r() != 0.0f && th() != 0.0f && !isnan(th())) {
if (r() != 0.0f && th() != 0.0f) {
if (bufferSize > numberOfChars+3) {
buffer[numberOfChars++] = Ion::Charset::Exponential;
buffer[numberOfChars++] = '^';
@@ -215,14 +218,14 @@ int Complex::convertComplexToText(char * buffer, int bufferSize, FloatDisplayMod
buffer[numberOfChars] = 0;
}
}
if (m_b != 1.0f && m_b != -1.0f && m_b != 0.0f && !isnan(m_b)) {
if (m_b != 1.0f && m_b != -1.0f && m_b != 0.0f) {
numberOfChars += convertFloatToText(m_b, buffer+numberOfChars, bufferSize-numberOfChars, k_numberOfSignificantDigits, displayMode);
buffer[numberOfChars++] = '*';
}
if (m_b == -1.0f && bufferSize > numberOfChars+1) {
buffer[numberOfChars++] = '-';
}
if (m_b != 0.0f && !isnan(m_b) && bufferSize > numberOfChars+1) {
if (m_b != 0.0f && bufferSize > numberOfChars+1) {
buffer[numberOfChars++] = Ion::Charset::IComplex;
buffer[numberOfChars] = 0;
}