[ros-diffs] [reactos] 01/01: [GLU32] Sync with glu 9.0.1 (#2314)

[Masanori Ogino]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=695946a5cd46efa769006…

commit 695946a5cd46efa7690066fe35015ddcb5c1634f
Author:     Masanori Ogino <masanori.ogino(a)gmail.com>
AuthorDate: Sat Feb 8 02:07:56 2020 +0900
Commit:     GitHub <noreply(a)github.com>
CommitDate: Fri Feb 7 18:07:56 2020 +0100

    [GLU32] Sync with glu 9.0.1 (#2314)
---
 dll/opengl/glu32/src/libnurbs/internals/arctess.cc | 34 +++++++-------
 dll/opengl/glu32/src/libnurbs/internals/ccw.cc     | 54 +++++++++++-----------
 dll/opengl/glu32/src/libnurbs/internals/hull.cc    |  2 +-
 dll/opengl/glu32/src/libnurbs/internals/mapdesc.cc | 10 ++--
 dll/opengl/glu32/src/libnurbs/internals/mesher.cc  | 52 ++++++++++-----------
 .../glu32/src/libnurbs/internals/trimline.cc       |  8 ++--
 dll/opengl/glu32/src/libtess/priorityq.c           |  1 +
 dll/opengl/glu32/src/libutil/error.c               |  1 +
 dll/opengl/glu32/src/libutil/mipmap.c              |  2 +
 media/doc/3rd Party Files.txt                      |  4 +-
 10 files changed, 85 insertions(+), 83 deletions(-)

diff --git a/dll/opengl/glu32/src/libnurbs/internals/arctess.cc
b/dll/opengl/glu32/src/libnurbs/internals/arctess.cc
index 48de92c4ab6..e13c8edf034 100644
--- a/dll/opengl/glu32/src/libnurbs/internals/arctess.cc
+++ b/dll/opengl/glu32/src/libnurbs/internals/arctess.cc
@@ -381,13 +381,13 @@ ArcTessellator::tessellateNonlinear( Arc *arc, REAL geo_stepsize,
REAL arc_steps
 #ifndef NOELIMINATION
 	int ocanremove = 0;
 #endif
-    	register long order =  bezierArc->order;
+    	long order =  bezierArc->order;
 	for( step=1, ++vert; step<nsteps; step++, vert++ ) {
-	    register REAL p = dp * step;
-    	    register REAL u = pow_u[0];
-            register REAL v = pow_v[0];
-	    register REAL w = pow_w[0];
-	    for( register int i = 1; i < order; i++ ) {
+	    REAL p = dp * step;
+    	    REAL u = pow_u[0];
+            REAL v = pow_v[0];
+	    REAL w = pow_w[0];
+	    for( int i = 1; i < order; i++ ) {
 	        u = u * p + pow_u[i];
 	        v = v * p + pow_v[i];
 	        w = w * p + pow_w[i];
@@ -444,12 +444,12 @@ ArcTessellator::tessellateNonlinear( Arc *arc, REAL geo_stepsize,
REAL arc_steps
 #ifndef NOELIMINATION
 	int ocanremove = 0;
 #endif
-    	register long order =  bezierArc->order;
+    	long order =  bezierArc->order;
 	for( step=1, ++vert; step<nsteps; step++, vert++ ) {
-	    register REAL p = dp * step;
-	    register REAL u = pow_u[0];
-            register REAL v = pow_v[0];
-            for( register int i = 1; i < bezierArc->order; i++ ) {
+	    REAL p = dp * step;
+	    REAL u = pow_u[0];
+            REAL v = pow_v[0];
+            for( int i = 1; i < bezierArc->order; i++ ) {
 	        u = u * p + pow_u[i];
 	        v = v * p + pow_v[i];
             }
@@ -591,9 +591,9 @@ const REAL ArcTessellator::gl_Bernstein[][MAXORDER][MAXORDER] = {
 void
 ArcTessellator::trim_power_coeffs( BezierArc *bez_arc, REAL *p, int coord )
 {
-    register int stride = bez_arc->stride;
-    register int order = bez_arc->order;
-    register REAL *base = bez_arc->cpts + coord;
+    int stride = bez_arc->stride;
+    int order = bez_arc->order;
+    REAL *base = bez_arc->cpts + coord;
 
     REAL const (*mat)[MAXORDER][MAXORDER] = &gl_Bernstein[order-1];
     REAL const (*lrow)[MAXORDER] = &(*mat)[order];
@@ -601,9 +601,9 @@ ArcTessellator::trim_power_coeffs( BezierArc *bez_arc, REAL *p, int
coord )
     /* WIN32 didn't like the following line within the for-loop */
     REAL const (*row)[MAXORDER] =  &(*mat)[0];
     for( ; row != lrow; row++ ) {
-	register REAL s = 0.0;
-	register REAL *point = base;
-	register REAL const *mlast = *row + order;
+	REAL s = 0.0;
+	REAL *point = base;
+	REAL const *mlast = *row + order;
 	for( REAL const *m = *row; m != mlast; m++, point += stride ) 
 	    s += *(m) * (*point);
 	*(p++) = s;
diff --git a/dll/opengl/glu32/src/libnurbs/internals/ccw.cc
b/dll/opengl/glu32/src/libnurbs/internals/ccw.cc
index fcd85a427f6..f70cb3c5e71 100644
--- a/dll/opengl/glu32/src/libnurbs/internals/ccw.cc
+++ b/dll/opengl/glu32/src/libnurbs/internals/ccw.cc
@@ -56,12 +56,12 @@ Subdivider::bbox( TrimVertex *a, TrimVertex *b, TrimVertex *c, int p
)
 int
 Subdivider::ccwTurn_sr( Arc_ptr j1, Arc_ptr j2 ) // dir = 1
 {
-    register TrimVertex *v1	= &j1->pwlArc->pts[j1->pwlArc->npts-1];
-    register TrimVertex *v1last	= &j1->pwlArc->pts[0];
-    register TrimVertex *v2	= &j2->pwlArc->pts[0];
-    register TrimVertex *v2last	= &j2->pwlArc->pts[j2->pwlArc->npts-1];
-    register TrimVertex *v1next	= v1-1;
-    register TrimVertex *v2next	= v2+1;
+    TrimVertex *v1	= &j1->pwlArc->pts[j1->pwlArc->npts-1];
+    TrimVertex *v1last	= &j1->pwlArc->pts[0];
+    TrimVertex *v2	= &j2->pwlArc->pts[0];
+    TrimVertex *v2last	= &j2->pwlArc->pts[j2->pwlArc->npts-1];
+    TrimVertex *v1next	= v1-1;
+    TrimVertex *v2next	= v2+1;
     int sgn;
 
     assert( v1 != v1last );
@@ -169,12 +169,12 @@ Subdivider::ccwTurn_sr( Arc_ptr j1, Arc_ptr j2 ) // dir = 1
 int
 Subdivider::ccwTurn_sl( Arc_ptr j1, Arc_ptr j2 ) // dir = 0
 {
-    register TrimVertex *v1	= &j1->pwlArc->pts[j1->pwlArc->npts-1];
-    register TrimVertex *v1last	= &j1->pwlArc->pts[0];
-    register TrimVertex *v2	= &j2->pwlArc->pts[0];
-    register TrimVertex *v2last	= &j2->pwlArc->pts[j2->pwlArc->npts-1];
-    register TrimVertex *v1next	= v1-1;
-    register TrimVertex *v2next	= v2+1;
+    TrimVertex *v1	= &j1->pwlArc->pts[j1->pwlArc->npts-1];
+    TrimVertex *v1last	= &j1->pwlArc->pts[0];
+    TrimVertex *v2	= &j2->pwlArc->pts[0];
+    TrimVertex *v2last	= &j2->pwlArc->pts[j2->pwlArc->npts-1];
+    TrimVertex *v1next	= v1-1;
+    TrimVertex *v2next	= v2+1;
     int sgn;
 
     assert( v1 != v1last );
@@ -282,12 +282,12 @@ Subdivider::ccwTurn_sl( Arc_ptr j1, Arc_ptr j2 ) // dir = 0
 int
 Subdivider::ccwTurn_tr( Arc_ptr j1, Arc_ptr j2 ) // dir = 1
 {
-    register TrimVertex *v1	= &j1->pwlArc->pts[j1->pwlArc->npts-1];
-    register TrimVertex *v1last	= &j1->pwlArc->pts[0];
-    register TrimVertex *v2	= &j2->pwlArc->pts[0];
-    register TrimVertex *v2last	= &j2->pwlArc->pts[j2->pwlArc->npts-1];
-    register TrimVertex *v1next	= v1-1;
-    register TrimVertex *v2next	= v2+1;
+    TrimVertex *v1	= &j1->pwlArc->pts[j1->pwlArc->npts-1];
+    TrimVertex *v1last	= &j1->pwlArc->pts[0];
+    TrimVertex *v2	= &j2->pwlArc->pts[0];
+    TrimVertex *v2last	= &j2->pwlArc->pts[j2->pwlArc->npts-1];
+    TrimVertex *v1next	= v1-1;
+    TrimVertex *v2next	= v2+1;
     int sgn;
 
     assert( v1 != v1last );
@@ -395,12 +395,12 @@ Subdivider::ccwTurn_tr( Arc_ptr j1, Arc_ptr j2 ) // dir = 1
 int
 Subdivider::ccwTurn_tl( Arc_ptr j1, Arc_ptr j2 )
 {
-    register TrimVertex *v1	= &j1->pwlArc->pts[j1->pwlArc->npts-1];
-    register TrimVertex *v1last	= &j1->pwlArc->pts[0];
-    register TrimVertex *v2	= &j2->pwlArc->pts[0];
-    register TrimVertex *v2last	= &j2->pwlArc->pts[j2->pwlArc->npts-1];
-    register TrimVertex *v1next	= v1-1;
-    register TrimVertex *v2next	= v2+1;
+    TrimVertex *v1	= &j1->pwlArc->pts[j1->pwlArc->npts-1];
+    TrimVertex *v1last	= &j1->pwlArc->pts[0];
+    TrimVertex *v2	= &j2->pwlArc->pts[0];
+    TrimVertex *v2last	= &j2->pwlArc->pts[j2->pwlArc->npts-1];
+    TrimVertex *v1next	= v1-1;
+    TrimVertex *v2next	= v2+1;
     int sgn;
 
     assert( v1 != v1last );
@@ -508,12 +508,10 @@ Subdivider::ccwTurn_tl( Arc_ptr j1, Arc_ptr j2 )
 
 #ifndef NDEBUG
 int
-Subdivider::bbox( register REAL sa, register REAL sb, register REAL sc,
-      register REAL ta, register REAL tb, register REAL tc )
+Subdivider::bbox( REAL sa, REAL sb, REAL sc, REAL ta, REAL tb, REAL tc )
 #else
 int
-Subdivider::bbox( register REAL sa, register REAL sb, register REAL sc,
-      register REAL   , register REAL   , register REAL    )
+Subdivider::bbox( REAL sa, REAL sb, REAL sc, REAL   , REAL   , REAL    )
 #endif
 {
 #ifndef NDEBUG
diff --git a/dll/opengl/glu32/src/libnurbs/internals/hull.cc
b/dll/opengl/glu32/src/libnurbs/internals/hull.cc
index 16eb0c03f17..b307abef1a6 100644
--- a/dll/opengl/glu32/src/libnurbs/internals/hull.cc
+++ b/dll/opengl/glu32/src/libnurbs/internals/hull.cc
@@ -139,7 +139,7 @@ Hull::nextupper( GridTrimVertex *gv )
 }
 
 GridTrimVertex *
-Hull::nextlower( register GridTrimVertex *gv )
+Hull::nextlower( GridTrimVertex *gv )
 {
     if( lower.left ) {
 	gv->set( lower.left->next() );
diff --git a/dll/opengl/glu32/src/libnurbs/internals/mapdesc.cc
b/dll/opengl/glu32/src/libnurbs/internals/mapdesc.cc
index 99c4995f07e..977ec72dbaa 100644
--- a/dll/opengl/glu32/src/libnurbs/internals/mapdesc.cc
+++ b/dll/opengl/glu32/src/libnurbs/internals/mapdesc.cc
@@ -156,7 +156,7 @@ Mapdesc::copyPt( REAL *d, REAL *s )
  *--------------------------------------------------------------------------
  */
 void
-Mapdesc::sumPt( REAL *dst, REAL *src1, REAL *src2, register REAL alpha, register REAL
beta )
+Mapdesc::sumPt( REAL *dst, REAL *src1, REAL *src2, REAL alpha, REAL beta )
 {
     assert( hcoords > 0 );
     switch( hcoords  ) {
@@ -204,10 +204,10 @@ Mapdesc::clipbits( REAL *p )
     assert( inhcoords >= 0 );
     assert( inhcoords <= 3 );
 
-    register int nc = inhcoords;
-    register REAL pw = p[nc];
-    register REAL nw = -pw;
-    register unsigned int bits = 0;
+    int nc = inhcoords;
+    REAL pw = p[nc];
+    REAL nw = -pw;
+    unsigned int bits = 0;
 
     if( pw == 0.0 ) return mask;
 
diff --git a/dll/opengl/glu32/src/libnurbs/internals/mesher.cc
b/dll/opengl/glu32/src/libnurbs/internals/mesher.cc
index 3b4c0f00c94..c83c904ec4f 100644
--- a/dll/opengl/glu32/src/libnurbs/internals/mesher.cc
+++ b/dll/opengl/glu32/src/libnurbs/internals/mesher.cc
@@ -276,13 +276,13 @@ Mesher::output( int x )
 void
 Mesher::addLast( )
 {
-    register int ilast = itop;
+    int ilast = itop;
 
     if( lastedge == 0 ) {
 	if( equal( 0, 1 ) ) {
 	    output( ilast );
 	    swapMesh();
-	    for( register int i = 2; i < ilast; i++ ) {
+	    for( int i = 2; i < ilast; i++ ) {
 		swapMesh();
 		output( i );
 	    }
@@ -290,7 +290,7 @@ Mesher::addLast( )
 	} else if( equal( ilast-2, ilast-1) ) {
 	    swapMesh();
 	    output( ilast );
-	    for( register int i = ilast-3; i >= 0; i-- ) {
+	    for( int i = ilast-3; i >= 0; i-- ) {
 		output( i );
 		swapMesh();
 	    }
@@ -299,7 +299,7 @@ Mesher::addLast( )
 	    closeMesh();	openMesh();
 	    output( ilast );
 	    output( 0 );
-	    for( register int i = 1; i < ilast; i++ ) {
+	    for( int i = 1; i < ilast; i++ ) {
 		swapMesh();
 		output( i );
 	    }
@@ -309,7 +309,7 @@ Mesher::addLast( )
 	if( equal( 1, 0) ) {
 	    swapMesh();
 	    output( ilast );
-	    for( register int i = 2; i < ilast; i++ ) {
+	    for( int i = 2; i < ilast; i++ ) {
 		output( i );
 		swapMesh();
 	    }
@@ -317,7 +317,7 @@ Mesher::addLast( )
 	} else if( equal( ilast-1, ilast-2) ) {
 	    output( ilast );
 	    swapMesh();
-	    for( register int i = ilast-3; i >= 0; i-- ) {
+	    for( int i = ilast-3; i >= 0; i-- ) {
 		swapMesh();
 		output( i );
 	    }
@@ -326,7 +326,7 @@ Mesher::addLast( )
 	    closeMesh();	openMesh();
 	    output( 0 );
 	    output( ilast );
-	    for( register int i = 1; i < ilast; i++ ) {
+	    for( int i = 1; i < ilast; i++ ) {
 		output( i );
 		swapMesh();
 	    }
@@ -334,19 +334,19 @@ Mesher::addLast( )
 	}
     }
     closeMesh();
-    //for( register long k=0; k<=ilast; k++ ) pop( k );
+    //for( long k=0; k<=ilast; k++ ) pop( k );
 }
 
 void
 Mesher::addUpper( )
 {
-    register int ilast = itop;
+    int ilast = itop;
 
     if( lastedge == 0 ) {
 	if( equal( 0, 1 ) ) {
 	    output( ilast );
 	    swapMesh();
-	    for( register int i = 2; i < ilast; i++ ) {
+	    for( int i = 2; i < ilast; i++ ) {
 		swapMesh();
 		output( i );
 	    }
@@ -354,7 +354,7 @@ Mesher::addUpper( )
 	} else if( equal( ilast-2, ilast-1) ) {
 	    swapMesh();
 	    output( ilast );
-	    for( register int i = ilast-3; i >= 0; i-- ) {
+	    for( int i = ilast-3; i >= 0; i-- ) {
 		output( i );
 		swapMesh();
 	    }
@@ -363,14 +363,14 @@ Mesher::addUpper( )
 	    closeMesh();	openMesh();
 	    output( ilast );
 	    output( 0 );
-	    for( register int i = 1; i < ilast; i++ ) {
+	    for( int i = 1; i < ilast; i++ ) {
 		swapMesh();
 		output( i );
 	    }
 	    copy( ilast, ilast-1 );
 	}
 	lastedge = 1;
-        //for( register long k=0; k<ilast-1; k++ ) pop( k );
+        //for( long k=0; k<ilast-1; k++ ) pop( k );
 	move( 0, ilast-1 );
 	move( 1, ilast );
 	itop = 1;
@@ -383,7 +383,7 @@ Mesher::addUpper( )
 	if( equal( ilast-1, ilast-2 ) ) {
 	    output( ilast );
 	    swapMesh();
-	    for( register int i=ilast-3; i>=itop-1; i-- ) {
+	    for( int i=ilast-3; i>=itop-1; i-- ) {
 		swapMesh();
 		output( i );
 	    }
@@ -391,7 +391,7 @@ Mesher::addUpper( )
 	} else if( equal( itop, itop-1 ) ) {
 	    swapMesh();
 	    output( ilast );
-	    for( register int i = itop+1; i < ilast; i++ ) {
+	    for( int i = itop+1; i < ilast; i++ ) {
 		output( i );
 		swapMesh();
 	    }
@@ -400,13 +400,13 @@ Mesher::addUpper( )
 	    closeMesh();	openMesh();
 	    output( ilast );
 	    output( ilast-1 );
-	    for( register int i=ilast-2; i>=itop-1; i-- ) {
+	    for( int i=ilast-2; i>=itop-1; i-- ) {
 		swapMesh();
 		output( i );
 	    } 
 	    copy( ilast, itop-1 );
 	}
-        //for( register int k=itop; k<ilast; k++ ) pop( k );
+        //for( int k=itop; k<ilast; k++ ) pop( k );
 	move( itop, ilast );
     }
 }
@@ -414,13 +414,13 @@ Mesher::addUpper( )
 void
 Mesher::addLower()
 {
-    register int ilast = itop;
+    int ilast = itop;
 
     if( lastedge == 1 ) {
 	if( equal( 1, 0) ) {
 	    swapMesh();
 	    output( ilast );
-	    for( register int i = 2; i < ilast; i++ ) {
+	    for( int i = 2; i < ilast; i++ ) {
 		output( i );
 		swapMesh();
 	    }
@@ -428,7 +428,7 @@ Mesher::addLower()
 	} else if( equal( ilast-1, ilast-2) ) {
 	    output( ilast );
 	    swapMesh();
-	    for( register int i = ilast-3; i >= 0; i-- ) {
+	    for( int i = ilast-3; i >= 0; i-- ) {
 		swapMesh();
 		output( i );
 	    }
@@ -437,7 +437,7 @@ Mesher::addLower()
 	    closeMesh();	openMesh();
 	    output( 0 );
 	    output( ilast );
-	    for( register int i = 1; i < ilast; i++ ) {
+	    for( int i = 1; i < ilast; i++ ) {
 		output( i );
 		swapMesh();
 	    }
@@ -445,7 +445,7 @@ Mesher::addLower()
 	}
 
 	lastedge = 0;
-        //for( register long k=0; k<ilast-1; k++ ) pop( k );
+        //for( long k=0; k<ilast-1; k++ ) pop( k );
 	move( 0, ilast-1 );
 	move( 1, ilast );
 	itop = 1;
@@ -458,7 +458,7 @@ Mesher::addLower()
 	if( equal( ilast-2, ilast-1) ) {
 	    swapMesh();
 	    output( ilast );
-	    for( register int i=ilast-3; i>=itop-1; i--) {
+	    for( int i=ilast-3; i>=itop-1; i--) {
 		output( i );
 		swapMesh( );
 	    }
@@ -466,7 +466,7 @@ Mesher::addLower()
 	} else if( equal( itop-1, itop) ) {
 	    output( ilast );
 	    swapMesh();
-	    for( register int i=itop+1; i<ilast; i++ ) {
+	    for( int i=itop+1; i<ilast; i++ ) {
 		swapMesh( );
 		output( i );
 	    }
@@ -475,13 +475,13 @@ Mesher::addLower()
 	    closeMesh();	openMesh();
 	    output( ilast-1 );
 	    output( ilast );
-	    for( register int i=ilast-2; i>=itop-1; i-- ) {
+	    for( int i=ilast-2; i>=itop-1; i-- ) {
 		output( i );
 		swapMesh( );
 	    }
 	    copy( itop-1, ilast );
 	}
-        //for( register int k=itop; k<ilast; k++ ) pop( k );
+        //for( int k=itop; k<ilast; k++ ) pop( k );
 	move( itop, ilast );
     }
 }
diff --git a/dll/opengl/glu32/src/libnurbs/internals/trimline.cc
b/dll/opengl/glu32/src/libnurbs/internals/trimline.cc
index 26948b2bcca..be6004a6f93 100644
--- a/dll/opengl/glu32/src/libnurbs/internals/trimline.cc
+++ b/dll/opengl/glu32/src/libnurbs/internals/trimline.cc
@@ -117,7 +117,7 @@ Trimline::getNextPts( REAL vval, Backend& backend )
     reset(); swap(); append( tinterp );
     assert( tinterp->param[1] >= vval );
 
-    register TrimVertex *p;
+    TrimVertex *p;
     for( p=jarcl.getnextpt() ; p->param[1] >= vval; p=jarcl.getnextpt() ) {
 	append( p ); 
     }
@@ -139,7 +139,7 @@ Trimline::getPrevPts( REAL vval, Backend& backend )
     reset(); swap(); append( tinterp );
     assert( tinterp->param[1] >= vval );
 
-    register TrimVertex *q;
+    TrimVertex *q;
     for( q=jarcl.getprevpt(); q->param[1] >= vval; q=jarcl.getprevpt() ) {
 	append( q );
     }
@@ -165,7 +165,7 @@ Trimline::getNextPts( Arc_ptr botarc )
     TrimVertex *lastpt1 = &lastpwl->pts[lastpwl->npts-1];
 #endif
     TrimVertex *lastpt2 = botarc->pwlArc->pts;
-    register TrimVertex *p = jarcl.getnextpt();
+    TrimVertex *p = jarcl.getnextpt();
     for( append( p ); p != lastpt2; append( p ) ) {
 	assert( p != lastpt1 );
 	p = jarcl.getnextpt();
@@ -183,7 +183,7 @@ Trimline::getPrevPts( Arc_ptr botarc )
     TrimVertex *lastpt2 = botarc->pwlArc->pts;
 #endif
 
-    register TrimVertex *q =  jarcl.getprevpt();
+    TrimVertex *q =  jarcl.getprevpt();
     for( append( q ); q != lastpt1; append( q ) ) {
 	assert( q != lastpt2 );
 	q = jarcl.getprevpt();
diff --git a/dll/opengl/glu32/src/libtess/priorityq.c
b/dll/opengl/glu32/src/libtess/priorityq.c
index a03c007bbe6..cebde24e741 100644
--- a/dll/opengl/glu32/src/libtess/priorityq.c
+++ b/dll/opengl/glu32/src/libtess/priorityq.c
@@ -65,6 +65,7 @@ PriorityQ *pqNewPriorityQ( int (*leq)(PQkey key1, PQkey key2) )
      return NULL;
   }
 
+  pq->order = NULL;
   pq->size = 0;
   pq->max = INIT_SIZE;
   pq->initialized = FALSE;
diff --git a/dll/opengl/glu32/src/libutil/error.c b/dll/opengl/glu32/src/libutil/error.c
index 7212748450d..d3b26663cf5 100644
--- a/dll/opengl/glu32/src/libutil/error.c
+++ b/dll/opengl/glu32/src/libutil/error.c
@@ -30,6 +30,7 @@
 
 #include "gluos.h"
 #include "gluint.h"
+#include <stddef.h>
 #include <GL/glu.h>
 
 
diff --git a/dll/opengl/glu32/src/libutil/mipmap.c
b/dll/opengl/glu32/src/libutil/mipmap.c
index 29dce0c1119..59a3c350540 100644
--- a/dll/opengl/glu32/src/libutil/mipmap.c
+++ b/dll/opengl/glu32/src/libutil/mipmap.c
@@ -4509,6 +4509,8 @@ static int gluBuild2DMipmapLevelsCore(GLenum target, GLint
internalFormat,
 	     glPixelStorei(GL_UNPACK_SKIP_PIXELS, psm.unpack_skip_pixels);
 	     glPixelStorei(GL_UNPACK_ROW_LENGTH, psm.unpack_row_length);
 	     glPixelStorei(GL_UNPACK_SWAP_BYTES, psm.unpack_swap_bytes);
+	     free(srcImage);
+	     free(dstImage);
 	     return GLU_OUT_OF_MEMORY;
 	  }
 
diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt
index 5868eb95bbe..b67e5f03735 100644
--- a/media/doc/3rd Party Files.txt	
+++ b/media/doc/3rd Party Files.txt	
@@ -31,8 +31,8 @@ Used Version: 8.0.4
 Website: http://www.mesa3d.org
 
 Title: Mesa3D glu libary
-Used Version: 9.0
-Website: ftp://ftp.freedesktop.org/pub/mesa/glu/
+Used Version: 9.0.1
+Website: https://gitlab.freedesktop.org/mesa/glu |
ftp://ftp.freedesktop.org/pub/mesa/glu/
 
 Title: GNU adns
 Used Version: 1.0 REV 5