mirror of
https://gitlab.gnome.org/GNOME/gimp
synced 2024-10-22 04:22:29 +00:00
5d01581069
2004-11-13 Manish Singh <yosh@gimp.org> Fix a bunch of warnings from Sparse: * app/actions/dockable-commands.c * app/actions/layers-actions.c * app/actions/view-commands.c * app/base/pixel-surround.c * app/config/gimpconfig-utils.c * app/config/gimpscanner.c * app/core/gimpbrushgenerated.c * app/core/gimpcontainer.c * app/core/gimpimage.c * app/dialogs/palette-import-dialog.c * app/file/gimprecentlist.c * app/plug-in/plug-in-params.c * app/text/gimptext-compat.c * app/text/gimptext-parasite.c * app/vectors/gimpbezierstroke.c * app/vectors/gimpstroke.c * app/widgets/gimpcellrendereraccel.c * app/widgets/gimpselectiondata.c * app/xcf/xcf.c * libgimp/gimp.c * libgimpthumb/gimpthumb-utils.c * libgimpthumb/gimpthumbnail.c * modules/cdisplay_proof.c * plug-ins/Lighting/lighting_ui.c * plug-ins/common/csource.c * plug-ins/common/glasstile.c * plug-ins/common/nova.c * plug-ins/common/pcx.c * plug-ins/common/pnm.c * plug-ins/common/randomize.c * plug-ins/common/screenshot.c * plug-ins/common/sel_gauss.c * plug-ins/common/spheredesigner.c * plug-ins/common/wind.c * plug-ins/gfig/gfig-dialog.c * plug-ins/gfig/gfig-dobject.c * plug-ins/gimpressionist/gimpressionist.c * plug-ins/ifscompose/ifscompose.c * plug-ins/print/gimp_main_window.c * plug-ins/print/print.c: Cleanup integer vs. pointer confusion. * app/base/temp-buf.c * app/dialogs/about-dialog.c * plug-ins/common/bumpmap.c * plug-ins/common/jigsaw.c * plug-ins/gfig/gfig-dobject.c: Cosmetic cleanups. * app/config/gimpconfig-deserialize.c * app/config/gimpconfig-path.c * app/config/gimpconfigwriter.c * app/core/gimpgradient.c * app/tools/gimpdrawtool.c * plug-ins/common/nlfilt.c * plug-ins/common/unsharp.c * plug-ins/common/zealouscrop.c: Define inline functions before they are used. * app/core/gimpdrawable-blend.c: PixelRegion definition was changed some time ago, but the initialization here didn't change. Fix it. * app/plug-in/plug-in-rc.c (plug_in_extra_deserialize): No need to assign token twice in a row. * libgimpbase/gimpdatafiles.c (gimp_datafiles_read_directories): No need to initialize file_data, since the code fills out all the fields. * plug-ins/common/CML_explorer.c * plug-ins/common/vpropagate.c: Declare function pointers fully. * plug-ins/common/grid.c (pix_composite): G_INLINE_FUNC isn't needed, we assume we can use the "inline" keyword always. * plug-ins/common/psd_save.c * plug-ins/common/vinvert.c * plug-ins/gfig/gfig-arc.c * plug-ins/gfig/gfig-bezier.c * plug-ins/gfig/gfig-circle.c * plug-ins/gfig/gfig-dialog.c * plug-ins/gfig/gfig-dobject.c * plug-ins/gfig/gfig-ellipse.c * plug-ins/gfig/gfig-line.c * plug-ins/gfig/gfig-poly.c * plug-ins/gfig/gfig-spiral.c * plug-ins/gfig/gfig-star.c * plug-ins/gfig/gfig.c * plug-ins/gimpressionist/orientmap.c * plug-ins/gimpressionist/placement.c * plug-ins/gimpressionist/sizemap.c * plug-ins/imagemap/imap_grid.c * plug-ins/imagemap/imap_main.c * plug-ins/imagemap/imap_preferences.c * plug-ins/imagemap/imap_settings.c * plug-ins/maze/maze.c * plug-ins/sel2path/curve.c * plug-ins/sel2path/fit.c * plug-ins/sel2path/pxl-outline.c * plug-ins/sel2path/spline.c * plug-ins/xjt/xjt.c: Functions with no args should be declared with (void). * plug-ins/common/retinex.c (MSRCR): Initialize max_preview to quiet the compiler.
149 lines
3.3 KiB
C
149 lines
3.3 KiB
C
/* The GIMP -- an image manipulation program
|
|
* Copyright (C) 1995-2001 Spencer Kimball, Peter Mattis, and others
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <glib-object.h>
|
|
|
|
#include "base-types.h"
|
|
|
|
#include "pixel-region.h"
|
|
#include "pixel-surround.h"
|
|
#include "tile-manager.h"
|
|
#include "tile.h"
|
|
|
|
|
|
void
|
|
pixel_surround_init (PixelSurround *ps,
|
|
TileManager *tm,
|
|
gint w,
|
|
gint h,
|
|
guchar bg[MAX_CHANNELS])
|
|
{
|
|
gint i;
|
|
|
|
for (i = 0; i < MAX_CHANNELS; ++i)
|
|
{
|
|
ps->bg[i] = bg[i];
|
|
}
|
|
|
|
ps->tile = NULL;
|
|
ps->mgr = tm;
|
|
ps->bpp = tile_manager_bpp (tm);
|
|
ps->w = w;
|
|
ps->h = h;
|
|
/* make sure buffer is big enough */
|
|
ps->buff_size = w * h * ps->bpp;
|
|
ps->buff = g_new (guchar, ps->buff_size);
|
|
ps->row_stride = 0;
|
|
}
|
|
|
|
guchar *
|
|
pixel_surround_lock (PixelSurround *ps,
|
|
gint x,
|
|
gint y)
|
|
{
|
|
gint i, j;
|
|
guchar *k;
|
|
guchar *ptr;
|
|
|
|
ps->tile = tile_manager_get_tile (ps->mgr, x, y, TRUE, FALSE);
|
|
|
|
i = x % TILE_WIDTH;
|
|
j = y % TILE_HEIGHT;
|
|
|
|
/* do we have the whole region? */
|
|
if (ps->tile &&
|
|
(i < (tile_ewidth(ps->tile) - ps->w)) &&
|
|
(j < (tile_eheight(ps->tile) - ps->h)))
|
|
{
|
|
ps->row_stride = tile_ewidth (ps->tile) * ps->bpp;
|
|
/* is this really the correct way? */
|
|
return tile_data_pointer (ps->tile, i, j);
|
|
}
|
|
|
|
/* nope, do this the hard way (for now) */
|
|
if (ps->tile)
|
|
{
|
|
tile_release (ps->tile, FALSE);
|
|
ps->tile = NULL;
|
|
}
|
|
|
|
/* copy pixels, one by one */
|
|
/* no, this is not the best way, but it's much better than before */
|
|
ptr = ps->buff;
|
|
for (j = y; j < y+ps->h; ++j)
|
|
{
|
|
for (i = x; i < x+ps->w; ++i)
|
|
{
|
|
Tile *tile = tile_manager_get_tile (ps->mgr, i, j, TRUE, FALSE);
|
|
|
|
if (tile)
|
|
{
|
|
guchar *buff = tile_data_pointer (tile,
|
|
i % TILE_WIDTH,
|
|
j % TILE_HEIGHT);
|
|
|
|
for (k = buff; k < buff+ps->bpp; ++k, ++ptr)
|
|
{
|
|
*ptr = *k;
|
|
}
|
|
tile_release (tile, FALSE);
|
|
}
|
|
else
|
|
{
|
|
for (k = ps->bg; k < ps->bg+ps->bpp; ++k, ++ptr)
|
|
{
|
|
*ptr = *k;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
ps->row_stride = ps->w * ps->bpp;
|
|
|
|
return ps->buff;
|
|
}
|
|
|
|
gint
|
|
pixel_surround_rowstride (PixelSurround *ps)
|
|
{
|
|
return ps->row_stride;
|
|
}
|
|
|
|
void
|
|
pixel_surround_release (PixelSurround *ps)
|
|
{
|
|
/* always get new tile (for now), so release the old one */
|
|
if (ps->tile)
|
|
{
|
|
tile_release (ps->tile, FALSE);
|
|
ps->tile = NULL;
|
|
}
|
|
}
|
|
|
|
void
|
|
pixel_surround_clear (PixelSurround *ps)
|
|
{
|
|
if (ps->buff)
|
|
{
|
|
g_free (ps->buff);
|
|
ps->buff = NULL;
|
|
ps->buff_size = 0;
|
|
}
|
|
}
|