Merge pull request #1092 from jdryg/nanovg_update_image_fix

nvgRenderUpdateTexture() was reading past the end of the data buffer.
This commit is contained in:
Branimir Karadžić
2017-03-24 08:43:52 -07:00
committed by GitHub

View File

@@ -363,6 +363,9 @@ namespace
uint32_t bytesPerPixel = NVG_TEXTURE_RGBA == tex->type ? 4 : 1;
uint32_t pitch = tex->width * bytesPerPixel;
const bgfx::Memory* mem = bgfx::alloc(w * h * bytesPerPixel);
bx::gather(mem->data, data + y * pitch + x * bytesPerPixel, w * bytesPerPixel, h, pitch);
bgfx::updateTexture2D(
tex->id
, 0
@@ -371,8 +374,8 @@ namespace
, y
, w
, h
, bgfx::copy(data + y*pitch + x*bytesPerPixel, h*pitch)
, pitch
, mem
, UINT16_MAX
);
return 1;