kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PNG improvements

Browse Source
This commit is contained in:
Joshua Granick
2014-09-26 13:36:17 -07:00
parent 6bcbb6d223
commit 4cb658dab5
4 changed files with 48 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lime/Assets.hx
View File

@@ -9,6 +9,8 @@ import lime.graphics.Font;
import lime.graphics.Image; import lime.graphics.Image;
import lime.utils.ByteArray; import lime.utils.ByteArray;
@:access(lime.AssetLibrary)
/** /**
* <p>The Assets class provides a cross-platform interface to access * <p>The Assets class provides a cross-platform interface to access
@@ -26,7 +28,6 @@ import lime.utils.ByteArray;
* and specifying a custom preloader using <window preloader="" /> * and specifying a custom preloader using <window preloader="" />
* in the project file.</p> * in the project file.</p>
*/ */
@:access(lime.AssetLibrary)
class Assets { class Assets {

2
project/lib/png

Submodule project/lib/png updated: 3f1fe354bc...95d51b67a1

2
project/lib/zlib

Submodule project/lib/zlib updated: ea694cde22...c95a5186cc

75
project/src/graphics/format/PNG.cpp
View File

@@ -15,30 +15,32 @@ extern "C" {
namespace lime { namespace lime {
struct ReadBuf { struct ReadBuffer {
ReadBuffer (const unsigned char* data, int length) : data (data), length (length), position (0) {}
ReadBuf (const uint8 *inData, int inLen) : mData (inData), mLen (inLen) {} void Read (unsigned char* out, int count) {
bool Read (uint8 *outBuffer, int inN) { if (position >= length) return;
if (inN > mLen) { if (count > length - position) {
memset (outBuffer, 0, inN); memcpy (out, data + position, length - position);
return false; position = length;
} else {
memcpy (out, data + position, count);
position += count;
} }
memcpy (outBuffer, mData, inN);
mData += inN;
mLen -= inN;
return true;
} }
const uint8 *mData; char unused; // the first byte gets corrupted when passed to libpng?
int mLen; const unsigned char* data;
int length;
int position;
}; };
@@ -50,16 +52,15 @@ namespace lime {
} }
static void user_warning_fn (png_structp png_ptr, png_const_charp warning_msg) {}
static void user_read_data_fn (png_structp png_ptr, png_bytep data, png_size_t length) { static void user_read_data_fn (png_structp png_ptr, png_bytep data, png_size_t length) {
png_voidp buffer = png_get_io_ptr (png_ptr); ReadBuffer* buffer = (ReadBuffer*)png_get_io_ptr (png_ptr);
((ReadBuf *)buffer)->Read (data, length); buffer->Read (data, length);
} }
static void user_warning_fn (png_structp png_ptr, png_const_charp warning_msg) {}
void user_write_data (png_structp png_ptr, png_bytep data, png_size_t length) { void user_write_data (png_structp png_ptr, png_bytep data, png_size_t length) {
@@ -87,22 +88,23 @@ namespace lime {
file = lime::fopen (resource->path, "rb"); file = lime::fopen (resource->path, "rb");
if (!file) return false; if (!file) return false;
// verify the PNG signature
int read = lime::fread (png_sig, PNG_SIG_SIZE, 1, file); int read = lime::fread (png_sig, PNG_SIG_SIZE, 1, file);
if (png_sig_cmp (png_sig, 0, PNG_SIG_SIZE)) { if (png_sig_cmp (png_sig, 0, PNG_SIG_SIZE)) {
lime::fclose (file); lime::fclose (file);
return false; return false;
} else {
lime::fseek (file, 0, 0);
} }
} else { } else {
// TODO: optimize ByteArray Format check? memcpy (png_sig, resource->data->Bytes (), PNG_SIG_SIZE);
if (png_sig_cmp (png_sig, 0, PNG_SIG_SIZE)) {
return false;
}
} }
@@ -133,35 +135,42 @@ namespace lime {
if (file) { if (file) {
png_init_io (png_ptr, file); png_init_io (png_ptr, file);
png_set_sig_bytes (png_ptr, PNG_SIG_SIZE);
} else { } else {
ReadBuf buffer (resource->data->Bytes (), resource->data->Size ()); ReadBuffer buffer (resource->data->Bytes (), resource->data->Size ());
png_set_read_fn (png_ptr, (void *)&buffer, user_read_data_fn); png_set_read_fn (png_ptr, &buffer, user_read_data_fn);
} }
png_read_info (png_ptr, info_ptr); png_read_info (png_ptr, info_ptr);
png_get_IHDR (png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, NULL, NULL); png_get_IHDR (png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, NULL, NULL);
bool has_alpha = (color_type == PNG_COLOR_TYPE_GRAY_ALPHA || color_type == PNG_COLOR_TYPE_RGB_ALPHA || png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS)); //bool has_alpha = (color_type == PNG_COLOR_TYPE_GRAY_ALPHA || color_type == PNG_COLOR_TYPE_RGB_ALPHA || png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS));
png_set_expand (png_ptr); png_set_expand (png_ptr);
png_set_filler (png_ptr, 0xff, PNG_FILLER_AFTER); png_set_filler (png_ptr, 0xff, PNG_FILLER_AFTER);
//png_set_gray_1_2_4_to_8 (png_ptr); //png_set_gray_1_2_4_to_8 (png_ptr);
png_set_palette_to_rgb (png_ptr); png_set_palette_to_rgb (png_ptr);
png_set_gray_to_rgb (png_ptr); png_set_gray_to_rgb (png_ptr);
if (bit_depth == 16) if (bit_depth < 8) {
png_set_strip_16 (png_ptr);
png_set_packing (png_ptr);
} else if (bit_depth == 16) {
png_set_scale_16 (png_ptr);
}
//png_set_bgr (png_ptr); //png_set_bgr (png_ptr);
int bpp = 4; int bpp = 4;
const unsigned int stride = width * bpp; const unsigned int stride = width * bpp;
imageBuffer->Resize (width, height, bpp); imageBuffer->Resize (width, height, bpp);
unsigned char *bytes = imageBuffer->data->Bytes (); unsigned char *bytes = imageBuffer->data->Bytes ();
int number_of_passes = png_set_interlace_handling (png_ptr); int number_of_passes = png_set_interlace_handling (png_ptr);
@@ -177,7 +186,7 @@ namespace lime {
} }
png_read_end (png_ptr, info_ptr); png_read_end (png_ptr, NULL);
png_destroy_read_struct (&png_ptr, &info_ptr, (png_infopp)NULL); png_destroy_read_struct (&png_ptr, &info_ptr, (png_infopp)NULL);
return true; return true;