Commit graph

457 commits

Author SHA1 Message Date
Michael Natterer
9096ceffde modules: honor GimpColorConfig.display_profile_from_gdk again
I broke this during some recent refactoring.
2015-05-30 01:06:25 +02:00
Michael Natterer
d3e11c5b2c modules, libgimpwidgets: use gimp_color_managed_get_color_profile()
which always returns a profile, instead of code that uses the ICC
blob and falls back to GimpColorConfig's profile, then falls back
to the built-in profiles.
2015-05-27 12:53:46 +02:00
Michael Natterer
394bc25be1 libgimpwidgets: return the formats from gimp_widget_get_color_transform()
Turn the src_format and dest_formats into "const Babl **" and make
them return the actually used formats. Change the lcms display module
accordingly.
2015-05-11 00:45:18 +02:00
Michael Natterer
064cdaa923 modules: use the new function in the lcms display filter 2015-05-09 01:24:22 +02:00
Michael Natterer
cbb82ae5da modules: get the profile of the widget's toplevel
so we are in sync with GimpWindow::monitor-changed().
2015-05-08 00:50:07 +02:00
Michael Natterer
ed3f2daac2 modules: use the new API in the lcms display filter, and some cleanup 2015-05-06 22:21:13 +02:00
Michael Natterer
6c800db1cc Use the newly added profile utility functions all over the place 2015-05-06 16:38:57 +02:00
Michael Natterer
fa070d4cf9 modules: plug leak in color-selector-cmyk
Don't leak the RGB profile if the CMYK profile can't be loaded
2014-10-06 20:29:58 +02:00
Michael Natterer
b5530e9e3d Use the new GeglAccessMode enum instead of the old values 2014-07-02 02:00:35 +02:00
Michael Natterer
65a65947d9 app, libgimp: replace GTK_STOCK_FOO by icon names
unless it's a stock ID used for an action button, will address that
later.
2014-05-11 22:49:22 +02:00
Michael Natterer
4b629e984b libgimpwidgets: add GimpColorDisplayClass::icon_name
and deprecate its stock_id.
2014-05-10 11:53:07 +02:00
Michael Natterer
1ec64abb8b libgimpwidgets: add GimpColorSelectorClass::icon_name
and deprecate its stock_id.
2014-05-10 08:34:42 +02:00
Michael Natterer
9331ef2456 libgimpwidgets: change GimpController's stock_id to icon_name
This API change is OK since the entire controller API is marked as
unstable and needs a special #define to be visible at all.
2014-05-09 09:19:06 +02:00
Rickard
5ec413a5e8 Bug 729326 - Errors found using a static code analysis program cppcheck
Fixed some memory and file leaks. And removed some code and variables
that are not used.
2014-05-05 10:34:08 +02:00
Michael Henning
b34fbb21fc modules: Add missing include.
614c61a3dd removed the #include <glib.h>,
which is needed for the #ifdef G_OS_WIN32 to work.
2014-04-15 19:17:57 -04:00
Michael Natterer
614c61a3dd Don't #include <glib.h> before <lcms.h>
The include claimed to be because of "inline" in the lcms header, but
that was probably lcms1, since there is no trace of inline in the
lcms2 header.
2014-04-10 20:48:22 +02:00
Michael Natterer
661317f74c libgimpwidgets: make using GimpColorProfileComboBox easier
If the passed dialog is a GimpColorProfileChooserDialog, handle its
"response" signal automatically and also destroy it when the combo box
is destroyed (before we leaked all dialogs). Remove the same callback
from all places using GimpColorProfileComboBox.
2014-04-04 17:09:54 +02:00
Michael Natterer
3f826d02fa libgimpwidgets: make GimpColorProfileComboBox use lcms
and improve gimp_color_profile_combo_box_set_active() to get the
profile's label from the ICC file if no label was provided. Simplifies
all its callers and removes code duplication.
2014-04-02 13:03:52 +02:00
Michael Natterer
d7037650df libgimpcolor: add gimp_lcms_profile_get_label()
which returns a string meant to label the profile in the GUI, it's
either the profile's description, its model, or "(unnamed profile)" as
a fallback. Use the function instead of duplicating that logic
inconsistently and imcompletely all over the place.
2014-03-30 03:12:42 +02:00
Michael Natterer
32e47cf70d libgimpcolor: add gimp_lcms_profile_is_equal()
and remove all of our own MD5 digest code and API. is_equal() uses
lcms' own MD5 API which I missed before. Thanks Elle for pointing that
out :)
2014-03-29 10:40:47 +01:00
Michael Natterer
b3395d989e libgimpcolor: return an optional MD5 digest from gimp_lcms_create_srgb_profile()
pass NULL in most places, use the feature in the lcms.c plu-gin.
2014-03-23 23:34:47 +01:00
Michael Natterer
191b2aa2e8 modules: verify that GimpColorConfig.rgb_profile is actually for RGB 2014-03-23 21:16:39 +01:00
Michael Natterer
251dd91395 modules: fix memory leaks in color-selector-cmyk.c
Also clean up a bit and make the profile label's tooltip show
the profile's summary.
2014-03-16 15:57:14 +01:00
Michael Natterer
ebc53672cb libgimpcolor: add gimp_lcms_profile_is_rgb() and _is_cmyk()
And change all lcms code to use it.
2014-03-15 21:47:13 +01:00
Michael Natterer
a277a5b66f modules: don't use CamelCase variable names in display-filter-proof.c 2014-03-15 21:47:13 +01:00
Michael Natterer
89b489b9bb modules, plug-ins: use GimpColorProfileChooserDialog
instead of selfmade file choosers for picking color profiles from
disk.
2014-03-14 23:02:14 +01:00
Michael Natterer
ceb31cc02e modules: use gimp_lcms_profile_get_summary() in the lcms display filter 2014-03-14 20:26:15 +01:00
Michael Natterer
eee6fa1e4b libgimpcolor: start adding profile utility functions to gimplcms.[ch]
Add functions to get a profile's description, manufacturer, model and
copyright, and use them instead of implementing the same 10 times.

Also add a GimpColorProfile typedef which avoids both having to
include lcms globally or using a gpointer instead (which looks bad and
non-descriptive in an API).
2014-03-14 01:48:39 +01:00
Michael Natterer
f078cc5992 modules: make display-filter-lcms.c find the right monitor...
...when its GimpColorManaged's GdkWindow exists but is hidden, which
happens for all but the active tab of a single window with multiple
images open.
2014-03-13 22:39:03 +01:00
Elle Stone
05c5ca3216 Bug 723787 - Neutral sRGB profile matching Argyllcms sRGB.icm
Add gimp_lcms_create_srgb_profile() to libgimpcolor and use it where
we used to call cmsCreate_sRGBProfile().
2014-02-09 23:10:56 +01:00
Michael Natterer
84c132addc Bug 721553 - License text contains obsolete FSF postal address
These files were forgotten when changing license from GPL2 to GPL3.
2014-01-05 14:25:46 +01:00
Elle Stone
a4821914d3 Bug 720045 - Add black point compensation to Preferences/Color Management
Make black point compensation configurable separately for both proof
and display.
2013-12-09 02:23:31 +01:00
Nils Philippsen
1bb379c3f5 gimpcolorwheel: comment out ineffectual code 2013-11-07 12:20:34 +01:00
Nils Philippsen
c028580ae0 color-selector-cmyk: avoid freeing uninitialized pointer 2013-11-07 12:20:33 +01:00
Michael Natterer
48582d4d6a modules: silence defined but not used warning in color-selector-water.c
by uselessly calling colorsel_water_get_type().
2013-11-04 22:09:57 +01:00
Hartmut Kuhse
7027d3cb13 modules: include <gegl.h> in controller-dx-dinput.c
when we include "libgimpwidgets/gimpwidgets.h"
2013-11-04 21:25:22 +01:00
Michael Natterer
71b189e4da modules: rename color-selector-cmyk-lcms.c to color-selector-cmyk.c
overwriting the old color-selector-cmyk.c
2013-11-03 22:06:51 +01:00
Michael Natterer
7bd4d2678a configure, plug-ins, modules: make lcms a hard dependency 2013-11-03 21:19:51 +01:00
Michael Natterer
ae9d8c72bc modules: add GEGL_LIBS to display_filter_libadd 2013-11-03 15:33:40 +01:00
Michael Natterer
337c1fe4bf modules: port the proof display filter to convert_buffer() 2013-11-02 14:53:48 +01:00
Michael Natterer
73f5e2c21a modules: remove the old convert_surface() from gamma and high contrast 2013-11-02 14:47:54 +01:00
Michael Natterer
e96b1db023 modules: implement convert_buffer() in the color blind display filter 2013-11-02 14:43:47 +01:00
Michael Natterer
78706f7796 modules: implement convert_buffer() in the lcms display filter 2013-11-02 03:02:09 +01:00
Michael Natterer
fcd457e67b modules: implement convert_buffer() in the gamma display filter 2013-11-02 01:51:05 +01:00
Michael Natterer
a04c442e69 modules: implement convert_buffer() in the high contrast display filter 2013-11-02 01:38:50 +01:00
Michael Natterer
a5d4f3ae04 modules: also include <gegl.h> when we include "libgimpwidgets/gimpwidgets.h 2013-11-01 22:30:36 +01:00
Jehan
3838a8cebb modules: small tabs replacement into spaces. 2013-09-21 18:17:34 +12:00
Michael Natterer
2cd25ec863 modules: turn GimpColorWheel into a proper dynamically loaded type
So it works with all GObject versions, until we determine how useful
it is generally, and what API it should get for possible
libgimpwidgets inclusion.
2013-07-14 13:41:29 +02:00
Michael Natterer
ec786816bb */Makefile.am: merge INCLUDES into AM_CPPFLAGS
automake-1.13 finally warns about this anachronism.
2013-06-05 20:48:37 +02:00
Michael Natterer
3c006d0a4f modules: make all get_type() functions static 2013-01-17 20:57:50 +01:00
Michael Natterer
9f610ef3cf modules: use G_DEFINE_DYNAMIC_TYPE() in color-selector-cmyk-lcms 2013-01-17 20:56:58 +01:00
Michael Natterer
632c577f18 Bug 689371 - GIMP uses deprecated GtkHSV widget
Swallow GtkHSV back into GIMP and call it GimpColorWheel. Keep it in
modules/ for the time being. Clean up and undeprecate it. Replace
set_metrics() API by set_ring_fraction() and make it follow the size
of its parent container, making its use straightforward. Kept it clean
of GIMP color types so it can be easily adapted by e.g. Inkscape.
2013-01-06 02:56:59 +01:00
Michael Natterer
2d6a880b12 Bug 662739 - Port to lcms2 for icc V4 profile support
Apply patch from Laurent Martelli which multiplies the out-of-gammut
color components by 256 to match the new 16 bit lcms data type.
2012-10-24 18:19:33 +02:00
Sven Neumann
3cb7f05e73 modules: mark new string for translation 2012-09-25 22:15:34 +02:00
Michael Natterer
e8b24abbf7 modules: say "(unnamed profile)" when a color profile provides no name
inatead of showing an empty label
2012-09-25 20:56:05 +02:00
Kevin Cozens
a2e037fb00 Corrected spelling errors spotted by Ari Pollak (Mostly fixes bug #683694)
Still need to address the "allows to" grammatical error.
2012-09-10 12:22:12 -04:00
Michael Natterer
8bbfc9e5cf Bug 675558 - switch from lcms-1 to lcms-2
Applied modified patch from Hartmut Kuhse which ports to lcms-2.
2012-09-03 20:03:53 +02:00
Kristian Rietveld
9514cf4871 Avoid using CMFlattenProfile
This symbol is not available to 64-bit applications.  So put another
approach in place.

I can confirm that the code does not crash, but I do not know if it
works properly.  Mitch forced me to push anyway.
2012-06-09 22:47:01 +02:00
Michael Natterer
3ad73b3658 libgimpcolor: add GdkPixbuf <-> GeglBuffer utility functions
and update tons of includes in libgimp and app.
2012-05-03 03:37:20 +02:00
Michael Natterer
2b2315deea modules: forgot one #include <babl/babl.h> 2012-05-02 17:50:54 +02:00
Michael Natterer
3e119c5af7 libgimpcolor: add gimp_rgb[a]_set,get_pixel()
which converts from/to any pixel format using Babl. Added tons of
includes and CFLAGS now that libgimpcolor publically uses Babl.
2012-05-02 17:50:43 +02:00
Michael Natterer
056e09a6cb Remove the makefile.msc build system, it is unmaintained since 2008 2011-12-16 15:53:56 +01:00
Michael Natterer
19b9bfd189 libgimpwidgets: add gtk_scale_new() to gimp3migration.[ch]
and use it all over the place. Also change some GtkObject* variables
to GtkAdjustment*.
2011-10-02 14:36:41 +02:00
Michael Natterer
4373dccdc1 modules: use gtk_box_new() 2011-09-30 11:00:22 +02:00
Michael Natterer
3b6ab5a48c Bug 660067 - GIMP crashes after Wacom tablet's hot unplug
Don't call gimp_input_device_store_lookup() with a NULL name. Unplug
seems broken because we always get name == NULL, I need to fix this
but at least it doesn't crash any longer (and the fix is generally
correct and not a workaround).
2011-09-26 22:35:45 +02:00
Michael Natterer
ce4ab710f6 modules: gimp_input_device_store_add(): bail out if the device has no parent 2011-06-26 23:39:05 +02:00
Michael Natterer
f1bb40166b Bug 592364 - Use GUdev rather than deprecated HAL for GIMP
GIMP was probably the only user of libhal on most systems, this had
to stop. Ported the linux-input module to GUdev.
2011-06-23 16:30:58 +02:00
Michael Natterer
cccddce106 modules: fix indentation in controller-dx-dinput.c 2011-06-23 16:26:55 +02:00
Michael Natterer
cc47b2a600 libgimpwidgets/color: move the cairo color utility functions to libgimpcolor
Add CAIRO_CFLAGS to a lot of Makefiles to make this possible, and
because they pull in cairo via the libgimp headers.
2011-04-28 15:50:39 +02:00
Omari Stephens
5cae0bf65c Bug 630748 - display filters do not work
Create and use Cairo-compatible API for display filters. Also
includes logic changes to the display filters to deal with cairo's
ARGB32 pre-multiplied buffer format.
2011-01-25 20:24:42 +01:00
Michael Natterer
7b320c7bf6 Get rid of DOS line endings 2010-11-21 16:09:09 +01:00
Nelson A. de Oliveira
7666e5cf36 Fix memory and descriptor leaks 2010-11-12 21:56:17 +01:00
Michael Natterer
1f398549e2 modules: add size-request workaround that is not needed any longer 2010-10-31 16:15:33 +01:00
Michael Natterer
62c4387a26 modules: port ColorselWater drawing to cairo 2010-08-09 00:14:35 +02:00
Sven Neumann
e14c50aaef Bug 623169 - Memory leaks in GIMP
Plug leak by allocating the data on the stack.
2010-07-15 21:42:58 +02:00
Michael Natterer
fe97de2a68 modules: forgot to port this one to GSEAL_ENABLE 2010-02-09 22:42:20 +01:00
Michael Natterer
659cf3743e Bug 593848 - FG color changed to black when FG-BG Editor tab created
When a color gets set on the module via GimpColorSelector::set_color(),
make sure that the result of its transformation to CMYK doesn't
get set back on GIMP. Also, when the color profile changes, make
sure we only re-transform the RGB value to CMYK and don't set that
result back on GIMP either.
2009-11-08 14:22:26 +01:00
Michael Natterer
11039a0436 Build with GSEAL_ENABLE 2009-10-17 18:58:28 +02:00
Michael Natterer
43ab261c45 Use gtk_widget_get_window() instead of widget->window 2009-10-09 21:19:08 +02:00
Michael Natterer
834373eba7 Use GtkAdjustment's accessors 2009-10-09 21:19:08 +02:00
Michael Natterer
06f55eb856 Use gtk_widget_get_window() instead of widget->window 2009-10-09 21:19:07 +02:00
Michael Natterer
e61a74b938 Use gtk_adjustment_get_value() instead of adjustment->value 2009-10-09 21:19:07 +02:00
Michael Natterer
5b024cf3ed remove GTK+ version check and related evilness because we depend on a
2009-03-22  Michael Natterer  <mitch@gimp.org>

	* modules/color-selector-wheel.c: remove GTK+ version check and
	related evilness because we depend on a proper GKT+ version now.


svn path=/trunk/; revision=28195
2009-03-22 18:18:30 +00:00
Martin Nordholts
4d7a6b10d1 Added .gitignore files generated with git svn create-ignore.
svn path=/trunk/; revision=27972
2009-01-31 11:37:44 +00:00
Michael Natterer
d9b5207aa2 Change licence to GPLv3 (and to LGPLv3 for libgimp).
2009-01-17  Michael Natterer  <mitch@gimp.org>

	* all files with a GPL header and all COPYING files:

	Change licence to GPLv3 (and to LGPLv3 for libgimp).

	Cleaned up some copyright headers and regenerated the parsers in
	the ImageMap plugin.


svn path=/trunk/; revision=27913
2009-01-17 22:28:01 +00:00
Sven Neumann
7fa22ebf17 added GIMP_MODULE_ERROR domain.
2008-11-12  Sven Neumann  <sven@gimp.org>

	* libgimpmodule/gimpmodule.[ch]: added GIMP_MODULE_ERROR domain.

	* modules/gimpinputdevicestore-hal.c
	* modules/gimpinputdevicestore-dx.c
	* modules/controller-dx-dinput.c: use GIMP_MODULE_ERROR as error
	domain instead of 0.


svn path=/trunk/; revision=27629
2008-11-12 11:19:31 +00:00
Hans Breuer
d94419a9fd updated include <string.h> for memcmp() include <string.h> for strcmp()
2008-10-03  Hans Breuer  <hans@breuer.org>

	* **/makefie.msc gimpdefs.msc app/gimpcore.def : updated
	* app/core/gimpcurve.c : include <string.h> for memcmp()
	* app/gegl/gimpcurvesconfig.c : include <string.h> for strcmp()

svn path=/trunk/; revision=27118
2008-10-03 19:27:54 +00:00
Michael Natterer
e29f73f2a3 Bug 553530 – fatal error: Segmentation fault - when attempting to bring
2008-09-25  Michael Natterer  <mitch@gimp.org>

	Bug 553530 – fatal error: Segmentation fault - when attempting to
	bring up color-picker:

	* modules/color-selector-wheel.c: declare gtk_hsv_get_type() if
	not already done by GTK+. Fixes confusion about its return value
	being 32 or 64 bit on 64 bit machines.


svn path=/trunk/; revision=27054
2008-09-25 12:50:33 +00:00
Michael Natterer
78479cd418 Bug 549195 – Color Wheel not working (GtkHSV):
2008-09-25  Michael Natterer  <mitch@gimp.org>

	Bug 549195 – Color Wheel not working (GtkHSV):

	* modules/color-selector-wheel.c: change packing and size requests
	of the GtkHSV and its optional GtkAligmnent depending on the GTK+
	version used to make it work with both the old and the new version
	of the widget. Evil hacks, better don't look :)


svn path=/trunk/; revision=27053
2008-09-25 12:11:02 +00:00
Michael Natterer
435f6e3974 app/display/gimpdisplayshell-callbacks.c libgimpwidgets/gimpcolorselect.c
2008-09-03  Michael Natterer  <mitch@gimp.org>

	* app/display/gimpdisplayshell-callbacks.c
	* libgimpwidgets/gimpcolorselect.c
	* modules/color-selector-water.c
	* plug-ins/ifs-compose/ifs-compose.c: instead of using
	gdk_window_get_pointer() if GdkEventMotion::is_hint is TRUE,
	simply always use the coords from the event and call
	gdk_event_request_motions() to ask for more motion events. This is
	the recommended way and also works for events from devices other
	than the core pointer.

	* plug-ins/ifs-compose/ifs-compose.c (design_area_motion): some
	code cleanup while i was at it.


svn path=/trunk/; revision=26843
2008-09-03 19:24:51 +00:00
Sven Neumann
54faa7dbc2 corrected 'subdir' variables. Spotted by Tor Lillqvist.
2008-08-12  Sven Neumann  <sven@gimp.org>

	* po-*/Makefile.in.in: corrected 'subdir' variables. Spotted by
	Tor Lillqvist.

	* modules/controller-midi.c: formatting.


svn path=/trunk/; revision=26513
2008-08-12 12:50:57 +00:00
Michael Natterer
076a1651c7 override the wheel's size-allocate and return a small requisition that
2008-08-12  Michael Natterer  <mitch@gimp.org>

	* modules/color-selector-wheel.c: override the wheel's
	size-allocate and return a small requisition that allows to be
	resized smaller again.


svn path=/trunk/; revision=26511
2008-08-12 12:48:02 +00:00
Sven Neumann
7f7f63db6e fixed library dependencies.
2008-08-12  Sven Neumann  <sven@gimp.org>

	* modules/Makefile.am: fixed library dependencies.


svn path=/trunk/; revision=26510
2008-08-12 12:28:43 +00:00
Michael Natterer
a2f6108bc6 modules/Makefile.am renamed all modules to color-selector-foo.c,
2008-08-11  Michael Natterer  <mitch@gimp.org>

	* modules/Makefile.am
	* modules/*.c: renamed all modules to color-selector-foo.c,
	display-filter-foo.c and controller-foo.c


svn path=/trunk/; revision=26506
2008-08-11 18:28:01 +00:00
Michael Natterer
e4eec5b5b1 check for lcms with PKG_CHECK_MODULES(). Remove check for <lcms.h> vs.
2008-08-11  Michael Natterer  <mitch@gimp.org>

	* configure.in: check for lcms with PKG_CHECK_MODULES(). Remove
	check for <lcms.h> vs. <lsmc/lsmc.h> because the pc file should
	give us the right location now.

	* modules/cdisplay_lcms.c
	* modules/cdisplay_proof.c
	* modules/colorsel_cmyk_lcms.c
	* plug-ins/file-jpeg/jpeg-load.c
	* plug-ins/common/lcms.c: #include <lcms.h> and nothing else.

	* modules/Makefile.am
	* plug-ins/file-jpeg/Makefile.am
	* plug-ins/common/plugin-defs.pl: add LCMS_CFLAGS where appropriate.

	* plug-ins/common/Makefile.am: regenerated.


svn path=/trunk/; revision=26503
2008-08-11 17:28:41 +00:00
Michael Natterer
67a0daf045 change all LIBFOO variables to FOO_LIBS for consistency, could get rid of
2008-08-11  Michael Natterer  <mitch@gimp.org>

	* configure.in: change all LIBFOO variables to FOO_LIBS for
	consistency, could get rid of some variables alltogether since
	PNG_CHECK_MODULES() already defined FOO_LIBS.

	* tools/Makefile.am
	* modules/Makefile.am
	* plug-ins/file-ico/Makefile.am
	* plug-ins/file-jpeg/Makefile.am
	* plug-ins/file-psd/Makefile.am
	* plug-ins/file-xjt/Makefile.am
	* plug-ins/common/plugin-defs.pl
	* plug-ins/common/mkgen.pl: changed accordingly.

	* plug-ins/common/Makefile.am: regenerated.


svn path=/trunk/; revision=26498
2008-08-11 14:40:48 +00:00
Michael Natterer
1a971261db removed.
2008-08-08  Michael Natterer  <mitch@gimp.org>

	* modules/colorsel_triangle.c: removed.

	* modules/colorsel_wheel.c: new module using the GtkHSV widget
	which was originally developed from above triangle selector.

	* modules/Makefile.am: chaged accordingly.


svn path=/trunk/; revision=26448
2008-08-08 15:27:40 +00:00
Michael Natterer
8c66ea4b19 app/actions/layers-commands.c app/actions/view-actions.c
2008-06-28  Michael Natterer  <mitch@gimp.org>

	* app/actions/layers-commands.c
	* app/actions/view-actions.c
	* app/dialogs/about-dialog.c
	* app/dialogs/layer-options-dialog.c
	* app/dialogs/preferences-dialog.c
	* app/display/gimpcanvas.c
	* app/display/gimpdisplayshell-appearance.c
	* app/display/gimpnavigationeditor.c
	* modules/colorsel_water.c: use accessors instead of accessing
	members of GTK+ widgets directly.


svn path=/trunk/; revision=26006
2008-06-28 15:12:13 +00:00
Michael Natterer
730193b2cb applied patch from S. Fielding which passes the right MIDI channel from
2008-06-12  Michael Natterer  <mitch@gimp.org>

	* modules/controller_midi.c: applied patch from S. Fielding which
	passes the right MIDI channel from the ALSA event to midi_event().
	Fixes bug #537960.


svn path=/trunk/; revision=25931
2008-06-12 11:25:27 +00:00
Tor Lillqvist
0f993d3f42 Make it compile again.
2008-01-28  Tor Lillqvist  <tml@novell.com>

	* modules/controller_dx_dinput.c: Make it compile again.


svn path=/trunk/; revision=24726
2008-01-28 12:23:28 +00:00