Commit graph

351 commits

Author SHA1 Message Date
Nils Philippsen
dfaa321027 lcms: pretty code even better if syntactically correct
Thanks to Jehan for spotting this.
2013-09-19 17:38:46 +02:00
Nils Philippsen
b2c6bd7614 Backport lcms 2.x support from master, making it optional.
In order to retain support for lcms 1.x, this merges the lcms2-specific
code as a configurable alternative.

The user can specify which version to use by specifying
"--with-lcms=lcms1" or "--with-lcms=lcms2" when running configure. If no
version is specified explicitly, version 1.x will be preferred if both
versions are available. This ensures that GIMP is built with the same
lcms version as an older version, if the same configure switches are
used and the same libraries are available.

This builds on the following commits from the master branch:

    commit c59ab4d817
    Author:     Massimo Valentini <mvalentini@src.gnome.org>
    AuthorDate: Tue Sep 4 17:53:06 2012 +0200

        lcms: oversight

    commit 8bbfc9e5cf
    Author:     Michael Natterer <mitch@gimp.org>
    AuthorDate: Mon Sep 3 20:03:53 2012 +0200

        Bug 675558 - switch from lcms-1 to lcms-2

        Applied modified patch from Hartmut Kuhse which ports to lcms-2.
2013-09-18 13:47:12 +02:00
Nils Philippsen
c9c927603b include missing header 2013-09-18 13:47:12 +02:00
Michael Natterer
616e8f2d82 Bug 703692 - Unable to Resize Large Left Dock Area
Merge all color-selector-wheel changes from master, which turns the
thing into a properly reqizable widget and fixes the issues with left
dock resizability.
2013-07-14 13:46:00 +02:00
Kristian Rietveld
7212f9973d 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.
(cherry picked from commit 9514cf4871)
2012-06-09 22:58:45 +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
Michael Natterer
68c4cb9cc4 set a tooltip on the profile name label because it's often ellipsized.
2008-01-13  Michael Natterer  <mitch@gimp.org>

	* modules/colorsel_cmyk_lcms.c (colorsel_cmyk_config_changed): set
	a tooltip on the profile name label because it's often ellipsized.


svn path=/trunk/; revision=24606
2008-01-13 13:17:11 +00:00
Michael Natterer
e1202941d5 modules/gimpinputdevicestore.h modules/gimpinputdevicestore-hal.c use
2008-01-11  Michael Natterer  <mitch@gimp.org>

	* modules/gimpinputdevicestore.h
	* modules/gimpinputdevicestore-hal.c
	* modules/gimpinputdevicestore-dx.c: use G_DEFINE_DYNAMIC_TYPE().

	* modules/controller_dx_dinput.c
	* modules/controller_linux_input.c: changed accordingly.


svn path=/trunk/; revision=24603
2008-01-11 12:45:00 +00:00
Michael Natterer
24bd2b130b modules/cdisplay_colorblind.c modules/cdisplay_gamma.c
2008-01-09  Michael Natterer  <mitch@gimp.org>

	* modules/cdisplay_colorblind.c
	* modules/cdisplay_gamma.c
	* modules/cdisplay_highcontrast.c
	* modules/cdisplay_lcms.c
	* modules/cdisplay_proof.c
	* modules/colorsel_cmyk.c
	* modules/colorsel_triangle.c
	* modules/colorsel_water.c
	* modules/controller_dx_dinput.c
	* modules/controller_linux_input.c
	* modules/controller_midi.c: use G_DEFINE_DYNAMIC_TYPE() instead
	of boilerplate code.


svn path=/trunk/; revision=24582
2008-01-09 22:22:10 +00:00
Sven Neumann
51eca41a8d don't abort on errors in lcms.
2008-01-09  Sven Neumann  <sven@gimp.org>

	* modules/colorsel_cmyk_lcms.c (colorsel_cmyk_class_init): don't
	abort on errors in lcms.


svn path=/trunk/; revision=24580
2008-01-09 20:32:30 +00:00
Hans Breuer
6f5bbfe0bd updated and removed -GD to let msvc9 complain less
2007-12-09  Hans Breuer  <hans@breuer.org>

	* **/makefile.msc : updated and removed -GD to let msvc9 complain less


svn path=/trunk/; revision=24305
2007-12-09 14:11:09 +00:00
Sven Neumann
78f41a843e modules/gimpinputdevicestore-dx.c the code for !HAVE_LIBHAL ended up in
2007-12-05  Sven Neumann  <sven@gimp.org>

	* modules/gimpinputdevicestore-dx.c
	* modules/gimpinputdevicestore-hal.c: the code for !HAVE_LIBHAL
	ended up in the wrong file.


svn path=/trunk/; revision=24267
2007-12-05 20:17:24 +00:00