From 42185929c396c69606460b033b540afa86230444 Mon Sep 17 00:00:00 2001 From: scott Date: Sun, 2 Aug 1998 01:52:43 +0000 Subject: [PATCH] Added an assertion check in tile_manager.c to catch inappropriate sharing attempts. --sg --- ChangeLog | 4 ++++ app/base/tile-manager.c | 5 +++++ app/tile_manager.c | 5 +++++ 3 files changed, 14 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1ad12eb3bf..f08b5382cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat Aug 1 20:50:47 1998 Scott Goehring + + * app/tile_manager.c: Added an assertion check in tile_manager_map + Fri Jul 31 15:41:30 PDT 1998 Manish Singh * applied gimp-alt-980729-0 and gimp-alt-980730-0, adds brush diff --git a/app/base/tile-manager.c b/app/base/tile-manager.c index 2eb9f1d498..830b36f396 100644 --- a/app/base/tile-manager.c +++ b/app/base/tile-manager.c @@ -596,6 +596,11 @@ tile_manager_map (TileManager *tm, /* printf(")");fflush(stdout);*/ TILE_MUTEX_LOCK (*tile_ptr); + if ((*tile_ptr)->ewidth != srctile->ewidth || + (*tile_ptr)->eheight != srctile->eheight || + (*tile_ptr)->bpp != srctile->bpp) { + g_warning ("tile_manager_map: nonconformant map (%p -> %p)", + srctile, *tile_ptr); tile_detach (*tile_ptr, tm, tile_num); /* printf(">");fflush(stdout);*/ diff --git a/app/tile_manager.c b/app/tile_manager.c index 2eb9f1d498..830b36f396 100644 --- a/app/tile_manager.c +++ b/app/tile_manager.c @@ -596,6 +596,11 @@ tile_manager_map (TileManager *tm, /* printf(")");fflush(stdout);*/ TILE_MUTEX_LOCK (*tile_ptr); + if ((*tile_ptr)->ewidth != srctile->ewidth || + (*tile_ptr)->eheight != srctile->eheight || + (*tile_ptr)->bpp != srctile->bpp) { + g_warning ("tile_manager_map: nonconformant map (%p -> %p)", + srctile, *tile_ptr); tile_detach (*tile_ptr, tm, tile_num); /* printf(">");fflush(stdout);*/