aboutsummaryrefslogtreecommitdiffstats
path: root/subsurface-desktop-main.cpp
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2017-11-20 21:39:50 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-12-17 09:02:44 -0800
commita748e7f239f29f5aa63a7ff221d1bd5081e698a2 (patch)
tree982bc5e2dc5d3c5c78869073be3db570537ae6a6 /subsurface-desktop-main.cpp
parentb1d94b247067a5cb07d6bdf8a9c2519e5309c326 (diff)
downloadsubsurface-a748e7f239f29f5aa63a7ff221d1bd5081e698a2.tar.gz
Unify float calulations: use double
Internal floating point (FP) calculations should be performed using double unless there is a very good reason. This avoids headaches with conversions. Indeed, the vast majority of FP calculations were already done using double. This patch adapts most remaining calculations. Not converted where things that were based on binary representations and variables which weren't used anyway. An analysis of all instances follows: core/plannernotes.c, l.404: This was a comparison between two floats. On the left side, first an integer was cast to float then multiplied with and integer and divided by a constant double. The right hand side was an integer cast to a float. Simply divide by 1000.0 first to convert to double and continue with calculations. On the right hand side, remove the cast, because the integer will be implicitely cast to double for comparison. This conversion actually emits less instructions, because no conversion to double and back is performed. core/planner.c, l.613: Same analysis as previous case. subsurface-desktop-main.cpp, l.155: A local variable representing the version OpenGL version. Turn this into integer logic. Not only does this avoid dreaded FP rounding issues, it also works correctly for minor version > 10 (not that such a thing is to be expected anytime soon). abstractpreferenceswidget.[h/cpp]: A widget where the position is described as a float. Turn into double. desktop-widgets/divelogexportdialog.cpp, l.313: total_weight is described as float. Use double arithmetics instead. This instance fixes a truncation warning emitted by gcc.
Diffstat (limited to 'subsurface-desktop-main.cpp')
-rw-r--r--subsurface-desktop-main.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/subsurface-desktop-main.cpp b/subsurface-desktop-main.cpp
index 5b8424487..c439179c8 100644
--- a/subsurface-desktop-main.cpp
+++ b/subsurface-desktop-main.cpp
@@ -152,7 +152,6 @@ void validateGL()
QOffscreenSurface surface;
QOpenGLFunctions *func;
const char *verChar;
- float verFloat;
surface.setFormat(ctx.format());
surface.create();
@@ -182,9 +181,10 @@ void validateGL()
"before running Subsurface!\n").toUtf8().data();
return;
}
- if (sscanf(verChar, "%f", &verFloat) == 1) {
- verMajor = (GLint)verFloat;
- verMinor = (GLint)roundf((verFloat - verMajor) * 10.f);
+ int min, maj;
+ if (sscanf(verChar, "%d.%d", &maj, &min) == 2) {
+ verMajor = (GLint)maj;
+ verMinor = (GLint)min;
}
}
// attempt to detect version using the newer API