dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

plug-ins/common/psd.c did a global gimage -> image substitution. 

* plug-ins/common/psd.c
	* plug-ins/rcm/rcm_misc.c: did a global gimage -> image substitution.
This commit is contained in:
Sven Neumann 2006-03-28 17:10:50 +00:00
parent 905fdfcbed
commit 20ef3ba43c
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,6 +1,8 @@
2006-03-28 Sven Neumann <sven@gimp.org>
* app/*: did a global gimage -> image substitution.
* app/*
* plug-ins/common/psd.c
* plug-ins/rcm/rcm_misc.c: did a global gimage -> image substitution.
2006-03-28 Michael Natterer <mitch@gimp.org>

8
plug-ins/common/psd.c
View File

@ -1890,11 +1890,11 @@ load_image (const gchar *name)
if (psd_image.num_layers > 0) /* PS3-style */
{
int lnum;
GimpImageBaseType gimagetype;
GimpImageBaseType imagetype;
gimagetype = psd_mode_to_gimp_base_type (PSDheader.mode);
imagetype = psd_mode_to_gimp_base_type (PSDheader.mode);
image_ID =
gimp_image_new (PSDheader.columns, PSDheader.rows, gimagetype);
gimp_image_new (PSDheader.columns, PSDheader.rows, imagetype);
gimp_image_set_filename (image_ID, name);
if (psd_image.resolution_is_set)
@ -1946,7 +1946,7 @@ load_image (const gchar *name)
IFDBG printf ("Hey, it's a LAYER with %d channels!\n", numc);
switch (gimagetype)
switch (imagetype)
{
case GIMP_GRAY:
{

12
plug-ins/rcm/rcm_misc.c
View File

@ -181,7 +181,7 @@ rcm_reduce_image (GimpDrawable *drawable,
gint LongerSize,
gint Slctn)
{
guint32 gimage;
guint32 image;
GimpPixelRgn srcPR, srcMask;
ReducedImage *temp;
guchar *tempRGB, *src_row, *tempmask, *src_mask_row;
@ -226,12 +226,12 @@ rcm_reduce_image (GimpDrawable *drawable,
/* clamp to image size since this is the size of the mask */
gimp_drawable_offsets (drawable->drawable_id, &offx, &offy);
gimage = gimp_drawable_get_image (drawable->drawable_id);
image = gimp_drawable_get_image (drawable->drawable_id);
x1 = CLAMP (x1, - offx, gimp_image_width (gimage) - offx);
x2 = CLAMP (x2, - offx, gimp_image_width (gimage) - offx);
y1 = CLAMP (y1, - offy, gimp_image_height (gimage) - offy);
y2 = CLAMP (y2, - offy, gimp_image_height (gimage) - offy);
x1 = CLAMP (x1, - offx, gimp_image_width (image) - offx);
x2 = CLAMP (x2, - offx, gimp_image_width (image) - offx);
y1 = CLAMP (y1, - offy, gimp_image_height (image) - offy);
y2 = CLAMP (y2, - offy, gimp_image_height (image) - offy);
/* calculate size of preview */