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

fix some warnings during compile phase

This commit is contained in:
Walzer 2010-09-30 23:51:06 +00:00
parent b50f19e56b
commit b86a666269
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos2dx/platform/uphone/CCXUIImage_uphone.cpp
View File

@ -283,7 +283,7 @@ bool UIImage::loadPngFromStream(unsigned char *data, int nLength)
// init image info
m_imageInfo.isPremultipliedAlpha = true;
m_imageInfo.hasAlpha = info_ptr->color_type & PNG_COLOR_MASK_ALPHA;
m_imageInfo.hasAlpha = bool ( info_ptr->color_type & PNG_COLOR_MASK_ALPHA );
// allocate memory and read data
int bytesPerComponent = 3;
@ -300,7 +300,7 @@ bool UIImage::loadPngFromStream(unsigned char *data, int nLength)
unsigned int *tmp = (unsigned int *)m_imageInfo.data;
for(unsigned int i = 0; i < m_imageInfo.height; i++)
{
for(unsigned int j = 0; j < bytesPerRow; j += 4)
for(int j = 0; j < bytesPerRow; j += 4)
{
*tmp++ = CCX_RGB_PREMULTIPLY_APLHA( rowPointers[i][j], rowPointers[i][j + 1],
rowPointers[i][j + 2], rowPointers[i][j + 3] );
@ -332,7 +332,7 @@ bool UIImage::loadJpg(const char *strFileName)
FILE *infile = fopen( strFileName, "rb" );
unsigned long location = 0;
int i = 0;
unsigned int i = 0;
if ( !infile )
{

3
cocos2dx/support/opengl_support/glu.cpp
View File

@ -26,8 +26,7 @@ THE SOFTWARE.
#include "OpenGL_Internal.h"
#include <GLES/gl.h>
#define _USE_MATH_DEFINES
#include <math.h>
namespace cocos2d {