RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

lodepng->sbi_image

Browse source
This commit is contained in:
Roman Sorokin 2014-06-27 12:43:08 +03:00 • committed by Alex Zolotarev
parent 90a1cb6753
commit 0f32078aa6
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drape/symbols_texture.cpp
View file

@ -1,6 +1,7 @@
#include "symbols_texture.hpp"
#include "utils/lodepng.h"
//#include "utils/lodepng.h"
#include "utils/stb_image.h"
#include "../platform/platform.hpp"
@ -40,12 +41,12 @@ void SymbolsTexture::Load(string const & skinPathName)
return;
}
vector<unsigned char> pngData;
unsigned w, h;
lodepng::decode(pngData, w, h, &rawData[0], rawData.size());
int w, h, bpp;
unsigned char * data = stbi_png_load_from_memory(&rawData[0], rawData.size(), &w, &h, &bpp, 0);
ASSERT(width == w && height == h, ());
Create(width, height, Texture::RGBA8, MakeStackRefPointer<void>(&pngData[0]));
Create(width, height, Texture::RGBA8, MakeStackRefPointer<void>(data));
delete [] data;
}
bool SymbolsTexture::FindResource(Texture::Key const & key, m2::RectF & texRect, m2::PointU & pixelSize) const