From 03b3f8c90fb907a16d4633f67840e2013d36f1f6 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Tue, 20 Jul 2004 14:33:22 +0000 Subject: [PATCH] app/app_procs.c app/base/base.[ch] pass "be_verbose" to the base and 2004-07-20 Sven Neumann * app/app_procs.c * app/base/base.[ch] * app/composite/gimp-composite.[ch]: pass "be_verbose" to the base and composite subsystems. --- ChangeLog | 7 +++++++ app/app_procs.c | 3 ++- app/base/base.c | 3 ++- app/base/base.h | 1 + app/composite/gimp-composite.c | 6 ++++-- app/composite/gimp-composite.h | 12 +++++++----- 6 files changed, 23 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 736950a2ad..ea13018899 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-07-20 Sven Neumann + + * app/app_procs.c + * app/base/base.[ch] + * app/composite/gimp-composite.[ch]: pass "be_verbose" to the base + and composite subsystems. + 2004-07-20 Sven Neumann * autogen.sh: added some empty lines to improve readability of the diff --git a/app/app_procs.c b/app/app_procs.c index 12d6694812..11ab842029 100644 --- a/app/app_procs.c +++ b/app/app_procs.c @@ -252,7 +252,8 @@ app_run (const gchar *full_prog_name, gimp_load_config (gimp, alternate_system_gimprc, alternate_gimprc); /* initialize lowlevel stuff */ - swap_is_ok = base_init (GIMP_BASE_CONFIG (gimp->config), use_cpu_accel); + swap_is_ok = base_init (GIMP_BASE_CONFIG (gimp->config), + be_verbose, use_cpu_accel); #ifndef GIMP_CONSOLE_COMPILATION if (! no_interface) diff --git a/app/base/base.c b/app/base/base.c index 141aea2ac4..7d4e1e287b 100644 --- a/app/base/base.c +++ b/app/base/base.c @@ -60,6 +60,7 @@ static void base_tile_cache_size_notify (GObject *config, gboolean base_init (GimpBaseConfig *config, + gboolean be_verbose, gboolean use_cpu_accel) { gchar *swapfile; @@ -98,7 +99,7 @@ base_init (GimpBaseConfig *config, swap_is_ok = tile_swap_test (); - gimp_composite_init (use_cpu_accel); + gimp_composite_init (be_verbose, use_cpu_accel); paint_funcs_setup (); diff --git a/app/base/base.h b/app/base/base.h index 8149814138..7d0f21b665 100644 --- a/app/base/base.h +++ b/app/base/base.h @@ -20,6 +20,7 @@ #define __BASE_H__ gboolean base_init (GimpBaseConfig *config, + gboolean be_verbose, gboolean use_cpu_accel); void base_exit (void); diff --git a/app/composite/gimp-composite.c b/app/composite/gimp-composite.c index 3718c644eb..60885a456a 100644 --- a/app/composite/gimp-composite.c +++ b/app/composite/gimp-composite.c @@ -343,6 +343,7 @@ gimp_composite_pixelformat_astext (GimpPixelFormat format) /** * gimp_composite_init: + * @be_verbose: whether to be verbose on stdout * @use_cpu_accel: whether to use accelerated routines like MMX * * Initialise the Gimp Compositing subsystem. This includes checking @@ -351,7 +352,8 @@ gimp_composite_pixelformat_astext (GimpPixelFormat format) * are supported by the current cpu/hardware. **/ void -gimp_composite_init (gboolean use_cpu_accel) +gimp_composite_init (gboolean be_verbose, + gboolean use_cpu_accel) { const gchar *p; @@ -365,7 +367,7 @@ gimp_composite_init (gboolean use_cpu_accel) #ifdef GIMP_UNSTABLE g_printerr ("gimp_composite: use=%s, verbose=%s\n", - (gimp_composite_options.bits & GIMP_COMPOSITE_OPTION_USE) ? "yes" : "no", + (gimp_composite_options.bits & GIMP_COMPOSITE_OPTION_USE) ? "yes" : "no", (gimp_composite_options.bits & GIMP_COMPOSITE_OPTION_VERBOSE) ? "yes" : "no"); #endif diff --git a/app/composite/gimp-composite.h b/app/composite/gimp-composite.h index eb588f17a1..377132cc9d 100644 --- a/app/composite/gimp-composite.h +++ b/app/composite/gimp-composite.h @@ -157,12 +157,14 @@ struct GimpCompositeOptions extern struct GimpCompositeOptions gimp_composite_options; -extern void gimp_composite_init (gboolean use_cpu_accel); -extern void gimp_composite_dispatch (GimpCompositeContext *ctx); +void gimp_composite_init (gboolean be_verbose, + gboolean use_cpu_accel); -extern void gimp_composite_context_print (GimpCompositeContext *ctx); -extern const gchar * gimp_composite_mode_astext (GimpCompositeOperation op); -extern const gchar * gimp_composite_pixelformat_astext (GimpPixelFormat format); +void gimp_composite_dispatch (GimpCompositeContext *ctx); + +void gimp_composite_context_print (GimpCompositeContext *ctx); +const gchar * gimp_composite_mode_astext (GimpCompositeOperation op); +const gchar * gimp_composite_pixelformat_astext (GimpPixelFormat format); extern const gchar *gimp_composite_function_name[GIMP_COMPOSITE_N][GIMP_PIXELFORMAT_N][GIMP_PIXELFORMAT_N][GIMP_PIXELFORMAT_N]; extern void (*gimp_composite_function[GIMP_COMPOSITE_N][GIMP_PIXELFORMAT_N][GIMP_PIXELFORMAT_N][GIMP_PIXELFORMAT_N])(GimpCompositeContext *);