callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app/base/tile-manager.c use G_STRLOC instead of G_GNUC_FUNCTION (which is

Browse Source 
2008-01-28  Michael Natterer  <mitch@gimp.org>

	* app/base/tile-manager.c
	* plug-ins/common/lcms.c: use G_STRLOC instead of
	G_GNUC_FUNCTION (which is now deprecated).


svn path=/trunk/; revision=24727
This commit is contained in:
Michael Natterer
2008-01-28 13:19:42 +00:00
committed by Michael Natterer
parent 0f993d3f42
commit 31a5214fd5
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-01-28 Michael Natterer <mitch@gimp.org>
* app/base/tile-manager.c
* plug-ins/common/lcms.c: use G_STRLOC instead of
G_GNUC_FUNCTION (which is now deprecated).
2008-01-28 Tor Lillqvist <tml@novell.com> 2008-01-28 Tor Lillqvist <tml@novell.com>
* modules/controller_dx_dinput.c: Make it compile again. * modules/controller_dx_dinput.c: Make it compile again.

14
app/base/tile-manager.c
View File

@ -400,7 +400,7 @@ tile_manager_map_tile (TileManager *tm,
if (G_UNLIKELY (num < 0)) if (G_UNLIKELY (num < 0))
{ {
g_warning ("%s: tile coordinates out of range.", G_GNUC_FUNCTION); g_warning ("%s: tile coordinates out of range.", G_STRLOC);
return; return;
} }
@ -427,13 +427,13 @@ tile_manager_map (TileManager *tm,
if (G_UNLIKELY ((tile_num < 0) || (tile_num >= ntiles))) if (G_UNLIKELY ((tile_num < 0) || (tile_num >= ntiles)))
{ {
g_warning ("%s: tile out of range", G_GNUC_FUNCTION); g_warning ("%s: tile out of range", G_STRLOC);
return; return;
} }
if (G_UNLIKELY (! tm->tiles)) if (G_UNLIKELY (! tm->tiles))
{ {
g_warning ("%s: empty tile level - initializing", G_GNUC_FUNCTION); g_warning ("%s: empty tile level - initializing", G_STRLOC);
tm->tiles = g_new (Tile *, ntiles); tm->tiles = g_new (Tile *, ntiles);
tiles = tm->tiles; tiles = tm->tiles;
@ -475,14 +475,14 @@ tile_manager_map (TileManager *tm,
#endif #endif
if (G_UNLIKELY (! srctile->valid)) if (G_UNLIKELY (! srctile->valid))
g_warning("%s: srctile not validated yet! please report", G_GNUC_FUNCTION); g_warning("%s: srctile not validated yet! please report", G_STRLOC);
if (G_UNLIKELY ((*tile_ptr)->ewidth != srctile->ewidth || if (G_UNLIKELY ((*tile_ptr)->ewidth != srctile->ewidth ||
(*tile_ptr)->eheight != srctile->eheight || (*tile_ptr)->eheight != srctile->eheight ||
(*tile_ptr)->bpp != srctile->bpp)) (*tile_ptr)->bpp != srctile->bpp))
{ {
g_warning ("%s: nonconformant map (%p -> %p)", g_warning ("%s: nonconformant map (%p -> %p)",
G_GNUC_FUNCTION, srctile, *tile_ptr); G_STRLOC, srctile, *tile_ptr);
} }
tile_detach (*tile_ptr, tm, tile_num); tile_detach (*tile_ptr, tm, tile_num);
@ -645,7 +645,7 @@ tile_manager_get_tile_coordinates (TileManager *tm,
if (G_UNLIKELY (tl == NULL)) if (G_UNLIKELY (tl == NULL))
{ {
g_warning ("%s: tile not attached to manager", G_GNUC_FUNCTION); g_warning ("%s: tile not attached to manager", G_STRLOC);
return; return;
} }
@ -689,7 +689,7 @@ tile_manager_map_over_tile (TileManager *tm,
if (G_UNLIKELY (tl == NULL)) if (G_UNLIKELY (tl == NULL))
{ {
g_warning ("%s: tile not attached to manager", G_GNUC_FUNCTION); g_warning ("%s: tile not attached to manager", G_STRLOC);
return; return;
} }

2
plug-ins/common/lcms.c
View File

@ -948,7 +948,7 @@ lcms_image_transform_rgb (gint32 image,
break; break;
default: default:
g_warning ("%s: unexpected bpp", G_GNUC_FUNCTION); g_warning ("%s: unexpected bpp", G_STRLOC);
continue; continue;
} }