summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/glview.cc7
-rwxr-xr-xtests/test_cmdline_tool.py2
2 files changed, 5 insertions, 4 deletions
diff --git a/src/glview.cc b/src/glview.cc
index f25cac6..141d998 100644
--- a/src/glview.cc
+++ b/src/glview.cc
@@ -500,10 +500,11 @@ void GLView::paintGL()
// FIXME: This was an attempt to keep contrast with background, but is suboptimal
// (e.g. nearly invisible against a gray background).
- int r,g,b;
- r=g=b=0;
+// int r,g,b;
+// r=g=b=0;
// bgcol.getRgb(&r, &g, &b);
- glColor3d((255.0-r)/255.0, (255.0-g)/255.0, (255.0-b)/255.0);
+// glColor3f((255.0f-r)/255.0f, (255.0f-g)/255.0f, (255.0f-b)/255.0f);
+ glColor3f(0.0f, 0.0f, 0.0f);
glBegin(GL_LINES);
// X Label
glVertex3d(xlabel_x-3, xlabel_y-3, 0); glVertex3d(xlabel_x+3, xlabel_y+3, 0);
diff --git a/tests/test_cmdline_tool.py b/tests/test_cmdline_tool.py
index 967e334..4538984 100755
--- a/tests/test_cmdline_tool.py
+++ b/tests/test_cmdline_tool.py
@@ -110,7 +110,7 @@ def compare_png(resultfilename):
elif compare_method=='NCC':
thresh = 0.95
ncc_err = float(output.strip())
- if ncc_err > thresh: return True
+ if ncc_err > thresh or ncc_err==0.0: return True
else: print >> sys.stderr, ncc_err, ' Images differ: NCC comparison < ', thresh
return False
contact: Jan Huwald // Impressum