[SCM] UNNAMED PROJECT branch, master, updated. ac8a1e43ef507df02310bb55be546bf74c935271

[D Haley]

The following commit has been merged in the master branch:
commit ac8a1e43ef507df02310bb55be546bf74c935271
Author: D Haley <mycae at yahoo.com>
Date:   Mon Jul 26 17:14:33 2010 +1000

    * Import patches from upstream SVN to fix major bugs
    	- Bad SVG output
    	- large memleak for all C++ graphs

diff --git a/debian/patches/series b/debian/patches/series
index 1e69804..599d111 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@
 examples-ldflags.patch
 mglview-ldflags.patch
 parallel-build-png.patch
+upstream-svg-namespace.patch
+upstream-mgl-memleak.patch
diff --git a/debian/patches/upstream-mgl-memleak.patch b/debian/patches/upstream-mgl-memleak.patch
new file mode 100644
index 0000000..c4052cd
--- /dev/null
+++ b/debian/patches/upstream-mgl-memleak.patch
@@ -0,0 +1,23 @@
+* import upstream SVN patch (r106) to fix large memleak in C++ graph object
+Index: mathgl-1.10.2.1/mgl/mgl_ab.cpp
+===================================================================
+--- mathgl-1.10.2.1.orig/mgl/mgl_ab.cpp	2010-07-26 17:12:49.000000000 +1000
++++ mathgl-1.10.2.1/mgl/mgl_ab.cpp	2010-07-26 17:13:04.000000000 +1000
+@@ -44,7 +44,7 @@
+ }
+ //-----------------------------------------------------------------------------
+ mglGraphAB::~mglGraphAB()
+-{	if(G)	{	delete []G;	delete []G4;	}	}
++{	if(G)	{	delete []G;	delete []G4;	delete []OI;	}	}
+ //-----------------------------------------------------------------------------
+ void mglGraphAB::Pop()
+ {
+@@ -370,7 +370,7 @@
+ 	if(font && strchr(font, 'a'))	{	Labelw(p.x, p.y, wcs,font,size,true);	return;	}
+ 
+ 	wchar_t *wcl;
+-	int wn=0;
++	unsigned wn=0;
+ 	const wchar_t *wnl=0;
+ 	for(wn=0;wn<wcslen(wcs);wn++)
+ 		if(wcs[wn]=='\n' || (wcs[wn]=='\\' && wcs[wn+1]=='n'))
diff --git a/debian/patches/upstream-svg-namespace.patch b/debian/patches/upstream-svg-namespace.patch
new file mode 100644
index 0000000..b05829d
--- /dev/null
+++ b/debian/patches/upstream-svg-namespace.patch
@@ -0,0 +1,14 @@
+Import upstream patch for SVG namespace (r 97)
+Index: mathgl-1.10.2.1/mgl/mgl_eps.cpp
+===================================================================
+--- mathgl-1.10.2.1.orig/mgl/mgl_eps.cpp	2010-07-26 17:10:06.000000000 +1000
++++ mathgl-1.10.2.1/mgl/mgl_eps.cpp	2010-07-26 17:10:16.000000000 +1000
+@@ -456,7 +456,7 @@
+ 	if(!fp)		{	SetWarn(mglWarnOpen,fname);	return;	}
+ 	fprintf(fp,"<?xml version=\"1.0\" standalone=\"no\"?>\n");
+ 	fprintf(fp,"<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 20000303 Stylable//EN\" \"http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd\">\n");
+-	fprintf(fp,"<svg width=\"%d\" height=\"%d\">\n",Width,Height);
++	fprintf(fp,"<svg width=\"%d\" height=\"%d\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\">\n",Width,Height);
+ 
+ 	fprintf(fp,"<!--Creator: MathGL library-->\n");
+ 	fprintf(fp,"<!--Title: %s-->\n<!--CreationDate: %s-->\n\n",descr?descr:fname,ctime(&now));

-- 
UNNAMED PROJECT