TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix a libRocket texture issue

Browse Source
This commit is contained in:
Ed Swartz 2015-06-03 22:30:22 +02:00 committed by rdb
parent 6cbc608b8d
commit 41498e3895
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
panda/src/rocket/rocketRenderInterface.cxx
View File

@ -271,8 +271,16 @@ LoadTexture(Rocket::Core::TextureHandle& texture_handle,
// Since libRocket may make layout decisions based on the size of
// the image, it's important that we give it the original size of
// the image file in order to produce consistent results.
texture_dimensions.x = tex->get_orig_file_x_size();
texture_dimensions.y = tex->get_orig_file_y_size();
int width = tex->get_orig_file_x_size();
int height = tex->get_orig_file_y_size();
if (width == 0 && height == 0) {
// This shouldn't happen unless someone is playing very strange
// tricks with the TexturePool, but we might as well handle it.
width = tex->get_x_size();
height = tex->get_y_size();
}
texture_dimensions.x = width;
texture_dimensions.y = height;
tex->ref();
texture_handle = (Rocket::Core::TextureHandle) tex.p();
@ -307,7 +315,7 @@ GenerateTexture(Rocket::Core::TextureHandle& texture_handle,
const unsigned char *src_ptr = source + (src_stride * source_dimensions.y);
unsigned char *dst_ptr = &image[0];
for (; src_ptr >= source; dst_ptr += dst_stride) {
for (; src_ptr > source; dst_ptr += dst_stride) {
src_ptr -= src_stride;
for (size_t i = 0; i < src_stride; i += 4) {
dst_ptr[i + 0] = src_ptr[i + 2];