From 7a9b4172487344b4862128266838f09573878101 Mon Sep 17 00:00:00 2001
From: Ming <ming@cocos2d-x.org>
Date: Mon, 11 Oct 2010 10:05:34 +0000
Subject: [PATCH]

---
 cocos2dx/include/CCRibbon.h          | 2 +-
 cocos2dx/textures/CCTextureCache.cpp | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/cocos2dx/include/CCRibbon.h b/cocos2dx/include/CCRibbon.h
index 1de2cc7101..560d749b68 100644
--- a/cocos2dx/include/CCRibbon.h
+++ b/cocos2dx/include/CCRibbon.h
@@ -23,7 +23,7 @@ THE SOFTWARE.
 ****************************************************************************/
 #ifndef __CCRIBBON_H__
 #define __CCRIBBON_H__
-#include <gles/egl.h>
+#include <GLES/egl.h>
 #include "CCNode.h"
 #include "CCProtocols.h"
 namespace cocos2d {
diff --git a/cocos2dx/textures/CCTextureCache.cpp b/cocos2dx/textures/CCTextureCache.cpp
index ba6d45d2c8..4f8df2e145 100644
--- a/cocos2dx/textures/CCTextureCache.cpp
+++ b/cocos2dx/textures/CCTextureCache.cpp
@@ -210,6 +210,7 @@ CCTexture2D * CCTextureCache::addImage(const char * path)
 			if(! image->initWithContentsOfFile(fullpath, kImageFormatJPG))
 			{
 				delete image;
+				m_pDictLock->unlock();
 				return NULL;
 			}
 			texture = new CCTexture2D();
@@ -238,6 +239,7 @@ CCTexture2D * CCTextureCache::addImage(const char * path)
 			if(! image->initWithContentsOfFile(fullpath, kImageFormatPNG))
 			{
 				delete image;
+				m_pDictLock->unlock();
 				return NULL;
 			}
 			texture = new CCTexture2D();