[3depict] 01/01: * Fix minor nitpicks

[D Haley]

This is an automated email from the git hooks/post-receive script.

mycae-guest pushed a commit to branch master
in repository 3depict.

commit 8876aa2c12180a3dd9f9ec7531373df0a5cdb108
Author: D Haley <mycae at gmx.com>
Date:   Sat Feb 15 18:18:18 2014 +0100

    * Fix minor nitpicks
---
 debian/control                       |  6 +++---
 debian/patches/fix-mgl-overlay-title |  4 ++++
 src/backend/plot.cpp                 | 11 ++---------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/debian/control b/debian/control
index 76653d4..86e3834 100644
--- a/debian/control
+++ b/debian/control
@@ -4,10 +4,10 @@ Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: D Haley <mycae at gmx.com>
 Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), libgl1-mesa-dev | libgl-dev, libpng-dev | libpng15-dev, libqhull-dev, libwxgtk2.8-dev, libftgl-dev, libxml2-dev, libmgl-dev (>= 2.0)
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://threedepict.sourceforge.net/index.html
-Vcs-Git: git://git.debian.org/debian-science/packages/3depict.git
-Vcs-Browser: http://git.debian.org/?p=debian-science/packages/3depict.git
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/3depict.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/3depict.git
 
 
 Package: 3depict
diff --git a/debian/patches/fix-mgl-overlay-title b/debian/patches/fix-mgl-overlay-title
index 39c017c..36e9d1c 100644
--- a/debian/patches/fix-mgl-overlay-title
+++ b/debian/patches/fix-mgl-overlay-title
@@ -1,3 +1,7 @@
+Description: Upstream patch for showing mathgl stick overlays in plots
+Forwarded: not-needed
+Author: D Haley <mycae - gmx - com>
+
 Index: 3depict-0.0.15/src/backend/plot.cpp
 ===================================================================
 --- 3depict-0.0.15.orig/src/backend/plot.cpp	2013-12-08 13:55:53.000000000 +0100
diff --git a/src/backend/plot.cpp b/src/backend/plot.cpp
index 017878c..bd49a67 100644
--- a/src/backend/plot.cpp
+++ b/src/backend/plot.cpp
@@ -1852,17 +1852,10 @@ void PlotOverlays::draw(mglGraph *gr,MGLColourFixer &fixer,
 				gr->Line (mglPoint(bufX[uj],std::max(0.0f,(float)boundMin.y)),
 					mglPoint(bufX[uj],bufY[uj]),colourCode,100);
 
-				//Print labels near to the text
-				const float STANDOFF_FACTOR=1.05;
-#ifdef USE_MGL2
-				gr->Text(mglData(bufX[uj]),mglData(bufY[uj]*STANDOFF_FACTOR),
+				const float STANDOFF_FACTOR=1.05f;
+				gr->Puts(mglPoint(bufX[uj],bufY[uj]*STANDOFF_FACTOR),
 					overlayData[ui].title.c_str());
-#else
-				//Font size in mathgl uses negative values to set a relative font size
-				gr->Text(mglPoint(bufX[uj],bufY[uj]*STANDOFF_FACTOR),
-					overlayData[ui].title.c_str(),"",-0.6);
 
-#endif
 			}
 		}
 	}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/3depict.git