Commit 37e4b802 authored by Hans Breuer's avatar Hans Breuer Committed by Hans Breuer

updated

2006-08-15  Hans Breuer  <hans@breuer.org>

	* **/makefile.msc app/gimpcore.def : updated

	* app/xcf/xcf-save.c(1464) : error C2036: 'void *' : unknown size
	pointer arithmetics on void a pointer looks like a GCC extension
	* app/tools/gimpbrightnesscontrasttool.c
	  app/tools/gimpcolorbalancetool.c
	  app/tools/gimphuesaturationtool.c
	  app/tools/gimpcolorizetool.c : #include "core/gimp.h" for gimp_message
	* app/tools/gimpiscissorstool.c : use RINT() rather than rint()
	* app/widgets/gimpcontrollerlist.c : #include "gimpwidgets-utils.h"
	for gimp_show_message_dialog
	* app/core/gimpprogress.c(229) : 'gimp_progress_message' must
	return a value
parent 5668421d
2006-08-15 Hans Breuer <hans@breuer.org>
* **/makefile.msc app/gimpcore.def : updated
* app/xcf/xcf-save.c(1464) : error C2036: 'void *' : unknown size
pointer arithmetics on void a pointer looks like a GCC extension
* app/tools/gimpbrightnesscontrasttool.c
app/tools/gimpcolorbalancetool.c
app/tools/gimphuesaturationtool.c
app/tools/gimpcolorizetool.c : #include "core/gimp.h" for gimp_message
* app/tools/gimpiscissorstool.c : use RINT() rather than rint()
* app/widgets/gimpcontrollerlist.c : #include "gimpwidgets-utils.h"
for gimp_show_message_dialog
* app/core/gimpprogress.c(229) : 'gimp_progress_message' must
return a value
2006-08-15 Sven Neumann <sven@gimp.org>
* plug-ins/pygimp/plug-ins/Makefile.am: moved whirlpinch.py to the
......
......@@ -226,7 +226,7 @@ gimp_progress_message (GimpProgress *progress,
{
GimpProgressInterface *progress_iface;
g_return_if_fail (GIMP_IS_PROGRESS (progress));
g_return_val_if_fail (GIMP_IS_PROGRESS (progress), FALSE);
progress_iface = GIMP_PROGRESS_GET_INTERFACE (progress);
......
......@@ -41,6 +41,7 @@ OBJECTS = \
gimparea.obj \
gimpbrush.obj \
gimpbrush-load.obj \
gimpbrushclipboard.obj \
gimpbrushgenerated.obj \
gimpbrushpipe.obj \
gimpbuffer.obj \
......@@ -75,9 +76,11 @@ OBJECTS = \
gimpgradient-load.obj \
gimpgradient-save.obj \
gimpgrid.obj \
gimpguide.obj \
gimp-gradients.obj \
gimpimage.obj \
gimpimagemap.obj \
gimpimage-arrange.obj \
gimpimage-colorhash.obj \
gimpimage-colormap.obj \
gimpimage-contiguous-region.obj \
......@@ -87,6 +90,7 @@ OBJECTS = \
gimpimage-flip.obj \
gimpimage-grid.obj \
gimpimage-guides.obj \
gimpimage-item-list.obj \
gimpimage-merge.obj \
gimpimage-new.obj \
gimpimage-pick-color.obj \
......@@ -101,7 +105,6 @@ OBJECTS = \
gimpimage-undo-push.obj \
gimpimagefile.obj \
gimpitem.obj \
gimpitem-align.obj \
gimpitem-linked.obj \
gimpitem-preview.obj \
gimpitemundo.obj \
......@@ -110,6 +113,7 @@ OBJECTS = \
gimplayermask.obj \
gimplist.obj \
gimpparamspecs.obj \
gimpparamspecs-desc.obj \
gimpprojection.obj \
gimpprojection-construct.obj \
gimpmarshal.obj \
......@@ -121,6 +125,7 @@ OBJECTS = \
gimp-parasites.obj \
gimpparasitelist.obj \
gimppattern.obj \
gimppatternclipboard.obj \
gimppickable.obj \
gimppdbprogress.obj \
gimppreviewcache.obj \
......
......@@ -42,6 +42,7 @@ OBJECTS = \
gimpdisplayshell-handlers.obj \
gimpdisplayshell-layer-select.obj \
gimpdisplayshell-preview.obj \
gimpdisplayshell-progress.obj \
gimpdisplayshell-render.obj \
gimpdisplayshell-scale.obj \
gimpdisplayshell-scroll.obj \
......
......@@ -282,7 +282,6 @@ EXPORTS
gimp_image_base_type_with_alpha
gimp_image_contiguous_region_by_seed
gimp_image_convert
gimp_image_coords_in_active_drawable
gimp_image_crop
gimp_image_crop_auto_shrink
gimp_image_duplicate
......@@ -409,7 +408,6 @@ EXPORTS
gimp_item_get_visible
gimp_item_height
gimp_item_linked_flip
gimp_item_linked_get_list
gimp_item_linked_rotate
gimp_item_linked_transform
gimp_item_linked_translate
......@@ -715,7 +713,6 @@ gimp_image_sample_point_ref
gimp_image_sample_point_unref
gimp_image_add_sample_point_at_pos
gimp_gradient_segment_split_midpoint
gimp_image_resize_layers_get_type
gimp_image_resize_with_layers
gimp_image_update_sample_point
gimp_palette_set_columns
......@@ -733,7 +730,6 @@ gimp_dash_pattern_from_preset
gimp_dash_pattern_copy
gimp_dash_pattern_segments_set
gimp_dash_pattern_from_segments
gimp_item_align
gimp_stroke_options_set_dash_pattern
boundary_find
boundary_sort
......@@ -782,19 +778,10 @@ gimp_plug_in_manager_data_free
gimp_plug_in_manager_get_help_domain
gimp_plug_in_manager_get_help_domains
gimp_plug_in_manager_get_locale_domain
gimp_plug_in_manager_set_last_plug_in
gimp_plug_in_procedure_get_help_id
gimp_plug_in_procedure_get_label
gimp_plug_in_procedure_get_pixbuf
gimp_plug_in_procedure_get_progname
gimp_plug_in_procedure_get_sensitive
gimp_plug_in_procedure_get_stock_id
gimp_plug_in_procedure_get_type
gimp_procedure_execute_async
gimp_procedure_get_arguments
gimp_procedure_get_type
gimp_user_install_free
gimp_user_install_is_migration
gimp_user_install_new
gimp_user_install_run
gimp_user_install_set_log_handler
......@@ -802,3 +789,57 @@ gimp_value_array_truncate
gimp_value_set_drawable
gimp_value_set_image
gimp_value_take_stringarray
gimp_brush_clipboard_new
gimp_guide_get_ID
gimp_guide_get_orientation
gimp_guide_get_position
gimp_guide_get_type
gimp_guide_new
gimp_guide_removed
gimp_guide_set_orientation
gimp_guide_set_position
gimp_image_item_list_flip
gimp_image_item_list_get_list
gimp_image_item_list_rotate
gimp_image_item_list_transform
gimp_image_item_list_translate
gimp_param_spec_get_desc
gimp_pattern_clipboard_new
gimp_plug_in_manager_history_clear
gimp_plug_in_manager_history_remove
gimp_plug_in_procedure_add_menu_path
gimp_plug_in_procedure_find
gimp_plug_in_procedure_get_label
gimp_plug_in_procedure_get_type
gimp_plug_in_procedure_new
gimp_plug_in_procedure_set_file_proc
gimp_plug_in_procedure_set_icon
gimp_plug_in_procedure_set_image_types
gimp_plug_in_procedure_set_mime_type
gimp_plug_in_procedure_set_thumb_loader
gimp_temporary_procedure_get_type
gimp_temporary_procedure_new
gimp_align_reference_type_get_type
gimp_drawable_mask_intersect
gimp_image_arrange_objects
gimp_image_contiguous_region_by_color
gimp_image_coords_in_active_pickable
gimp_image_strong_redo
gimp_image_strong_undo
gimp_item_id_get_type
gimp_item_set_get_type
gimp_palette_import_from_drawable
gimp_plug_in_manager_history_add
gimp_plug_in_manager_history_length
gimp_plug_in_manager_history_nth
gimp_plug_in_manager_history_size
gimp_plug_in_procedure_get_help_id
gimp_plug_in_procedure_get_pixbuf
gimp_plug_in_procedure_get_progname
gimp_plug_in_procedure_get_sensitive
gimp_plug_in_procedure_get_stock_id
gimp_progress_get_window
gimp_select_criterion_get_type
gimp_show_message
gimp_value_set_item
......@@ -30,6 +30,7 @@ PKG_LINK = \
OBJECTS = \
color-history.obj \
gui.obj \
gui-message.obj \
gui-vtable.obj \
session.obj \
splash.obj \
......
......@@ -81,12 +81,9 @@ OBJECTS = \
\
gimppdb.obj \
\
gimp-pdb.obj \
gimp-pdb-compat.obj \
gimppdb-query.obj \
gimppluginprocedure.obj \
gimpprocedure.obj \
gimptemporaryprocedure.obj
INCLUDES = \
-FImsvc_recommended_pragmas.h \
......
......@@ -27,13 +27,16 @@ OBJECTS = \
gimppluginmanager-data.obj \
gimppluginmanager-file.obj \
gimppluginmanager-help-domain.obj \
gimppluginmanager-history.obj \
gimppluginmanager-locale-domain.obj \
gimppluginmanager-menu-branch.obj \
gimppluginmanager-query.obj \
gimpplugin-message.obj \
gimppluginprocedure.obj \
gimppluginprocframe.obj \
gimpplugin-progress.obj \
gimppluginshm.obj \
gimptemporaryprocedure.obj \
\
plug-in-def.obj \
plug-in-enums.obj \
......
......@@ -27,6 +27,7 @@
#include "base/gimplut.h"
#include "base/lut-funcs.h"
#include "core/gimp.h"
#include "core/gimpcontext.h"
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
......
......@@ -28,6 +28,7 @@
#include "base/color-balance.h"
#include "core/gimp.h"
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "core/gimpimagemap.h"
......
......@@ -28,6 +28,7 @@
#include "base/colorize.h"
#include "core/gimp.h"
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "core/gimpimagemap.h"
......
......@@ -28,6 +28,7 @@
#include "base/hue-saturation.h"
#include "core/gimp.h"
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "core/gimpimagemap.h"
......
......@@ -405,8 +405,8 @@ gimp_iscissors_tool_button_press (GimpTool *tool,
options = GIMP_SELECTION_OPTIONS (tool->tool_info->tool_options);
iscissors->x = rint (coords->x);
iscissors->y = rint (coords->y);
iscissors->x = RINT (coords->x);
iscissors->y = RINT (coords->y);
/* If the tool was being used in another image...reset it */
......@@ -705,8 +705,8 @@ gimp_iscissors_tool_motion (GimpTool *tool,
gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
iscissors->x = rint (coords->x);
iscissors->y = rint (coords->y);
iscissors->x = RINT (coords->x);
iscissors->y = RINT (coords->y);
switch (iscissors->state)
{
......@@ -949,8 +949,8 @@ gimp_iscissors_tool_oper_update (GimpTool *tool,
else if (iscissors->connected && iscissors->mask)
{
if (gimp_pickable_get_opacity_at (GIMP_PICKABLE (iscissors->mask),
rint (coords->x),
rint (coords->y)))
RINT (coords->x),
RINT (coords->y)))
{
iscissors->op = ISCISSORS_OP_SELECT;
}
......
......@@ -71,8 +71,6 @@ OBJECTS = \
gimpmeasuretool.obj \
gimpmoveoptions.obj \
gimpmovetool.obj \
gimpnewrectselectoptions.obj \
gimpnewrectselecttool.obj \
gimppaintbrushtool.obj \
gimppaintoptions-gui.obj \
gimppainttool.obj \
......@@ -81,7 +79,9 @@ OBJECTS = \
gimpposterizetool.obj \
gimprectangleoptions.obj \
gimprectangletool.obj \
gimprectselecttool.obj \
gimprectangleselectoptions.obj \
gimprectangleselecttool.obj \
gimpregionselecttool.obj \
gimprotatetool.obj \
gimpscaletool.obj \
gimpselectionoptions.obj \
......
......@@ -50,6 +50,7 @@
#include "gimppropwidgets.h"
#include "gimpuimanager.h"
#include "gimpviewabledialog.h"
#include "gimpwidgets-utils.h"
#include "gimp-intl.h"
......
......@@ -1461,7 +1461,7 @@ xcf_save_tile_rle (XcfInfo *info,
for (i = 0; i < bpp; i++)
{
const guchar *data = tile_data_pointer (tile, 0, 0) + i;
const guchar *data = (guchar *)tile_data_pointer (tile, 0, 0) + i;
gint state = 0;
gint length = 0;
......
CURSOR_LIST = \
cursor_bad cursor-bad.png \
cursor_color_picker cursor-color-picker.png \
\
cursor_corner_top_left cursor-corner-top-left.png \
cursor_corner_top_right cursor-corner-top-right.png \
cursor_corner_bottom_left cursor-corner-bottom-left.png \
cursor_corner_bottom_right cursor-corner-bottom-right.png \
cursor_side_top cursor-side-top.png \
cursor_side_bottom cursor-side-bottom.png \
cursor_side_left cursor-side-left.png \
cursor_side_right cursor-side-right.png \
\
cursor_crosshair cursor-crosshair.png \
cursor_crosshair_small cursor-crosshair-small.png \
cursor_mouse cursor-mouse.png \
......@@ -9,6 +19,7 @@ CURSOR_LIST = \
\
modifier_anchor modifier-anchor.png \
modifier_background modifier-background.png \
modifier_bad modifier-bad.png \
modifier_control modifier-control.png \
modifier_foreground modifier-foreground.png \
modifier_intersect modifier-intersect.png \
......
......@@ -148,6 +148,7 @@ gimp.obj : gimp.c
gimpui_OBJECTS = \
gimpaspectpreview.obj \
gimpbrushmenu.obj \
gimpbrushselectbutton.obj \
gimpdrawablecombobox.obj \
gimpdrawablepreview.obj \
gimpexport.obj \
......@@ -155,14 +156,18 @@ gimpui_OBJECTS = \
gimpfontselect_pdb.obj \
gimpfontselectbutton.obj \
gimpgradientmenu.obj \
gimpgradientselectbutton.obj \
gimpimagecombobox.obj \
gimpmenu.obj \
gimppalettemenu.obj \
gimppaletteselectbutton.obj \
gimppatternmenu.obj \
gimppatternselectbutton.obj \
gimppixbuf.obj \
gimpprocbrowserdialog.obj \
gimpprocview.obj \
gimpprogressbar.obj \
gimpselectbutton.obj \
gimpui.obj \
gimpuimarshal.obj \
gimpzoompreview.obj \
......
......@@ -35,6 +35,7 @@ OBJECTS = \
gimpbase-private.obj \
gimpbasetypes.obj \
gimpchecks.obj \
gimpcpuaccel.obj \
gimpdatafiles.obj \
gimpenv.obj \
gimpmemsize.obj \
......
......@@ -45,6 +45,8 @@ STOCK_VARIABLES = \
stock_color_picker_gray_18 stock-color-picker-gray-18.png \
stock_color_picker_white_18 stock-color-picker-white-18.png \
stock_color_triangle_16 stock-color-triangle-16.png \
stock_colormap_16 stock-colormap-16.png \
stock_colormap_24 stock-colormap-24.png \
stock_convert_grayscale_16 stock-convert-grayscale-16.png \
stock_convert_indexed_16 stock-convert-indexed-16.png \
stock_convert_rgb_16 stock-convert-rgb-16.png \
......@@ -102,8 +104,6 @@ STOCK_VARIABLES = \
stock_image_48 stock-image-48.png \
stock_images_16 stock-images-16.png \
stock_images_24 stock-images-24.png \
stock_indexed_palette_16 stock-indexed-palette-16.png \
stock_indexed_palette_24 stock-indexed-palette-24.png \
stock_info_16 stock-info-16.png \
stock_info_24 stock-info-24.png \
stock_info_64 stock-info-64.png \
......@@ -213,6 +213,8 @@ STOCK_VARIABLES = \
STOCK_TOOL_VARIABLES = \
stock_tool_airbrush_16 tools/stock-tool-airbrush-16.png \
stock_tool_airbrush_22 tools/stock-tool-airbrush-22.png \
stock_tool_align_16 tools/stock-tool-align-16.png \
stock_tool_align_22 tools/stock-tool-align-22.png \
stock_tool_blend_16 tools/stock-tool-blend-16.png \
stock_tool_blend_22 tools/stock-tool-blend-22.png \
stock_tool_blur_16 tools/stock-tool-blur-16.png \
......@@ -290,7 +292,6 @@ STOCK_TOOL_VARIABLES = \
WILBER_VARIABLES = \
stock_wilber_16 stock-wilber-16.png \
stock_wilber_32 stock-wilber-32.png \
stock_wilber_48 stock-wilber-48.png \
stock_wilber_64 stock-wilber-64.png \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment