GUAC-687: Do not allow empty updates to the dirty rect.

This commit is contained in:
Michael Jumper 2014-05-12 12:56:06 -07:00
parent 584ca5f35c
commit 89b0a452a5

View File

@ -112,7 +112,7 @@ static void __guac_common_bound_rect(guac_common_surface* surface, guac_common_r
* @return Non-zero if the update should be combined with any existing update, * @return Non-zero if the update should be combined with any existing update,
* zero otherwise. * zero otherwise.
*/ */
static int __guac_common_should_combine(guac_common_surface* surface, guac_common_rect* rect, int rect_only) { static int __guac_common_should_combine(guac_common_surface* surface, const guac_common_rect* rect, int rect_only) {
if (surface->dirty) { if (surface->dirty) {
@ -166,7 +166,11 @@ static int __guac_common_should_combine(guac_common_surface* surface, guac_commo
* @param surface The surface to mark as dirty. * @param surface The surface to mark as dirty.
* @param rect The rectangle of the update which is dirtying the surface. * @param rect The rectangle of the update which is dirtying the surface.
*/ */
static void __guac_common_mark_dirty(guac_common_surface* surface, guac_common_rect* rect) { static void __guac_common_mark_dirty(guac_common_surface* surface, const guac_common_rect* rect) {
/* Ignore empty rects */
if (rect->width <= 0 || rect->height <= 0)
return;
/* If already dirty, update existing rect */ /* If already dirty, update existing rect */
if (surface->dirty) if (surface->dirty)