From 9e7ce0cd852e39f7464690ffc3cd00d8084d3634 Mon Sep 17 00:00:00 2001
From: mogemimi <mogemimi@enginetrouble.net>
Date: Tue, 24 Feb 2015 02:36:20 +0900
Subject: [PATCH 1/2] Fix typo in Image::Format

---
 cocos/platform/CCImage.cpp | 4 ++--
 cocos/platform/CCImage.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cocos/platform/CCImage.cpp b/cocos/platform/CCImage.cpp
index 4ca9706e18..5d8f86e89a 100644
--- a/cocos/platform/CCImage.cpp
+++ b/cocos/platform/CCImage.cpp
@@ -457,7 +457,7 @@ Image::Image()
 , _width(0)
 , _height(0)
 , _unpack(false)
-, _fileType(Format::UNKOWN)
+, _fileType(Format::UNKNOWN)
 , _renderFormat(Texture2D::PixelFormat::NONE)
 , _numberOfMipmaps(0)
 , _hasPremultipliedAlpha(true)
@@ -742,7 +742,7 @@ Image::Format Image::detectFormat(const unsigned char * data, ssize_t dataLen)
     }
     else
     {
-        return Format::UNKOWN;
+        return Format::UNKNOWN;
     }
 }
 
diff --git a/cocos/platform/CCImage.h b/cocos/platform/CCImage.h
index 483ea686ff..c2883c1cbf 100644
--- a/cocos/platform/CCImage.h
+++ b/cocos/platform/CCImage.h
@@ -92,7 +92,7 @@ public:
         //! Raw Data
         RAW_DATA,
         //! Unknown format
-        UNKOWN
+        UNKNOWN
     };
 
     /**

From d384f7ce1eac880419d7f22776b8c2a76fc9daf3 Mon Sep 17 00:00:00 2001
From: mogemimi <mogemimi@enginetrouble.net>
Date: Tue, 24 Feb 2015 02:39:50 +0900
Subject: [PATCH 2/2] Fix typo: unkown -> unknown

---
 cocos/editor-support/cocosbuilder/CCBAnimationManager.cpp | 2 +-
 cocos/network/HttpClient-android.cpp                      | 2 +-
 cocos/network/HttpClient-ios.mm                           | 2 +-
 cocos/network/HttpClient.cpp                              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cocos/editor-support/cocosbuilder/CCBAnimationManager.cpp b/cocos/editor-support/cocosbuilder/CCBAnimationManager.cpp
index 5ecd070692..9b80686720 100644
--- a/cocos/editor-support/cocosbuilder/CCBAnimationManager.cpp
+++ b/cocos/editor-support/cocosbuilder/CCBAnimationManager.cpp
@@ -609,7 +609,7 @@ ActionInterval* CCBAnimationManager::getEaseAction(ActionInterval *pAction, CCBK
     }
     else
     {
-        log("CCBReader: Unkown easing type %d", static_cast<int>(easingType));
+        log("CCBReader: Unknown easing type %d", static_cast<int>(easingType));
         return pAction;
     }
 }
diff --git a/cocos/network/HttpClient-android.cpp b/cocos/network/HttpClient-android.cpp
index ea81d79279..1da0d7495f 100644
--- a/cocos/network/HttpClient-android.cpp
+++ b/cocos/network/HttpClient-android.cpp
@@ -646,7 +646,7 @@ static void processResponse(HttpResponse* response, std::string& responseMessage
         HttpRequest::Type::PUT != requestType &&
         HttpRequest::Type::DELETE != requestType)
     {
-        CCASSERT(true, "CCHttpClient: unkown request type, only GET、POST、PUT、DELETE are supported");
+        CCASSERT(true, "CCHttpClient: unknown request type, only GET、POST、PUT、DELETE are supported");
         return;
     }
 
diff --git a/cocos/network/HttpClient-ios.mm b/cocos/network/HttpClient-ios.mm
index 9a63e5e265..9ece23504d 100644
--- a/cocos/network/HttpClient-ios.mm
+++ b/cocos/network/HttpClient-ios.mm
@@ -335,7 +335,7 @@ static void processResponse(HttpResponse* response, char* errorBuffer)
         break;
 
     default:
-        CCASSERT(true, "CCHttpClient: unkown request type, only GET and POSt are supported");
+        CCASSERT(true, "CCHttpClient: unknown request type, only GET and POSt are supported");
         break;
     }
     
diff --git a/cocos/network/HttpClient.cpp b/cocos/network/HttpClient.cpp
index 88e4478665..9694cf7bc2 100644
--- a/cocos/network/HttpClient.cpp
+++ b/cocos/network/HttpClient.cpp
@@ -405,7 +405,7 @@ static void processResponse(HttpResponse* response, char* errorBuffer)
         break;
 
     default:
-        CCASSERT(true, "CCHttpClient: unkown request type, only GET and POSt are supported");
+        CCASSERT(true, "CCHttpClient: unknown request type, only GET and POSt are supported");
         break;
     }