issue #931: refactor CCImage and CCTexture2D

HelloWorld/proj.android/jni/helloworld/main.cpp

@@ -1,6 +1,7 @@
 #include "AppDelegate.h"
 #include "cocos2d.h"
 #include "platform/android/jni/JniHelper.h"
+#include "CCEventType.h"
 #include <jni.h>
 #include <android/log.h>
 

cocos2dx/platform/CCImage.cpp

@@ -28,22 +28,13 @@ THE SOFTWARE.
 #include "CCStdC.h"
 #include "CCFileUtils.h"
 #include "png.h"
+#include "jpeglib.h"
 #include <string>
 #include <ctype.h>
 
 #if (CC_TARGET_PLATFORM != CC_PLATFORM_IOS) 
 // on ios, we should use platform/ios/CCImage_ios.mm instead
 
-#define  QGLOBAL_H        // defined for wophone
-#include "jpeglib.h"
-#undef   QGLOBAL_H
-
-#define CC_RGB_PREMULTIPLY_APLHA(vr, vg, vb, va) \
-    (unsigned)(((unsigned)((unsigned char)(vr) * ((unsigned char)(va) + 1)) >> 8) | \
-    ((unsigned)((unsigned char)(vg) * ((unsigned char)(va) + 1) >> 8) << 8) | \
-    ((unsigned)((unsigned char)(vb) * ((unsigned char)(va) + 1) >> 8) << 16) | \
-    ((unsigned)(unsigned char)(va) << 24))
-
 typedef struct 
 {
     unsigned char* data;
@@ -206,20 +197,21 @@ bool CCImage::_initWithJpgData(void * data, int nSize)
 
 bool CCImage::_initWithPngData(void * pData, int nDatalen)
 {
+// length of bytes to check if it is a valid png file
+#define PNGSIGSIZE  8
     bool bRet = false;
-    png_byte        header[8]   = {0}; 
+    png_byte        header[PNGSIGSIZE]   = {0}; 
     png_structp     png_ptr     =   0;
     png_infop       info_ptr    = 0;
-    unsigned char * pImateData  = 0;
 
     do 
     {
         // png header len is 8 bytes
-        CC_BREAK_IF(nDatalen < 8);
+        CC_BREAK_IF(nDatalen < PNGSIGSIZE);
 
         // check the data is png or not
-        memcpy(header, pData, 8);
+        memcpy(header, pData, PNGSIGSIZE);
-        CC_BREAK_IF(png_sig_cmp(header, 0, 8));
+        CC_BREAK_IF(png_sig_cmp(header, 0, PNGSIGSIZE));
 
         // init png_struct
         png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0);
@@ -228,9 +220,11 @@ bool CCImage::_initWithPngData(void * pData, int nDatalen)
         // init png_info
         info_ptr = png_create_info_struct(png_ptr);
         CC_BREAK_IF(!info_ptr);
+
 #if (CC_TARGET_PLATFORM != CC_PLATFORM_BADA)
         CC_BREAK_IF(setjmp(png_jmpbuf(png_ptr)));
 #endif
+
         // set the read call back function
         tImageSource imageSource;
         imageSource.data    = (unsigned char*)pData;
@@ -238,67 +232,74 @@ bool CCImage::_initWithPngData(void * pData, int nDatalen)
         imageSource.offset  = 0;
         png_set_read_fn(png_ptr, &imageSource, pngReadCallback);
 
-        // read png
+        // read png header info
-        // PNG_TRANSFORM_EXPAND: perform set_expand()
-        // PNG_TRANSFORM_PACKING: expand 1, 2 and 4-bit samples to bytes
-        // PNG_TRANSFORM_STRIP_16: strip 16-bit samples to 8 bits
-        // PNG_TRANSFORM_GRAY_TO_RGB: expand grayscale samples to RGB (or GA to RGBA)
-        png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_EXPAND | PNG_TRANSFORM_PACKING 
-            | PNG_TRANSFORM_STRIP_16 | PNG_TRANSFORM_GRAY_TO_RGB, 0);
         
-        int         color_type  = 0;
+        // read png file info
-        png_uint_32 nWidth = 0;
+        png_read_info(png_ptr, info_ptr);
-        png_uint_32 nHeight = 0;
-        int         nBitsPerComponent = 0;
-        png_get_IHDR(png_ptr, info_ptr, &nWidth, &nHeight, &nBitsPerComponent, &color_type, 0, 0, 0);
         
-        // init image info
+        m_nWidth = png_get_image_width(png_ptr, info_ptr);
-        m_bPreMulti = true;
+        m_nHeight = png_get_image_height(png_ptr, info_ptr);
-        m_bHasAlpha = ( info_ptr->color_type & PNG_COLOR_MASK_ALPHA ) ? true : false;
+        m_nBitsPerComponent = png_get_bit_depth(png_ptr, info_ptr);
+        png_uint_32 channels = png_get_channels(png_ptr, info_ptr);
+        png_uint_32 color_type = png_get_color_type(png_ptr, info_ptr);
 
-        // allocate memory and read data
+        CCLOG("color type %u", color_type);
-        int bytesPerComponent = 3;
+        // only support color type: PNG_COLOR_TYPE_RGB, PNG_COLOR_TYPE_RGB_ALPHA PNG_COLOR_TYPE_PALETTE
+        // and expand bit depth to 8
+        switch (color_type) {
+            case PNG_COLOR_TYPE_RGB:
+            case PNG_COLOR_TYPE_RGB_ALPHA:
+                // do nothing
+                
+                break;
+            case PNG_COLOR_TYPE_PALETTE:
+                png_set_palette_to_rgb(png_ptr);
+                channels = 3;
+                
+                break;
+            case PNG_COLOR_TYPE_GRAY:
+            case PNG_COLOR_TYPE_GRAY_ALPHA:
+                if (m_nBitsPerComponent < 8)
+                {
+                    png_set_expand_gray_1_2_4_to_8(png_ptr);
+                }
+                png_set_gray_to_rgb(png_ptr);
+                channels = 3;
+                
+                break;
+                
+            default:
+                CCLog("unsopprted color type %u", color_type);
+                goto out;
+        }
+        if (m_nBitsPerComponent == 16)
+        {
+            png_set_strip_16(png_ptr);
+            m_nBitsPerComponent = 8;
+        } 
+        
+        m_bHasAlpha = (color_type & PNG_COLOR_MASK_ALPHA) ? true : false;
         if (m_bHasAlpha)
         {
-            bytesPerComponent = 4;
+            channels = 4;
-        }
-        pImateData = new unsigned char[nHeight * nWidth * bytesPerComponent];
-        CC_BREAK_IF(! pImateData);
-
-        png_bytep * rowPointers = png_get_rows(png_ptr, info_ptr);
-
-        // copy data to image info
-        int bytesPerRow = nWidth * bytesPerComponent;
-        if(m_bHasAlpha)
-        {
-            unsigned int *tmp = (unsigned int *)pImateData;
-            for(unsigned int i = 0; i < nHeight; i++)
-            {
-                for(int j = 0; j < bytesPerRow; j += 4)
-                {
-                    *tmp++ = CC_RGB_PREMULTIPLY_APLHA( rowPointers[i][j], rowPointers[i][j + 1], 
-                        rowPointers[i][j + 2], rowPointers[i][j + 3] );
-                }
-            }
-        }
-        else
-        {
-            for (unsigned int j = 0; j < nHeight; ++j)
-            {
-                memcpy(pImateData + j * bytesPerRow, rowPointers[j], bytesPerRow);
-            }
         }
 
-        m_nBitsPerComponent = nBitsPerComponent;
+        // read png data
-        m_nHeight   = (short)nHeight;
+        // m_nBitsPerComponent will always be 8
-        m_nWidth    = (short)nWidth;
+        m_pData = new unsigned char[m_nWidth * m_nHeight * channels];
-        m_pData     = pImateData;
+        png_bytep row_pointers[m_nHeight];
-        pImateData  = 0;
+        const unsigned int stride = m_nWidth * channels;
+        for (size_t i = 0; i < m_nHeight; ++i)
+        {
+            png_uint_32 q = i * stride;
+            row_pointers[i] = (png_bytep)m_pData + q;
+        }
+        png_read_image(png_ptr, row_pointers);
+
         bRet        = true;
     } while (0);
 
-    CC_SAFE_DELETE_ARRAY(pImateData);
+out:
-
     if (png_ptr)
     {
         png_destroy_read_struct(&png_ptr, (info_ptr) ? &info_ptr : 0, 0);

cocos2dx/textures/CCTexture2D.cpp

@@ -271,18 +271,15 @@ bool CCTexture2D::initWithImage(CCImage * uiImage, ccResolutionType resolution)
     // always load premultiplied images
     return initPremultipliedATextureWithImage(uiImage, imageWidth, imageHeight);
 }
-bool CCTexture2D::initPremultipliedATextureWithImage(CCImage *image, unsigned int POTWide, unsigned int POTHigh)
+bool CCTexture2D::initPremultipliedATextureWithImage(CCImage *image, unsigned int width, unsigned int height)
 {
-    unsigned char*            data = NULL;
+    unsigned char*            tempData = image->getData();
-    unsigned char*            tempData =NULL;
     unsigned int*             inPixel32 = NULL;
+    unsigned char*            inPixel8 = NULL;
     unsigned short*           outPixel16 = NULL;
-    bool                    hasAlpha;
+    bool                      hasAlpha = image->hasAlpha();
-    CCSize                    imageSize;
+    CCSize                    imageSize = CCSizeMake((float)(image->getWidth()), (float)(image->getHeight()));
     CCTexture2DPixelFormat    pixelFormat;
-
-    hasAlpha = image->hasAlpha();
-
     size_t                    bpp = image->getBitsPerComponent();
 
     // compute pixel format
@@ -298,98 +295,38 @@ bool CCTexture2D::initPremultipliedATextureWithImage(CCImage *image, unsigned in
         }
         else 
         {
-            CCLOG("cocos2d: CCTexture2D: Using RGB565 texture since image has no alpha");
             pixelFormat = kCCTexture2DPixelFormat_RGB565;
         }
-    }
         
-
-    imageSize = CCSizeMake((float)(image->getWidth()), (float)(image->getHeight()));
-
-    switch(pixelFormat) {          
-        case kCCTexture2DPixelFormat_RGBA8888:
-        case kCCTexture2DPixelFormat_RGBA4444:
-        case kCCTexture2DPixelFormat_RGB5A1:
-        case kCCTexture2DPixelFormat_RGB565:
-        case kCCTexture2DPixelFormat_A8:
-            tempData = (unsigned char*)(image->getData());
-            CCAssert(tempData != NULL, "NULL image data.");
-
-            if(image->getWidth() == (short)POTWide && image->getHeight() == (short)POTHigh)
-            {
-                data = new unsigned char[POTHigh * POTWide * 4];
-                memcpy(data, tempData, POTHigh * POTWide * 4);
-            }
-            else
-            {
-                data = new unsigned char[POTHigh * POTWide * 4];
-                memset(data, 0, POTHigh * POTWide * 4);
-
-                unsigned char* pPixelData = (unsigned char*) tempData;
-                unsigned char* pTargetData = (unsigned char*) data;
-
-                int imageHeight = image->getHeight();
-                for(int y = 0; y < imageHeight; ++y)
-                {
-                    memcpy(pTargetData+POTWide*4*y, pPixelData+(image->getWidth())*4*y, (image->getWidth())*4);
-                }
-            }
-
-            break;    
-        case kCCTexture2DPixelFormat_RGB888:
-            tempData = (unsigned char*)(image->getData());
-            CCAssert(tempData != NULL, "NULL image data.");
-            if(image->getWidth() == (short)POTWide && image->getHeight() == (short)POTHigh)
-            {
-                data = new unsigned char[POTHigh * POTWide * 3];
-                memcpy(data, tempData, POTHigh * POTWide * 3);
-            }
-            else
-            {
-                data = new unsigned char[POTHigh * POTWide * 3];
-                memset(data, 0, POTHigh * POTWide * 3);
-
-                unsigned char* pPixelData = (unsigned char*) tempData;
-                unsigned char* pTargetData = (unsigned char*) data;
-
-                int imageHeight = image->getHeight();
-                for(int y = 0; y < imageHeight; ++y)
-                {
-                    memcpy(pTargetData+POTWide*3*y, pPixelData+(image->getWidth())*3*y, (image->getWidth())*3);
-                }
-            }
-            break;   
-        default:
-            CCAssert(0, "Invalid pixel format");
     }
     
     // Repack the pixel data into the right format
+    unsigned int length = width * height;
     
-    if(pixelFormat == kCCTexture2DPixelFormat_RGB565) {
+    if (pixelFormat == kCCTexture2DPixelFormat_RGB565)
-        //Convert "RRRRRRRRRGGGGGGGGBBBBBBBBAAAAAAAA" to "RRRRRGGGGGGBBBBB"
+    {
-        tempData = new unsigned char[POTHigh * POTWide * 2];
+        // Convert "RRRRRRRRRGGGGGGGGBBBBBBBB" to "RRRRRGGGGGGBBBBB"
-        inPixel32 = (unsigned int*)data;
+        
+        tempData = new unsigned char[width * height * 2];
         outPixel16 = (unsigned short*)tempData;
+        inPixel8 = (unsigned char*)image->getData();
         
-        unsigned int length = POTWide * POTHigh;
+        for(unsigned int i = 0; i < length; ++i)
-        for(unsigned int i = 0; i < length; ++i, ++inPixel32)
         {
             *outPixel16++ = 
-                ((((*inPixel32 >> 0) & 0xFF) >> 3) << 11) |  // R
+            (((*inPixel8++ & 0xFF) >> 3) << 11) |  // R
-                ((((*inPixel32 >> 8) & 0xFF) >> 2) << 5) |   // G
+            (((*inPixel8++ & 0xFF) >> 2) << 5)  |  // G
-                ((((*inPixel32 >> 16) & 0xFF) >> 3) << 0);   // B
+            (((*inPixel8++ & 0xFF) >> 3) << 0);    // B
         }
+    }
+    else if (pixelFormat == kCCTexture2DPixelFormat_RGBA4444)
+    {
+        // Convert "RRRRRRRRRGGGGGGGGBBBBBBBBAAAAAAAA" to "RRRRGGGGBBBBAAAA"
         
-        delete [] data;
+        inPixel32 = (unsigned int*)image->getData();  
-        data = tempData;
+        tempData = new unsigned char[width * height * 2];
-    }
-    else if (pixelFormat == kCCTexture2DPixelFormat_RGBA4444) {
-        //Convert "RRRRRRRRRGGGGGGGGBBBBBBBBAAAAAAAA" to "RRRRGGGGBBBBAAAA"
-        tempData = new unsigned char[POTHigh * POTWide * 2];
-        inPixel32 = (unsigned int*)data;
         outPixel16 = (unsigned short*)tempData;
         
-        unsigned int length = POTWide * POTHigh;
         for(unsigned int i = 0; i < length; ++i, ++inPixel32)
         {
             *outPixel16++ = 
@@ -398,17 +335,14 @@ bool CCTexture2D::initPremultipliedATextureWithImage(CCImage *image, unsigned in
             ((((*inPixel32 >> 16) & 0xFF) >> 4) << 4) | // B
             ((((*inPixel32 >> 24) & 0xFF) >> 4) << 0);  // A
         }
-
-        delete [] data;
-        data = tempData;
     }
-    else if (pixelFormat == kCCTexture2DPixelFormat_RGB5A1) {
+    else if (pixelFormat == kCCTexture2DPixelFormat_RGB5A1)
-        //Convert "RRRRRRRRRGGGGGGGGBBBBBBBBAAAAAAAA" to "RRRRRGGGGGBBBBBA"
+    {
-        tempData = new unsigned char[POTHigh * POTWide * 2];
+        // Convert "RRRRRRRRRGGGGGGGGBBBBBBBBAAAAAAAA" to "RRRRRGGGGGBBBBBA"
-        inPixel32 = (unsigned int*)data;
+        inPixel32 = (unsigned int*)image->getData();   
+        tempData = new unsigned char[width * height * 2];
         outPixel16 = (unsigned short*)tempData;
         
-        unsigned int length = POTWide * POTHigh;
         for(unsigned int i = 0; i < length; ++i, ++inPixel32)
         {
             *outPixel16++ = 
@@ -417,43 +351,20 @@ bool CCTexture2D::initPremultipliedATextureWithImage(CCImage *image, unsigned in
             ((((*inPixel32 >> 16) & 0xFF) >> 3) << 1) | // B
             ((((*inPixel32 >> 24) & 0xFF) >> 7) << 0);  // A
         }
-
-        delete []data;
-        data = tempData;
     }
     else if (pixelFormat == kCCTexture2DPixelFormat_A8)
     {
-        // fix me, how to convert to A8
+        // fixed me, how to convert?
-        pixelFormat = kCCTexture2DPixelFormat_RGBA8888;
-
-        /*
-         * The code can not work, how to convert to A8?
-         *
-        tempData = new unsigned char[POTHigh * POTWide];
-        inPixel32 = (unsigned int*)data;
-        outPixel8 = tempData;
-
-        unsigned int length = POTWide * POTHigh;
-        for(unsigned int i = 0; i < length; ++i, ++inPixel32)
-        {
-            *outPixel8++ = (*inPixel32 >> 24) & 0xFF;
     }
     
-        delete []data;
+    initWithData(tempData, pixelFormat, width, height, imageSize);
-        data = tempData;
+    
-        */
+    if (tempData != image->getData())
+    {
+        delete [] tempData;
     }
 
-    if (data)
-    {
-        this->initWithData(data, pixelFormat, POTWide, POTHigh, imageSize);
-
-        // should be after calling super init
     m_bHasPremultipliedAlpha = image->isPremultipliedAlpha();
-
-        //CGContextRelease(context);
-        delete [] data;
-    }
     return true;
 }