summaryrefslogtreecommitdiffstats
path: root/src/trace/potrace/progress.h
diff options
context:
space:
mode:
authorKris De Gussem <kris.degussem@gmail.com>2012-03-07 17:19:18 +0000
committerKris <Kris.De.Gussem@hotmail.com>2012-03-07 17:19:18 +0000
commit2eb76fb0bd4b8572866d3c2390eaa82747890292 (patch)
tree673eb8fdedd2cc54fd48347fb59cc5e1e20f8508 /src/trace/potrace/progress.h
parentTranslations. Greek translation update by Dimitris Spingos. (diff)
downloadinkscape-2eb76fb0bd4b8572866d3c2390eaa82747890292.tar.gz
inkscape-2eb76fb0bd4b8572866d3c2390eaa82747890292.zip
cppcheck
(bzr r11052)
Diffstat (limited to 'src/trace/potrace/progress.h')
-rw-r--r--src/trace/potrace/progress.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/trace/potrace/progress.h b/src/trace/potrace/progress.h
index 93a1fa3f0..3e1dfb34e 100644
--- a/src/trace/potrace/progress.h
+++ b/src/trace/potrace/progress.h
@@ -26,10 +26,8 @@ typedef struct progress_s progress_t;
given in the 0.0-1.0 range, which will be scaled and translated to
the progress object's range. */
static inline void progress_update(double d, progress_t *prog) {
- double d_scaled;
-
if (prog != NULL && prog->callback != NULL) {
- d_scaled = prog->min * (1-d) + prog->max * d;
+ double d_scaled = prog->min * (1-d) + prog->max * d;
if (d == 1.0 || d_scaled >= prog->d_prev + prog->epsilon) {
prog->callback(prog->min * (1-d) + prog->max * d, prog->data);
prog->d_prev = d_scaled;