From 0ff0d2b68a10851ffab1b8baa14f87d20869d084 Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Tue, 27 Dec 2011 21:17:04 -0800
Subject: regression tests: fix ncc==0 false-fails when using NCC image
 comparison


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
 
-- 
cgit v0.10.1


From c1c54b33142d2363827bfa19acc83e89cdf7afa7 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Tue, 27 Dec 2011 16:04:16 +0100
Subject: Updated expected files due to recently introduced bounding box
 changes


diff --git a/tests/regression/opencsgtest/example010-expected.png b/tests/regression/opencsgtest/example010-expected.png
index 3a4ba27..0616f87 100644
Binary files a/tests/regression/opencsgtest/example010-expected.png and b/tests/regression/opencsgtest/example010-expected.png differ
diff --git a/tests/regression/opencsgtest/example015-expected.png b/tests/regression/opencsgtest/example015-expected.png
index 1a1c869..78ec3d7 100644
Binary files a/tests/regression/opencsgtest/example015-expected.png and b/tests/regression/opencsgtest/example015-expected.png differ
diff --git a/tests/regression/opencsgtest/example021-expected.png b/tests/regression/opencsgtest/example021-expected.png
index 675e57b..bf3a281 100644
Binary files a/tests/regression/opencsgtest/example021-expected.png and b/tests/regression/opencsgtest/example021-expected.png differ
diff --git a/tests/regression/throwntogethertest/example010-expected.png b/tests/regression/throwntogethertest/example010-expected.png
index 854eea8..87271eb 100644
Binary files a/tests/regression/throwntogethertest/example010-expected.png and b/tests/regression/throwntogethertest/example010-expected.png differ
diff --git a/tests/regression/throwntogethertest/example014-expected.png b/tests/regression/throwntogethertest/example014-expected.png
index 562ce74..4721663 100644
Binary files a/tests/regression/throwntogethertest/example014-expected.png and b/tests/regression/throwntogethertest/example014-expected.png differ
diff --git a/tests/regression/throwntogethertest/example015-expected.png b/tests/regression/throwntogethertest/example015-expected.png
index 6e16e33..85374b5 100644
Binary files a/tests/regression/throwntogethertest/example015-expected.png and b/tests/regression/throwntogethertest/example015-expected.png differ
diff --git a/tests/regression/throwntogethertest/example021-expected.png b/tests/regression/throwntogethertest/example021-expected.png
index 1e1576c..cfe303a 100644
Binary files a/tests/regression/throwntogethertest/example021-expected.png and b/tests/regression/throwntogethertest/example021-expected.png differ
-- 
cgit v0.10.1


From bd2662a858eb74eb75307856cf89008e32a14782 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Wed, 28 Dec 2011 14:57:07 +0100
Subject: Change axis labels back to black


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);
-- 
cgit v0.10.1