issue cocos2d#161，support *.jpg

Author: Walzer

cocos2dx/cocos2dx-uphone.vcproj

@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\PRJ_TG3\Include\ThirdParty\iconv;..\..\PRJ_TG3\Include\ThirdParty\zlib;..\..\PRJ_TG3\Include\ThirdParty\libpng;..\..\PRJ_TG3\Include\ThirdParty\libxml2;.\include;.\Res;..\..\PRJ_TG3\Include;..\..\PRJ_TG3\Include\MTAPI;..\..\PRJ_TG3\Include\OpenGL;..\..\PRJ_TG3\Include\TCOM;..\..\PRJ_TG3\TG3\Include;..\..\PRJ_TG3\TG3\TG3_Implement;..\..\PRJ_TG3\EOS_SYS;..\..\PRJ_TG3\Common\SoftSupport;..\..\PRJ_TG3\Common\ICU\Include;.\"
+				AdditionalIncludeDirectories="..\..\PRJ_TG3\Include\ThirdParty\iconv;..\..\PRJ_TG3\Include\ThirdParty\zlib;..\..\PRJ_TG3\Include\ThirdParty\libpng;..\..\PRJ_TG3\Include\ThirdParty\libjpeg;..\..\PRJ_TG3\Include\ThirdParty\libxml2;.\include;.\Res;..\..\PRJ_TG3\Include;..\..\PRJ_TG3\Include\MTAPI;..\..\PRJ_TG3\Include\OpenGL;..\..\PRJ_TG3\Include\TCOM;..\..\PRJ_TG3\TG3\Include;..\..\PRJ_TG3\TG3\TG3_Implement;..\..\PRJ_TG3\EOS_SYS;..\..\PRJ_TG3\Common\SoftSupport;..\..\PRJ_TG3\Common\ICU\Include;.\"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_TRANZDA_VM_;SS_MAKEDLL;__TG3_PURE_DLL__;_USE_MATH_DEFINES"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -64,7 +64,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="WS2_32.Lib EosConfig.lib SoftSupport.lib TG3_DLL.lib libEGL.lib libTG3_EGL.lib libgles_cm.lib libxml2.lib zlib.lib libpng14-imp.lib ImageToolKit_d.lib"
+				AdditionalDependencies="WS2_32.Lib EosConfig.lib SoftSupport.lib TG3_DLL.lib libEGL.lib libTG3_EGL.lib libgles_cm.lib libxml2.lib zlib.lib libpng14-imp.lib ImageToolKit_d.lib libjpeg.lib"
 				OutputFile="$(OutDir)/libcocos2d.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="../../PRJ_TG3/Common/ICU/lib;../../PRJ_TG3/Mtapi/Win32/lib;../../PRJ_TG3/LIB/Win32Lib;../../PRJ_TG3/Common/SoftSupport"

cocos2dx/include/CCRenderTexture.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #include "CCSprite.h"
 
 namespace cocos2d {
-	enum  
+	enum tImageFormat
 	{
 		kImageFormatJPG = 0,
 		kImageFormatPNG = 1

cocos2dx/include/CCTexture2D.h

@@ -45,6 +45,8 @@ typedef enum {
 	kCCTexture2DPixelFormat_Automatic = 0,
 	//! 32-bit texture: RGBA8888
 	kCCTexture2DPixelFormat_RGBA8888,
+	//! 24-bit texture: RGBA888
+	kCCTexture2DPixelFormat_RGB888,
 	//! 16-bit texture: used with images that have alpha pre-multiplied
 	kCCTexture2DPixelFormat_RGB565,
 	//! 8-bit textures used as masks
@@ -60,6 +62,7 @@ typedef enum {
 	// backward compatibility stuff
 	kTexture2DPixelFormat_Automatic = kCCTexture2DPixelFormat_Automatic,
 	kTexture2DPixelFormat_RGBA8888 = kCCTexture2DPixelFormat_RGBA8888,
+	kTexture2DPixelFormat_RGB888 = kCCTexture2DPixelFormat_RGB888,
 	kTexture2DPixelFormat_RGB565 = kCCTexture2DPixelFormat_RGB565,
 	kTexture2DPixelFormat_A8 = kCCTexture2DPixelFormat_A8,
 	kTexture2DPixelFormat_RGBA4444 = kCCTexture2DPixelFormat_RGBA4444,

cocos2dx/platform/uphone/CCXUIImage_uphone.cpp

@@ -27,6 +27,7 @@ THE SOFTWARE.
 //#include <ImageToolKit/IT_ImageLoader.h> 
 #include <TG3.h>
 #include "png.h"
+#include "jpeglib.h"
 
 //using namespace ImageToolKit;
 using namespace std;
@@ -39,6 +40,7 @@ typedef struct
 	int offset;
 }tImageSource;
 
+
 // because we do not want to include "png.h" in CCXUIImage_uphone.h, so we implement
 // the function as a static function
 static void pngReadCallback(png_structp png_ptr, png_bytep data, png_size_t length)
@@ -78,10 +80,10 @@ UIImage::UIImage(TBitmap *bitmap)
  		m_imageInfo.data = m_pBitmap->GetDataPtr();
  		m_imageInfo.height = m_pBitmap->GetHeight();
  		m_imageInfo.width = m_pBitmap->GetWidth();
- 		m_imageInfo.hasAlpha = m_pBitmap->HasAlphaData();
+ 		m_imageInfo.hasAlpha = true;//m_pBitmap->HasAlphaData();
  		// uphone only support predefined
  		m_imageInfo.isPremultipliedAlpha = true;
- 		m_imageInfo.bitsPerComponent = m_pBitmap->GetDepth();
+ 		m_imageInfo.bitsPerComponent = m_pBitmap->GetDepth() / 4;
 	}
 }
 
@@ -107,10 +109,26 @@ UIImage::~UIImage(void)
 	}
 }
 
-bool UIImage::initWithContentsOfFile(const string &strPath)
+bool UIImage::initWithContentsOfFile(const string &strPath, tImageFormat imageType)
 {
-    // use libpng load image
-    return loadPng(strPath.c_str());
+	bool bRet = false;
+
+	switch (imageType)
+	{
+	case kImageFormatPNG:
+		// use libpng load image
+		bRet =  loadPng(strPath.c_str());
+		break;
+	case kImageFormatJPG:
+		bRet = loadJpg(strPath.c_str());
+		break;
+	default:
+		// unsupported image type
+		bRet = false;
+		break;
+	}
+    
+	return bRet;
 }
 
 unsigned int UIImage::width(void)
@@ -141,21 +159,14 @@ int UIImage::CGImageGetBitsPerComponent(void)
 	return m_imageInfo.bitsPerComponent;
 }
 
-// 0 -> it is a mask
-// 1 -> other
+// now we only support RGBA8888 or RGB888
+// so it has color space
 int UIImage::CGImageGetColorSpace(void)
 {
-	int nRet = 1;
-
-	if (m_imageInfo.bitsPerComponent == 8)
-	{
-		nRet = 0;
-	}
-
-	return nRet;
+	return 1;
 }
 
-unsigned char* UIImage::getRGBA8888Data(void)
+unsigned char* UIImage::getData(void)
 {
 	return m_imageInfo.data;
 }
@@ -263,10 +274,7 @@ bool UIImage::loadPngFromStream(unsigned char *data, int nLength)
 	m_imageInfo.height = info_ptr->height;
 	m_imageInfo.width = info_ptr->width;
 	m_imageInfo.isPremultipliedAlpha = false;
-	// we use CCX_RGA or CCX_RGB to save data
-	// so the bitsPerComponet is 32, and it also
-	// has the alpha data
-	m_imageInfo.bitsPerComponent = 32;
+	m_imageInfo.bitsPerComponent = info_ptr->bit_depth;
 	m_imageInfo.hasAlpha = true;
 
 	// convert to appropriate format, we now only support RGBA8888
@@ -324,6 +332,81 @@ bool UIImage::loadPngFromStream(unsigned char *data, int nLength)
 	return true;
 }
 
+bool UIImage::loadJpg(const char *strFileName)
+{
+	/* these are standard libjpeg structures for reading(decompression) */
+	struct jpeg_decompress_struct cinfo;
+	struct jpeg_error_mgr jerr;
+	/* libjpeg data structure for storing one row, that is, scanline of an image */
+	JSAMPROW row_pointer[1];
+
+	FILE *infile = fopen( strFileName, "rb" );
+	unsigned long location = 0;
+	int i = 0;
+
+	if ( !infile )
+	{
+		return false;
+	}
+	/*jpeg_stdio_src(&cinfo, infile);*/
+
+	/* here we set up the standard libjpeg error handler */
+	cinfo.err = jpeg_std_error( &jerr );
+
+	/* setup decompression process and source, then read JPEG header */
+	jpeg_create_decompress( &cinfo );
+
+	/* this makes the library read from infile */
+	jpeg_stdio_src( &cinfo, infile );
+
+	/* reading the image header which contains image information */
+	jpeg_read_header( &cinfo, true );
+
+	// we only support RGB or grayscale
+	if (cinfo.jpeg_color_space != JCS_RGB)
+	{
+		if (cinfo.jpeg_color_space == JCS_GRAYSCALE || cinfo.jpeg_color_space == JCS_YCbCr)
+		{
+            cinfo.out_color_space = JCS_RGB;
+		}
+	}
+	else
+	{
+		return false;
+	}
+
+	/* Start decompression jpeg here */
+	jpeg_start_decompress( &cinfo );
+
+	/* init image info */
+	m_imageInfo.width = cinfo.image_width;
+	m_imageInfo.height = cinfo.image_height;
+	m_imageInfo.hasAlpha = false;
+	m_imageInfo.isPremultipliedAlpha = false;
+	m_imageInfo.bitsPerComponent = 8;
+	m_imageInfo.data = new unsigned char[cinfo.output_width*cinfo.output_height*cinfo.output_components];
+
+	/* now actually read the jpeg into the raw buffer */
+	/*row_pointer[0] = (unsigned char *)malloc( cinfo.output_width*cinfo.num_components );*/
+	row_pointer[0] = new unsigned char[cinfo.output_width*cinfo.output_components];
+
+	/* read one scan line at a time */
+	while( cinfo.output_scanline < cinfo.image_height )
+	{
+		jpeg_read_scanlines( &cinfo, row_pointer, 1 );
+		for( i=0; i<cinfo.image_width*cinfo.num_components;i++) 
+			m_imageInfo.data[location++] = row_pointer[0][i];
+	}
+
+	/* wrap up decompression, destroy objects, free pointers and close open files */
+	jpeg_finish_decompress( &cinfo );
+	jpeg_destroy_decompress( &cinfo );
+	delete row_pointer[0];
+	fclose( infile );
+
+	return true;
+}
+
 bool UIImage::save(const std::string &strFileName, int nFormat)
 {
 	/// @todo uiimage::save

cocos2dx/platform/uphone/CCXUIImage_uphone.h

@@ -27,11 +27,17 @@ THE SOFTWARE.
 
 #include <string>
 #include "ccxCommon.h"
+#include "CCRenderTexture.h"
 
 class TBitmap;
 namespace   cocos2d {
 
-typedef struct  
+// typedef enum {
+// 	kImageTypePNG = 0,
+// 	kImageTypeJPG = 1,
+// } CCXImageType;
+
+typedef struct
 {
 	unsigned int	height;
 	unsigned int	width;
@@ -50,7 +56,7 @@ class CCX_DLL UIImage
 	UIImage(int nX, int nY, void *buffer);
 	~UIImage(void);
 
-	bool initWithContentsOfFile(const std::string &strPath);
+	bool initWithContentsOfFile(const std::string &strPath, tImageFormat imageType = kImageFormatPNG);
 	bool initWithData(unsigned char *pBuffer, int nLength);
 	bool initWithBuffer(int tx, int ty, unsigned char *pBuffer);
 //	bool initWithCGImage(CGImageRef pCGImage);
@@ -67,11 +73,12 @@ class CCX_DLL UIImage
 	int CGImageGetColorSpace(void);
 
 	// convert the bitmap to 256 pixel format, and every component is 8 bits
-	unsigned char* getRGBA8888Data(void);
+	unsigned char* getData(void);
 
 private:
     bool loadPng(const char* strFileName);
 	bool loadPngFromStream(unsigned char *data, int nLength);
+	bool loadJpg(const char *strFileName);
 
 private:
 	TBitmap *m_pBitmap;

cocos2dx/textures/CCTexture2D.cpp

@@ -144,6 +144,9 @@ bool CCTexture2D::initWithData(const void *data, CCTexture2DPixelFormat pixelFor
 	case kCCTexture2DPixelFormat_RGBA8888:
 		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, pixelsWide, pixelsHigh, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
 		break;
+	case kCCTexture2DPixelFormat_RGB888:
+		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, pixelsWide, pixelsHigh, 0, GL_RGB, GL_UNSIGNED_BYTE, data);
+		break;
 	case kCCTexture2DPixelFormat_RGBA4444:
 		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, pixelsWide, pixelsHigh, 0, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4, data);
 		break;
@@ -238,12 +241,21 @@ bool CCTexture2D::initPremultipliedATextureWithImage(UIImage *image, unsigned in
 
 	if(colorSpace)
 	{
-		if(hasAlpha || bpp >= 8)
+		if(hasAlpha)
+		{
 			pixelFormat = defaultAlphaPixelFormat();
+		}
 		else
 		{
-			CCLOG("cocos2d: CCTexture2D: Using RGB565 texture since image has no alpha");
-			pixelFormat = kCCTexture2DPixelFormat_RGB565;
+			if (bpp >= 8)
+			{
+				pixelFormat = kCCTexture2DPixelFormat_RGB888;
+			}
+			else
+			{
+				CCLOG("cocos2d: CCTexture2D: Using RGB565 texture since image has no alpha");
+				pixelFormat = kCCTexture2DPixelFormat_RGB565;
+			}
 		}
 	}
 	else
@@ -279,7 +291,7 @@ bool CCTexture2D::initPremultipliedATextureWithImage(UIImage *image, unsigned in
 // 			info = kCGImageAlphaOnly; 
 // 			context = CGBitmapContextCreate(data, POTWide, POTHigh, 8, POTWide, NULL, info);
 
-			tempData = (void*)(image->getRGBA8888Data());
+			tempData = (void*)(image->getData());
 			NSAssert(tempData != NULL, "NULL image data.");
 			if(image->width() == POTWide && image->height() == POTHigh)
 			{
@@ -299,7 +311,29 @@ bool CCTexture2D::initPremultipliedATextureWithImage(UIImage *image, unsigned in
 					memcpy(pTargetData+POTWide*4*y, pPixelData+(image->width())*4*y, (image->width())*4);
 				}
 			}
-			break;                    
+			break;    
+		case kCCTexture2DPixelFormat_RGB888:
+			tempData = (void*)(image->getData());
+			NSAssert(tempData != NULL, "NULL image data.");
+			if(image->width() == POTWide && image->height() == POTHigh)
+			{
+				data = new UINT8[POTHigh * POTWide * 3];
+				memcpy(data, tempData, POTHigh * POTWide * 3);
+			}
+			else
+			{
+				data = new UINT8[POTHigh * POTWide * 3];
+				memset(data, 0, POTHigh * POTWide * 3);
+
+				UINT8* pPixelData = (UINT8*) tempData;
+				UINT8* pTargetData = (UINT8*) data;
+
+				for(unsigned int y=0; y<image->height(); ++y)
+				{
+					memcpy(pTargetData+POTWide*3*y, pPixelData+(image->width())*3*y, (image->width())*3);
+				}
+			}
+			break;   
 		default:
 			NSAssert(0, "Invalid pixel format");
 			//[NSException raise:NSInternalInconsistencyException format:@"Invalid pixel format"];

cocos2dx/textures/CCTextureCache.cpp

@@ -202,22 +202,19 @@ CCTexture2D * CCTextureCache::addImage(const char * path)
 #endif
 		}
 		// Issue #886: TEMPORARY FIX FOR TRANSPARENT JPEGS IN IOS4
-// 		else if ( lowerCase.find(".jpg") || lowerCase(".jpeg") )
-// 		{
-// 			// convert jpg to png before loading the texture
-// 			UIImage *jpg = [[UIImage alloc] initWithContentsOfFile:fullpath];
-// 			UIImage *png = [[UIImage alloc] initWithData:UIImagePNGRepresentation(jpg)];
-// 			tex = [ [CCTexture2D alloc] initWithImage: png ];
-// 			[png release];
-// 			[jpg release];
-// 
-// 			if( tex )
-// 				[textures setObject: tex forKey:path];
-// 			else
-// 				CCLOG(@"cocos2d: Couldn't add image:%@ in CCTextureCache", path);
-// 
-// 			[tex release];
-// 		}
+		else 
+		if (std::string::npos != lowerCase.find(".jpg") || std::string::npos != lowerCase.find(".jpeg"))
+		{
+			UIImage * image = new UIImage();
+			if(! image->initWithContentsOfFile(fullpath, kImageFormatJPG))
+			{
+				delete image;
+				return NULL;
+			}
+			texture = new CCTexture2D();
+			texture->initWithImage(image);
+			CCX_SAFE_DELETE(image);// image->release();
+		}
 		else
 		{
 			//# work around for issue #910
@@ -227,7 +224,7 @@ CCTexture2D * CCTextureCache::addImage(const char * path)
 #else
 			// prevents overloading the autorelease pool
 			UIImage * image = new UIImage();
-			if(! image->initWithContentsOfFile(fullpath))
+			if(! image->initWithContentsOfFile(fullpath, kImageFormatPNG))
 			{
 				delete image;
 				return NULL;