app/actions/channels-commands.c app/actions/colormap-actions.c
2007-12-25 Michael Natterer <mitch@gimp.org> * app/actions/channels-commands.c * app/actions/colormap-actions.c * app/actions/colormap-commands.c * app/actions/image-commands.c * app/core/gimp-edit.c * app/core/gimpdrawable-preview.c * app/core/gimpimage-colorhash.c * app/core/gimpimage-colormap.c * app/core/gimpimage-convert.c * app/core/gimpimage-crop.c * app/core/gimpimage-duplicate.c * app/core/gimpimage-flip.c * app/core/gimpimage-guides.c * app/core/gimpimage-merge.c * app/core/gimpimage-preview.c * app/core/gimpimage-quick-mask.c * app/core/gimpimage-resize.c * app/core/gimpimage-rotate.c * app/core/gimpimage-sample-points.c * app/core/gimpimage-scale.c * app/core/gimpimage-snap.c * app/core/gimpimage.c * app/core/gimpimagefile.c * app/core/gimpimageundo.c * app/core/gimpitem-preview.c * app/core/gimpitem.c * app/core/gimplayer.c * app/core/gimppalette-import.c * app/core/gimpprojection-construct.c * app/core/gimpprojection.c * app/core/gimpselection.c * app/core/gimpundo.c * app/dialogs/layer-options-dialog.c * app/dialogs/print-size-dialog.c * app/display/gimpdisplay.c * app/display/gimpdisplayshell-draw.c * app/display/gimpdisplayshell-scale.c * app/display/gimpdisplayshell-scroll.c * app/display/gimpdisplayshell-title.c * app/display/gimpdisplayshell-transform.c * app/display/gimpdisplayshell.c * app/display/gimpstatusbar.c * app/file/file-open.c * app/paint/gimppaintoptions.c * app/tools/gimpaligntool.c * app/tools/gimpcolortool.c * app/tools/gimpeditselectiontool.c * app/tools/gimpiscissorstool.c * app/tools/gimpmeasuretool.c * app/tools/gimpmovetool.c * app/tools/gimpperspectiveclonetool.c * app/tools/gimprectangleselecttool.c * app/tools/gimprectangletool.c * app/tools/gimprotatetool.c * app/vectors/gimpvectors-export.c * app/vectors/gimpvectors-import.c * app/vectors/gimpvectors.c * app/widgets/gimpimagepropview.c * app/widgets/gimpnavigationview.c * app/widgets/gimpselectioneditor.c * app/widgets/gimpviewrendererdrawable.c * app/widgets/gimpviewrendererimage.c * app/xcf/xcf-load.c * app/xcf/xcf-save.c * tools/pdbgen/pdb/guides.pdb * tools/pdbgen/pdb/image.pdb: use accessors for many image properties. * app/pdb/guides_cmds.c * app/pdb/image_cmds.c: regenerated. svn path=/trunk/; revision=24432
This commit is contained in:

committed by
Michael Natterer

parent
9b551273ab
commit
75061fccfd
@ -41,7 +41,8 @@ gimp_image_add_hguide (GimpImage *image,
|
||||
GimpGuide *guide;
|
||||
|
||||
g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
|
||||
g_return_val_if_fail (position >= 0 && position <= image->height, NULL);
|
||||
g_return_val_if_fail (position >= 0 &&
|
||||
position <= gimp_image_get_height (image), NULL);
|
||||
|
||||
guide = gimp_guide_new (GIMP_ORIENTATION_HORIZONTAL,
|
||||
image->gimp->next_guide_ID++);
|
||||
@ -63,7 +64,8 @@ gimp_image_add_vguide (GimpImage *image,
|
||||
GimpGuide *guide;
|
||||
|
||||
g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
|
||||
g_return_val_if_fail (position >= 0 && position <= image->width, NULL);
|
||||
g_return_val_if_fail (position >= 0 &&
|
||||
position <= gimp_image_get_width (image), NULL);
|
||||
|
||||
guide = gimp_guide_new (GIMP_ORIENTATION_VERTICAL,
|
||||
image->gimp->next_guide_ID++);
|
||||
@ -87,9 +89,9 @@ gimp_image_add_guide (GimpImage *image,
|
||||
g_return_if_fail (position >= 0);
|
||||
|
||||
if (gimp_guide_get_orientation (guide) == GIMP_ORIENTATION_HORIZONTAL)
|
||||
g_return_if_fail (position <= image->height);
|
||||
g_return_if_fail (position <= gimp_image_get_height (image));
|
||||
else
|
||||
g_return_if_fail (position <= image->width);
|
||||
g_return_if_fail (position <= gimp_image_get_width (image));
|
||||
|
||||
image->guides = g_list_prepend (image->guides, guide);
|
||||
|
||||
@ -130,9 +132,9 @@ gimp_image_move_guide (GimpImage *image,
|
||||
g_return_if_fail (position >= 0);
|
||||
|
||||
if (gimp_guide_get_orientation (guide) == GIMP_ORIENTATION_HORIZONTAL)
|
||||
g_return_if_fail (position <= image->height);
|
||||
g_return_if_fail (position <= gimp_image_get_height (image));
|
||||
else
|
||||
g_return_if_fail (position <= image->width);
|
||||
g_return_if_fail (position <= gimp_image_get_width (image));
|
||||
|
||||
if (push_undo)
|
||||
gimp_image_undo_push_guide (image, _("Move Guide"), guide);
|
||||
@ -210,8 +212,8 @@ gimp_image_find_guide (GimpImage *image,
|
||||
g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
|
||||
g_return_val_if_fail (epsilon_x > 0 && epsilon_y > 0, NULL);
|
||||
|
||||
if (x < 0 || x >= image->width ||
|
||||
y < 0 || y >= image->height)
|
||||
if (x < 0 || x >= gimp_image_get_width (image) ||
|
||||
y < 0 || y >= gimp_image_get_height (image))
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
Reference in New Issue
Block a user