[Scummvm-cvs-logs] scummvm master -> fb05395dedfb3098c6b421352da2be3b6fa58db9

[wjp]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
fb05395ded OPENGL: Fix texture re-allocation check


Commit: fb05395dedfb3098c6b421352da2be3b6fa58db9
    https://github.com/scummvm/scummvm/commit/fb05395dedfb3098c6b421352da2be3b6fa58db9
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2013-11-20T12:49:07-08:00

Commit Message:
OPENGL: Fix texture re-allocation check

This fixes a crash when opening the menu in the SCI Laura Bow 2 intro.

Changed paths:
    backends/graphics/opengl/texture.cpp



diff --git a/backends/graphics/opengl/texture.cpp b/backends/graphics/opengl/texture.cpp
index 917bf70..8f17ed7 100644
--- a/backends/graphics/opengl/texture.cpp
+++ b/backends/graphics/opengl/texture.cpp
@@ -287,7 +287,7 @@ void TextureCLUT8::allocate(uint width, uint height) {
 
 	// We only need to reinitialize our CLUT8 surface when the output size
 	// changed.
-	if (width == _clut8Data.w && width == _clut8Data.h) {
+	if (width == _clut8Data.w && height == _clut8Data.h) {
 		return;
 	}