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

Merge pull request #4489 from pyrasis/android_shadowstroke 

fix CCImage bug on android platform.
This commit is contained in:
minggo 2013-12-15 22:31:18 -08:00
parent 80b2a237a4 2807e785c0
commit eb883f735b
1 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
cocos/2d/platform/android/CCImage.cpp
View File

@ -35,9 +35,6 @@ THE SOFTWARE.
#include <string.h> #include <string.h>
#include <jni.h> #include <jni.h>
// prototype
void swapAlphaChannel(unsigned int *pImageMemory, unsigned int numPixels);
NS_CC_BEGIN NS_CC_BEGIN
class BitmapDC class BitmapDC
@ -129,12 +126,6 @@ public:
return getBitmapFromJavaShadowStroke( text, nWidth, nHeight, eAlignMask, pFontName, fontSize ); return getBitmapFromJavaShadowStroke( text, nWidth, nHeight, eAlignMask, pFontName, fontSize );
} }
// ARGB -> RGBA
inline unsigned int swapAlpha(unsigned int value)
{
return ((value << 8 & 0xffffff00) | (value >> 24 & 0x000000ff));
}
public: public:
int _width; int _width;
int _height; int _height;
@ -228,9 +219,6 @@ bool Image::initWithStringShadowStroke(
_renderFormat = Texture2D::PixelFormat::RGBA8888; _renderFormat = Texture2D::PixelFormat::RGBA8888;
_dataLen = _width * _height * 4; _dataLen = _width * _height * 4;
// swap the alpha channel (ARGB to RGBA)
swapAlphaChannel((unsigned int *)_data, (_width * _height) );
// ok // ok
bRet = true; bRet = true;
@ -241,19 +229,6 @@ bool Image::initWithStringShadowStroke(
NS_CC_END NS_CC_END
// swap the alpha channel in an 32 bit image (from ARGB to RGBA)
void swapAlphaChannel(unsigned int *pImageMemory, unsigned int numPixels)
{
for(int c = 0; c < numPixels; ++c, ++pImageMemory)
{
// copy the current pixel
unsigned int currenPixel = (*pImageMemory);
// swap channels and store back
char *pSource = (char *) &currenPixel;
*pImageMemory = (pSource[0] << 24) | (pSource[3]<<16) | (pSource[2]<<8) | pSource[1];
}
}
// this method is called by Cocos2dxBitmap // this method is called by Cocos2dxBitmap
extern "C" extern "C"
{ {
@ -268,17 +243,5 @@ extern "C"
bitmapDC._height = height; bitmapDC._height = height;
bitmapDC._data = new unsigned char[size]; bitmapDC._data = new unsigned char[size];
env->GetByteArrayRegion(pixels, 0, size, (jbyte*)bitmapDC._data); env->GetByteArrayRegion(pixels, 0, size, (jbyte*)bitmapDC._data);
// swap data
unsigned int *tempPtr = (unsigned int*)bitmapDC._data;
unsigned int tempdata = 0;
for (int i = 0; i < height; ++i)
{
for (int j = 0; j < width; ++j)
{
tempdata = *tempPtr;
*tempPtr++ = bitmapDC.swapAlpha(tempdata);
}
}
} }
}; };