Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10549 from mogemimi/fix-typo 

Fix typo in Image::Format
This commit is contained in:
minggo 2015-02-25 09:32:58 +08:00
parent c460a5bfa4 d384f7ce1e
commit c2479adc59
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/editor-support/cocosbuilder/CCBAnimationManager.cpp
View File

@ -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;
}
}

2
cocos/network/HttpClient-android.cpp
View File

@ -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;
}

2
cocos/network/HttpClient-ios.mm
View File

@ -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;
}

2
cocos/network/HttpClient.cpp
View File

@ -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;
}

4
cocos/platform/CCImage.cpp
View File

@ -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;
}
}

2
cocos/platform/CCImage.h
View File

@ -92,7 +92,7 @@ public:
//! Raw Data
RAW_DATA,
//! Unknown format
UNKOWN
UNKNOWN
};
/**