atria-soft/egami
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] correct set of the imagesÃ

Browse Source
This commit is contained in:
Edouard DUPIN 2016-04-24 16:28:23 +02:00
parent 15f133a61c
commit 2a7f8f90d2
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
egami/Image.cpp
View File

@ -44,6 +44,10 @@ std::ostream& egami::operator <<(std::ostream& _os, const enum egami::colorType
egami::Image::Image(const ivec2& _size, enum colorType _type) : egami::Image::Image(const ivec2& _size, enum colorType _type) :
m_data(nullptr) { m_data(nullptr) {
configure(_size, _type);
}
void egami::Image::configure(const ivec2& _size, enum colorType _type) {
switch (_type) { switch (_type) {
case egami::colorType::RGBA8: case egami::colorType::RGBA8:
//m_data = std::make_shared<egami::ImagePrivate>(new egami::ImageTemplate<etk::Color<uint8_t>>(_size)); //m_data = std::make_shared<egami::ImagePrivate>(new egami::ImageTemplate<etk::Color<uint8_t>>(_size));

2
egami/Image.h
View File

@ -36,8 +36,8 @@ namespace egami {
Image(const ivec2& _size=ivec2(32,32), enum colorType _type=egami::colorType::RGBA8); Image(const ivec2& _size=ivec2(32,32), enum colorType _type=egami::colorType::RGBA8);
// destructor // destructor
~Image() { }; ~Image() { };
// EWOL internal API for Texture system :
public: public:
void configure(const ivec2& _size=ivec2(32,32), enum colorType _type=egami::colorType::RGBA8);
void* getTextureDataPointer(); void* getTextureDataPointer();
enum colorType getType(); enum colorType getType();
// ----------------------------------------------- // -----------------------------------------------

21
egami/wrapperPNG.cpp
View File

@ -39,11 +39,11 @@ static void localFlushData(png_structp png_ptr)
*/ */
void user_error_fn(png_structp _pngPtr, png_const_charp _errorMsg) { void user_error_fn(png_structp _pngPtr, png_const_charp _errorMsg) {
EGAMI_DEBUG("libpng error: '" << _errorMsg << "'"); EGAMI_ERROR("libpng error: '" << _errorMsg << "'");
} }
void user_warning_fn(png_structp _pngPtr, png_const_charp _warningMsg) { void user_warning_fn(png_structp _pngPtr, png_const_charp _warningMsg) {
EGAMI_DEBUG("libpng warning: '" << _warningMsg << "'"); EGAMI_WARNING("libpng warning: '" << _warningMsg << "'");
} }
bool egami::loadPNG(const std::string& _inputFile, egami::Image& _ouputImage) { bool egami::loadPNG(const std::string& _inputFile, egami::Image& _ouputImage) {
@ -115,7 +115,22 @@ bool egami::loadPNG(const std::string& _inputFile, egami::Image& _ouputImage) {
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);
// reallocate the image // reallocate the image
EGAMI_VERBOSE("Load PNG image : (" << width << "," << height << ")" ); EGAMI_VERBOSE("Load PNG image : (" << width << "," << height << ")" );
_ouputImage.resize(ivec2(width,height)); switch (color_type) {
case PNG_COLOR_TYPE_RGBA:
_ouputImage.configure(ivec2(width,height), egami::colorType::RGBA8);
break;
case PNG_COLOR_TYPE_RGB:
_ouputImage.configure(ivec2(width,height), egami::colorType::RGB8);
break;
case PNG_COLOR_TYPE_GRAY:
_ouputImage.configure(ivec2(width,height), egami::colorType::RGB8);
break;
case PNG_COLOR_TYPE_GRAY_ALPHA:
_ouputImage.configure(ivec2(width,height), egami::colorType::RGBA8);
break;
default:
break;
}
// Tell libpng to strip 16 bits/color files down to 8 bits/color. Use accurate scaling if it's available, otherwise just chop off the low byte. // Tell libpng to strip 16 bits/color files down to 8 bits/color. Use accurate scaling if it's available, otherwise just chop off the low byte.
#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED #ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED