mesa: Branch 'master' - 2 commits

[Brian Paul]

 src/mesa/main/mipmap.c |    3 +++
 1 files changed, 3 insertions(+)

New commits:
diff-tree 5b8a50572d3de2b9801be904c7403fc79061d090 (from parents)
Merge: d0b5c77c68f45f9da5421248a064ece831923b0c 4b3679c6c5b8b47e8071a253bcea570b91e30b17
Author: Brian <brian at yutani.localnet.net>
Date:   Mon Feb 5 10:29:58 2007 -0700

    Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa

diff-tree d0b5c77c68f45f9da5421248a064ece831923b0c (from eab92fcdc23a8a9d333227e4c98e6a33a9cc1183)
Author: Panagiotis Papadakos <papadako at csd.uoc.gr>
Date:   Mon Feb 5 10:29:10 2007 -0700

    fix mem leak

diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index f154bd4..cc1fb97 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -928,6 +928,9 @@ _mesa_generate_mipmap(GLcontext *ctx, GL
          return;
       }
 
+      if (dstImage->ImageOffsets)
+         _mesa_free(dstImage->ImageOffsets);
+
       /* Free old image data */
       if (dstImage->Data)
          ctx->Driver.FreeTexImageData(ctx, dstImage);