From f8d14112c477e5428700b43927f1c7fc14691970 Mon Sep 17 00:00:00 2001 From: Hans Breuer Date: Sat, 13 Jan 2007 22:41:21 +0000 Subject: [PATCH] updated #include "file/file-utils.h" for file_utils_uri_display_name 2007-01-13 Hans Breuer * **/makefile.msc app/gimpcore.def : updated * app/display/gimpdisplay-handlers.c : #include "file/file-utils.h" for file_utils_uri_display_name * plug-ins/imagemap/imap_statusbar.c : g_snprintf instead of snprintf svn path=/trunk/; revision=21705 --- ChangeLog | 7 +++++ app/actions/makefile.msc | 8 +++--- app/composite/makefile.msc | 3 ++- app/core/makefile.msc | 2 ++ app/display/gimpdisplay-handlers.c | 2 ++ app/gimpcore.def | 25 ++++++++++++++---- app/makefile.msc | 8 +++--- app/widgets/makefile.msc | 35 +++++++++++++------------ cursors/makefile.msc | 1 + libgimp/makefile.msc | 2 +- libgimpwidgets/makefile.msc | 1 + plug-ins/imagemap/imap_statusbar.c | 2 +- plug-ins/makefile.msc | 41 +++++++++++------------------- themes/Default/images/makefile.msc | 4 +-- 14 files changed, 81 insertions(+), 60 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2de0838418..94108a8f77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-01-13 Hans Breuer + + * **/makefile.msc app/gimpcore.def : updated + * app/display/gimpdisplay-handlers.c : #include "file/file-utils.h" + for file_utils_uri_display_name + * plug-ins/imagemap/imap_statusbar.c : g_snprintf instead of snprintf + 2007-01-13 Sven Neumann * plug-ins/common/displace.c diff --git a/app/actions/makefile.msc b/app/actions/makefile.msc index 1aac593e31..ce54e4364b 100644 --- a/app/actions/makefile.msc +++ b/app/actions/makefile.msc @@ -31,10 +31,10 @@ OBJECTS = \ buffers-commands.obj \ channels-actions.obj \ channels-commands.obj \ - colormap-editor-actions.obj \ - colormap-editor-commands.obj \ context-actions.obj \ context-commands.obj \ + colormap-actions.obj \ + colormap-commands.obj \ cursor-info-actions.obj \ cursor-info-commands.obj \ data-commands.obj \ @@ -80,8 +80,8 @@ OBJECTS = \ plug-in-commands.obj \ quick-mask-actions.obj \ quick-mask-commands.obj \ - sample-point-editor-actions.obj \ - sample-point-editor-commands.obj \ + sample-points-actions.obj \ + sample-points-commands.obj \ select-actions.obj \ select-commands.obj \ templates-actions.obj \ diff --git a/app/composite/makefile.msc b/app/composite/makefile.msc index 19ebbf8b50..13d20d291c 100644 --- a/app/composite/makefile.msc +++ b/app/composite/makefile.msc @@ -47,8 +47,9 @@ INCLUDES = \ all : \ $(PRJ_TOP)\config.h \ $(PACKAGE).lib \ +!IFDEF DLLGIMP $(PACKAGE)-$(PKG_VER).dll - +!ENDIF $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h diff --git a/app/core/makefile.msc b/app/core/makefile.msc index 67b13cb64d..13bb521641 100644 --- a/app/core/makefile.msc +++ b/app/core/makefile.msc @@ -148,6 +148,8 @@ OBJECTS = \ gimptemplate.obj \ gimptoolinfo.obj \ gimptooloptions.obj \ + gimptoolpresets.obj \ + gimp-transform-resize.obj \ gimpundo.obj \ gimpundostack.obj \ gimpunit.obj \ diff --git a/app/display/gimpdisplay-handlers.c b/app/display/gimpdisplay-handlers.c index 1eea4122ee..6f93d1d4cf 100644 --- a/app/display/gimpdisplay-handlers.c +++ b/app/display/gimpdisplay-handlers.c @@ -27,6 +27,8 @@ #include "core/gimp.h" #include "core/gimpimage.h" +#include "file/file-utils.h" + #include "gimpdisplay.h" #include "gimpdisplay-handlers.h" diff --git a/app/gimpcore.def b/app/gimpcore.def index cbddf4c195..8c8adbf953 100644 --- a/app/gimpcore.def +++ b/app/gimpcore.def @@ -29,7 +29,6 @@ EXPORTS curves_init curves_lut_func file_open_image - file_open_layer file_open_with_display file_open_with_proc_and_display file_save @@ -574,11 +573,11 @@ EXPORTS gimp_tool_info_get_type gimp_tool_info_new gimp_tool_info_set_standard - gimp_tool_options_build_filename gimp_tool_options_deserialize gimp_tool_options_get_type gimp_tool_options_reset gimp_tool_options_serialize + gimp_tool_presets_new gimp_transfer_mode_get_type gimp_transform_direction_get_type gimp_transform_matrix_perspective @@ -725,10 +724,9 @@ gimp_viewable_get_size gimp_documents_save gimp_container_clear gimp_dash_pattern_free -gimp_dash_pattern_from_preset +gimp_dash_pattern_new_from_preset gimp_dash_pattern_copy -gimp_dash_pattern_segments_set -gimp_dash_pattern_from_segments +gimp_dash_pattern_new_from_segments gimp_stroke_options_set_dash_pattern boundary_find boundary_sort @@ -879,3 +877,20 @@ gimp_image_undo_get_fadeable gimp_message_severity_get_type gimp_progress_message plug_in_icc_profile_info + +file_open_layers +gimp_brush_core_create_bound_segs +gimp_image_add_layers +gimp_palette_find_entry +gimp_param_int32_get_type +gimp_param_item_id_get_type +gimp_param_string_get_type +gimp_tool_options_create_folder +gimp_tool_options_delete +gimp_tool_presets_get_options +gimp_tool_presets_load +gimp_tool_presets_save +plug_in_icc_profile_file_info + +gimp_dash_pattern_get_type +gimp_dash_pattern_fill_segments diff --git a/app/makefile.msc b/app/makefile.msc index c0a4e687f7..0a7b872052 100644 --- a/app/makefile.msc +++ b/app/makefile.msc @@ -148,15 +148,15 @@ gimp-core-$(PKG_VER).dll : $(GIMP_CORE_OBJECTS) gimpcore.def $(PACKAGE)-$(PKG_VER).dll : $(PKG_LINK) $(OBJECTS) $(PACKAGE).def $(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def -gimp-console.exe : $(OBJECTS) app_procs_console.obj $(PACKAGE).def $(PACKAGE).res $(PKG_LINK) +gimp-console.exe : $(OBJECTS) app_procs_console.obj $(PACKAGE).res $(PKG_LINK) $(CC) $(CFLAGS) -Fegimp-console.exe $(PACKAGE).res app_procs_console.obj $(OBJECTS) $(PKG_LINK) \ gimp-core-$(PKG_VER).lib \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def + user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) -$(PACKAGE).exe : $(OBJECTS) app_procs.obj $(PACKAGE).def $(PACKAGE).res $(PKG_LINK) +$(PACKAGE).exe : $(OBJECTS) app_procs.obj $(PACKAGE).res $(PKG_LINK) $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res app_procs.obj $(OBJECTS) \ gimp-core-$(PKG_VER).lib \ - $(PKG_LINK) user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def + $(PKG_LINK) user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) .c.obj : $(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $< diff --git a/app/widgets/makefile.msc b/app/widgets/makefile.msc index d2f2793955..cdbc00b68a 100644 --- a/app/widgets/makefile.msc +++ b/app/widgets/makefile.msc @@ -47,6 +47,7 @@ OBJECTS = \ gimpcolorframe.obj \ gimpcolormapeditor.obj \ gimpcolorpanel.obj \ + gimpcolorselectorpalette.obj \ gimpcomponenteditor.obj \ gimpcontainerbox.obj \ gimpcontainercombobox.obj \ @@ -54,16 +55,16 @@ OBJECTS = \ gimpcontainerentry.obj \ gimpcontainergridview.obj \ gimpcontainerpopup.obj \ - gimpcontainertreeview.obj \ gimpcontainertreeview-dnd.obj \ - gimpcontainerview.obj \ + gimpcontainertreeview.obj \ gimpcontainerview-utils.obj \ + gimpcontainerview.obj \ gimpcontrollereditor.obj \ gimpcontrollerinfo.obj \ gimpcontrollerkeyboard.obj \ gimpcontrollerlist.obj \ - gimpcontrollerwheel.obj \ gimpcontrollers.obj \ + gimpcontrollerwheel.obj \ gimpcursor.obj \ gimpcursorview.obj \ gimpdasheditor.obj \ @@ -73,8 +74,8 @@ OBJECTS = \ gimpdevices.obj \ gimpdevicestatus.obj \ gimpdialogfactory.obj \ - gimpdnd.obj \ gimpdnd-xds.obj \ + gimpdnd.obj \ gimpdock.obj \ gimpdockable.obj \ gimpdockbook.obj \ @@ -90,8 +91,8 @@ OBJECTS = \ gimpfgbgview.obj \ gimpfiledialog.obj \ gimpfileprocview.obj \ - gimpfontview.obj \ gimpfontselect.obj \ + gimpfontview.obj \ gimpgradienteditor.obj \ gimpgradientselect.obj \ gimpgrideditor.obj \ @@ -101,6 +102,7 @@ OBJECTS = \ gimphistogramview.obj \ gimpimagedock.obj \ gimpimageeditor.obj \ + gimpimageparasiteview.obj \ gimpimageprofileview.obj \ gimpimagepropview.obj \ gimpimageview.obj \ @@ -119,6 +121,7 @@ OBJECTS = \ gimppdbdialog.obj \ gimppixbuf.obj \ gimppluginaction.obj \ + gimpprofilechooserdialog.obj \ gimpprogressbox.obj \ gimpprogressdialog.obj \ gimppropwidgets.obj \ @@ -134,38 +137,38 @@ OBJECTS = \ gimptemplateview.obj \ gimptexteditor.obj \ gimpthumbbox.obj \ - gimptoolbox.obj \ - gimptoolbox-dnd.obj \ gimptoolbox-color-area.obj \ + gimptoolbox-dnd.obj \ gimptoolbox-image-area.obj \ gimptoolbox-indicator-area.obj \ + gimptoolbox.obj \ gimptooldialog.obj \ gimptooloptionseditor.obj \ gimptoolview.obj \ gimpuimanager.obj \ - gimpunitcombobox.obj \ gimpundoeditor.obj \ + gimpunitcombobox.obj \ gimpunitstore.obj \ gimpvectorstreeview.obj \ - gimpview.obj \ - gimpview-popup.obj \ gimpviewablebox.obj \ gimpviewablebutton.obj \ gimpviewabledialog.obj \ - gimpviewrenderer.obj \ gimpviewrenderer-frame.obj \ - gimpviewrenderer-utils.obj \ - gimpviewrendererbrush.obj \ + gimpviewrenderer.obj \ gimpviewrendererbuffer.obj \ - gimpviewrendererdrawable.obj \ - gimpviewrenderergradient.obj \ - gimpviewrendererpalette.obj \ gimpviewrendererimage.obj \ gimpviewrendererimagefile.obj \ gimpviewrendererlayer.obj \ + gimpviewrendererpalette.obj \ gimpviewrenderervectors.obj \ gimpwidgets-constructors.obj \ gimpwidgets-utils.obj \ + gimpview-popup.obj \ + gimpview.obj \ + gimpviewrenderer-utils.obj \ + gimpviewrendererbrush.obj \ + gimpviewrendererdrawable.obj \ + gimpviewrenderergradient.obj \ gtkhwrapbox.obj \ gtkvwrapbox.obj \ gtkwrapbox.obj \ diff --git a/cursors/makefile.msc b/cursors/makefile.msc index ef7dc0f366..aa0d50b7a2 100644 --- a/cursors/makefile.msc +++ b/cursors/makefile.msc @@ -1,6 +1,7 @@ CURSOR_LIST = \ cursor_bad cursor-bad.png \ cursor_color_picker cursor-color-picker.png \ + cursor_move cursor-move.png \ \ cursor_corner_top_left cursor-corner-top-left.png \ cursor_corner_top_right cursor-corner-top-right.png \ diff --git a/libgimp/makefile.msc b/libgimp/makefile.msc index 9f1b8fd3d3..de1a7d19b4 100644 --- a/libgimp/makefile.msc +++ b/libgimp/makefile.msc @@ -149,7 +149,6 @@ gimpui_OBJECTS = \ gimpaspectpreview.obj \ gimpbrushmenu.obj \ gimpbrushselectbutton.obj \ - gimpdrawablecombobox.obj \ gimpdrawablepreview.obj \ gimpexport.obj \ gimpfontmenu.obj \ @@ -158,6 +157,7 @@ gimpui_OBJECTS = \ gimpgradientmenu.obj \ gimpgradientselectbutton.obj \ gimpimagecombobox.obj \ + gimpitemcombobox.obj \ gimpmenu.obj \ gimppalettemenu.obj \ gimppaletteselectbutton.obj \ diff --git a/libgimpwidgets/makefile.msc b/libgimpwidgets/makefile.msc index e0fee1bc29..3430e32a43 100644 --- a/libgimpwidgets/makefile.msc +++ b/libgimpwidgets/makefile.msc @@ -70,6 +70,7 @@ OBJECTS = \ gimppreviewarea.obj \ gimppreview.obj \ gimppropwidgets.obj \ + gimpratioentry.obj \ gimpscrolledpreview.obj \ gimpquerybox.obj \ gimpresolutionentry.obj \ diff --git a/plug-ins/imagemap/imap_statusbar.c b/plug-ins/imagemap/imap_statusbar.c index 42c1c10a65..b965d2bad2 100644 --- a/plug-ins/imagemap/imap_statusbar.c +++ b/plug-ins/imagemap/imap_statusbar.c @@ -131,7 +131,7 @@ statusbar_set_dimension(StatusBar_t *statusbar, gint w, gint h) { gchar scratch[16]; - snprintf (scratch, sizeof (scratch), "%d × %d", (gint) w, (gint) h); + g_snprintf (scratch, sizeof (scratch), "%d × %d", (gint) w, (gint) h); gtk_entry_set_text(GTK_ENTRY(statusbar->dimension), scratch); } diff --git a/plug-ins/makefile.msc b/plug-ins/makefile.msc index 85c76784ee..57c24e4223 100644 --- a/plug-ins/makefile.msc +++ b/plug-ins/makefile.msc @@ -38,13 +38,13 @@ COMMON2 = decompose deinterlace depthmerge despeckle destripe dicom diffraction COMMON3 = gauss gbr gee gee_zoom gif gifload gih glasstile glob gqbist gradmap grid gtm guillotine header hot illusion iwarp jigsaw laplace lcms lens lic COMMON4 = mapcolor max_rgb mblur mosaic neon newsprint nlfilt noisify normalize nova oilify papertile pat pcx photocopy pix pixelize plasma png pnm polar postscript psd psd_save psp randomize raw redeye retinex ripple rotate COMMON5 = sample_colorize scatter_hsv screenshot sel_gauss semiflatten sharpen shift sinus smooth_palette snoise sobel softglow sparkle spheredesigner spread struc sunras tga threshold_alpha tiff -COMMON6 = tile tileit tiler uniteditor unsharp video vinvert vpropagate warp waves webbrowser whirlpinch wind wiredebug xbm xwd zealouscrop -COMMON7 = winprint winclipboard +COMMON6 = tile tileit tiler uniteditor unsharp video vinvert vpropagate warp waves webbrowser whirlpinch wind xbm xwd zealouscrop +COMMON7 = winprint winclipboard wiredebug NOTNOW = wmf svg # These have own subdirectories each -SEPARATE = FractalExplorer Lighting MapObject bmp faxg3 fits flame gfig gflare gfli gimpressionist help helpbrowser ifscompose imagemap jpeg maze metadata pagecurl rcm sel2path sgi twain winicon winsnap xjt +SEPARATE = FractalExplorer Lighting MapObject bmp faxg3 fits flame gfig gflare gfli gimpressionist ifscompose imagemap jpeg maze metadata pagecurl rcm sel2path sgi twain winicon winsnap xjt print help helpbrowser # These are unofficial, ie not in the CVS. To build these, you should # get tml's source snapshot and copy this makefile to the @@ -130,11 +130,11 @@ separate-plugins-clean : sub-separate-plugins : - for %d in ($(SEPARATE)) do nmake -nologo -f makefile.msc sub-one-separate DIR=%d TARGET=$(TARGET) # We must handle script-fu separately because of the dash, sigh @cd script-fu @nmake -nologo -f ..\makefile.msc GIMPTOP=..\.. PLUGIN=script-fu EXTRA_script_fu=1 $(TARGET) @cd .. + for %d in ($(SEPARATE)) do nmake -nologo -f makefile.msc sub-one-separate DIR=%d TARGET=$(TARGET) sub-one-separate : @@ -266,8 +266,7 @@ OBJECTS = \ !IFDEF EXTRA_faxg3 OBJECTS = \ faxg3.obj \ - g3.obj \ - run_tbl.obj + g3.obj !ENDIF !IFDEF EXTRA_fits @@ -306,8 +305,7 @@ STOCK_VARS = \ stock_spiral images/stock-spiral.png \ stock_star images/stock-star.png \ stock_select_object images/stock-select-object.png \ - stock_show_all images/stock-show-all.png \ - stock_logo images/stock-logo.png + stock_show_all images/stock-show-all.png STOCK_IMAGES = \ images/stock-bezier.png \ @@ -357,26 +355,20 @@ OBJECTS = \ !IFDEF EXTRA_imagemap STOCK_VARS = \ - stock_arrow images/stock-arrow.png \ stock_circle images/stock-circle.png \ stock_coord images/stock-coord.png \ stock_dimension images/stock-dimension.png \ stock_java images/stock-java.png \ - stock_link images/stock-link.png \ - stock_map_info images/stock-map-info.png \ stock_polygon images/stock-polygon.png \ stock_rectangle images/stock-rectangle.png \ stock_to_back images/stock-to-back.png \ stock_to_front images/stock-to-front.png \ STOCK_IMAGES = \ - images/stock-arrow.png \ images/stock-circle.png \ images/stock-coord.png \ images/stock-dimension.png \ images/stock-java.png \ - images/stock-link.png \ - images/stock-map-info.png \ images/stock-polygon.png \ images/stock-rectangle.png \ images/stock-to-back.png \ @@ -543,10 +535,10 @@ EXTRALIBS = $(PNG_LIBS) !IFDEF EXTRA_print OBJECTS = \ print.obj \ - print-escp2.obj \ - print-pcl.obj \ - print-ps.obj \ - print-util.obj + print-draw-page.obj \ + print-page-layout.obj \ + print-settings.obj +EXTRALIBS = $(CAIRO_LIBS) !ENDIF !IFDEF EXTRA_gnomeprint @@ -599,7 +591,7 @@ OBJECTS = \ EXTRALIBS = tinyscheme\tinyscheme.lib re\re.lib ftx\ftx.lib kernel32.lib wsock32.lib EXTRACFLAGS = -DREGEX_MALLOC -DUSE_INTERFACE -HAVE_RESOURCE = YES +#HAVE_RESOURCE = YES !ENDIF !IFDEF EXTRA_sel2path @@ -641,11 +633,6 @@ OBJECTS = \ !IFDEF EXTRA_gimpressionist -gimpressionist.c: logo-pixbuf.h - -logo-pixbuf.h: logo.png - gdk-pixbuf-csource --rle --name=logo_data logo.png > $(@F) - EXTRALIBS = $(GTK2_LIBS) OBJECTS = \ @@ -671,8 +658,10 @@ OBJECTS = \ !IFDEF EXTRA_help OBJECTS = \ - locales.obj \ - domain.obj \ + gimphelp.obj \ + gimphelpdomain.obj \ + gimphelpitem.obj \ + gimphelplocale.obj \ help.obj TEST_OBJECTS = \ gimp-help-lookup.obj diff --git a/themes/Default/images/makefile.msc b/themes/Default/images/makefile.msc index 460885f273..509fac5da0 100644 --- a/themes/Default/images/makefile.msc +++ b/themes/Default/images/makefile.msc @@ -165,8 +165,8 @@ STOCK_VARIABLES = \ stock_portrait_16 stock-portrait-16.png \ stock_print_resolution_16 stock-print-resolution-16.png \ stock_print_resolution_24 stock-print-resolution-24.png \ - stock_quick_mask_off_16 stock-quick-mask-off-16.png \ - stock_quick_mask_on_16 stock-quick-mask-on-16.png \ + stock_quick_mask_off_12 stock-quick-mask-off-12.png \ + stock_quick_mask_on_12 stock-quick-mask-on-12.png \ stock_question_64 stock-question-64.png \ stock_reset_16 stock-reset-16.png \ stock_reshow_filter_16 stock-reshow-filter-16.png \