gimp r25886 - in trunk: . app app/gegl
- From: mitch svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp r25886 - in trunk: . app app/gegl
- Date: Wed, 4 Jun 2008 12:29:08 +0000 (UTC)
Author: mitch
Date: Wed Jun 4 12:29:08 2008
New Revision: 25886
URL: http://svn.gnome.org/viewvc/gimp?rev=25886&view=rev
Log:
2008-06-04 Michael Natterer <mitch gimp org>
* configure.in: depend on GEGL >= 0.0.17, add check for
BABL => 0.0.21.
* app/sanity.c: bump GEGL sanity check and add BABL check.
* app/gegl/gimpoperationcolorbalance.c
* app/gegl/gimpoperationcolorize.c
* app/gegl/gimpoperationcurves.c
* app/gegl/gimpoperationdesaturate.c
* app/gegl/gimpoperationhuesaturation.c
* app/gegl/gimpoperationlevels.c
* app/gegl/gimpoperationposterize.c
* app/gegl/gimpoperationthreshold.c: adapt to new process()
signature.
Modified:
trunk/ChangeLog
trunk/app/gegl/gimpoperationcolorbalance.c
trunk/app/gegl/gimpoperationcolorize.c
trunk/app/gegl/gimpoperationcurves.c
trunk/app/gegl/gimpoperationdesaturate.c
trunk/app/gegl/gimpoperationhuesaturation.c
trunk/app/gegl/gimpoperationlevels.c
trunk/app/gegl/gimpoperationposterize.c
trunk/app/gegl/gimpoperationthreshold.c
trunk/app/sanity.c
trunk/configure.in
Modified: trunk/app/gegl/gimpoperationcolorbalance.c
==============================================================================
--- trunk/app/gegl/gimpoperationcolorbalance.c (original)
+++ trunk/app/gegl/gimpoperationcolorbalance.c Wed Jun 4 12:29:08 2008
@@ -35,7 +35,8 @@
static gboolean gimp_operation_color_balance_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
- glong samples);
+ glong samples,
+ GeglRectangle *roi);
G_DEFINE_TYPE (GimpOperationColorBalance, gimp_operation_color_balance,
@@ -115,7 +116,8 @@
gimp_operation_color_balance_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
- glong samples)
+ glong samples,
+ GeglRectangle *roi)
{
GimpOperationPointFilter *point = GIMP_OPERATION_POINT_FILTER (operation);
GimpColorBalanceConfig *config = GIMP_COLOR_BALANCE_CONFIG (point->config);
Modified: trunk/app/gegl/gimpoperationcolorize.c
==============================================================================
--- trunk/app/gegl/gimpoperationcolorize.c (original)
+++ trunk/app/gegl/gimpoperationcolorize.c Wed Jun 4 12:29:08 2008
@@ -34,7 +34,8 @@
static gboolean gimp_operation_colorize_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
- glong samples);
+ glong samples,
+ GeglRectangle *roi);
G_DEFINE_TYPE (GimpOperationColorize, gimp_operation_colorize,
@@ -78,7 +79,8 @@
gimp_operation_colorize_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
- glong samples)
+ glong samples,
+ GeglRectangle *roi)
{
GimpOperationPointFilter *point = GIMP_OPERATION_POINT_FILTER (operation);
GimpColorizeConfig *config = GIMP_COLORIZE_CONFIG (point->config);
Modified: trunk/app/gegl/gimpoperationcurves.c
==============================================================================
--- trunk/app/gegl/gimpoperationcurves.c (original)
+++ trunk/app/gegl/gimpoperationcurves.c Wed Jun 4 12:29:08 2008
@@ -38,7 +38,8 @@
static gboolean gimp_operation_curves_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
- glong samples);
+ glong samples,
+ GeglRectangle *roi);
G_DEFINE_TYPE (GimpOperationCurves, gimp_operation_curves,
@@ -82,7 +83,8 @@
gimp_operation_curves_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
- glong samples)
+ glong samples,
+ GeglRectangle *roi)
{
GimpOperationPointFilter *point = GIMP_OPERATION_POINT_FILTER (operation);
GimpCurvesConfig *config = GIMP_CURVES_CONFIG (point->config);
Modified: trunk/app/gegl/gimpoperationdesaturate.c
==============================================================================
--- trunk/app/gegl/gimpoperationdesaturate.c (original)
+++ trunk/app/gegl/gimpoperationdesaturate.c Wed Jun 4 12:29:08 2008
@@ -34,7 +34,8 @@
static gboolean gimp_operation_desaturate_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
- glong samples);
+ glong samples,
+ GeglRectangle *roi);
G_DEFINE_TYPE (GimpOperationDesaturate, gimp_operation_desaturate,
@@ -78,7 +79,8 @@
gimp_operation_desaturate_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
- glong samples)
+ glong samples,
+ GeglRectangle *roi)
{
GimpOperationPointFilter *point = GIMP_OPERATION_POINT_FILTER (operation);
GimpDesaturateConfig *config = GIMP_DESATURATE_CONFIG (point->config);
Modified: trunk/app/gegl/gimpoperationhuesaturation.c
==============================================================================
--- trunk/app/gegl/gimpoperationhuesaturation.c (original)
+++ trunk/app/gegl/gimpoperationhuesaturation.c Wed Jun 4 12:29:08 2008
@@ -35,7 +35,8 @@
static gboolean gimp_operation_hue_saturation_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
- glong samples);
+ glong samples,
+ GeglRectangle *roi);
G_DEFINE_TYPE (GimpOperationHueSaturation, gimp_operation_hue_saturation,
@@ -127,7 +128,8 @@
gimp_operation_hue_saturation_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
- glong samples)
+ glong samples,
+ GeglRectangle *roi)
{
GimpOperationPointFilter *point = GIMP_OPERATION_POINT_FILTER (operation);
GimpHueSaturationConfig *config = GIMP_HUE_SATURATION_CONFIG (point->config);
Modified: trunk/app/gegl/gimpoperationlevels.c
==============================================================================
--- trunk/app/gegl/gimpoperationlevels.c (original)
+++ trunk/app/gegl/gimpoperationlevels.c Wed Jun 4 12:29:08 2008
@@ -35,7 +35,8 @@
static gboolean gimp_operation_levels_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
- glong samples);
+ glong samples,
+ GeglRectangle *roi);
G_DEFINE_TYPE (GimpOperationLevels, gimp_operation_levels,
@@ -110,7 +111,8 @@
gimp_operation_levels_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
- glong samples)
+ glong samples,
+ GeglRectangle *roi)
{
GimpOperationPointFilter *point = GIMP_OPERATION_POINT_FILTER (operation);
GimpLevelsConfig *config = GIMP_LEVELS_CONFIG (point->config);
Modified: trunk/app/gegl/gimpoperationposterize.c
==============================================================================
--- trunk/app/gegl/gimpoperationposterize.c (original)
+++ trunk/app/gegl/gimpoperationposterize.c Wed Jun 4 12:29:08 2008
@@ -35,7 +35,8 @@
static gboolean gimp_operation_posterize_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
- glong samples);
+ glong samples,
+ GeglRectangle *roi);
G_DEFINE_TYPE (GimpOperationPosterize, gimp_operation_posterize,
@@ -79,7 +80,8 @@
gimp_operation_posterize_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
- glong samples)
+ glong samples,
+ GeglRectangle *roi)
{
GimpOperationPointFilter *point = GIMP_OPERATION_POINT_FILTER (operation);
GimpPosterizeConfig *config = GIMP_POSTERIZE_CONFIG (point->config);
Modified: trunk/app/gegl/gimpoperationthreshold.c
==============================================================================
--- trunk/app/gegl/gimpoperationthreshold.c (original)
+++ trunk/app/gegl/gimpoperationthreshold.c Wed Jun 4 12:29:08 2008
@@ -34,7 +34,8 @@
static gboolean gimp_operation_threshold_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
- glong samples);
+ glong samples,
+ GeglRectangle *roi);
G_DEFINE_TYPE (GimpOperationThreshold, gimp_operation_threshold,
@@ -78,7 +79,8 @@
gimp_operation_threshold_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
- glong samples)
+ glong samples,
+ GeglRectangle *roi)
{
GimpOperationPointFilter *point = GIMP_OPERATION_POINT_FILTER (operation);
GimpThresholdConfig *config = GIMP_THRESHOLD_CONFIG (point->config);
Modified: trunk/app/sanity.c
==============================================================================
--- trunk/app/sanity.c (original)
+++ trunk/app/sanity.c Wed Jun 4 12:29:08 2008
@@ -36,6 +36,7 @@
static gchar * sanity_check_pango (void);
static gchar * sanity_check_fontconfig (void);
static gchar * sanity_check_freetype (void);
+static gchar * sanity_check_babl (void);
static gchar * sanity_check_gegl (void);
static gchar * sanity_check_filename_encoding (void);
@@ -60,6 +61,9 @@
abort_message = sanity_check_freetype ();
if (! abort_message)
+ abort_message = sanity_check_babl ();
+
+ if (! abort_message)
abort_message = sanity_check_gegl ();
if (! abort_message)
@@ -248,6 +252,44 @@
}
static gchar *
+sanity_check_babl (void)
+{
+ gint babl_major_version;
+ gint babl_minor_version;
+ gint babl_micro_version;
+
+#define BABL_REQUIRED_MAJOR 0
+#define BABL_REQUIRED_MINOR 0
+#define BABL_REQUIRED_MICRO 21
+
+ babl_get_version (&babl_major_version,
+ &babl_minor_version,
+ &babl_micro_version);
+
+ if (babl_major_version < BABL_REQUIRED_MAJOR ||
+ babl_minor_version < BABL_REQUIRED_MINOR ||
+ babl_micro_version < BABL_REQUIRED_MICRO)
+ {
+ return g_strdup_printf
+ ("BABL version too old!\n\n"
+ "GIMP requires BABL version %d.%d.%d or later.\n"
+ "Installed BABL version is %d.%d.%d.\n\n"
+ "Somehow you or your software packager managed\n"
+ "to install GIMP with an older BABL version.\n\n"
+ "Please upgrade to BABL version %d.%d.%d or later.",
+ BABL_REQUIRED_MAJOR, BABL_REQUIRED_MINOR, BABL_REQUIRED_MICRO,
+ babl_major_version, babl_minor_version, babl_micro_version,
+ BABL_REQUIRED_MAJOR, BABL_REQUIRED_MINOR, BABL_REQUIRED_MICRO);
+ }
+
+#undef BABL_REQUIRED_MAJOR
+#undef BABL_REQUIRED_MINOR
+#undef BABL_REQUIRED_MICRO
+
+ return NULL;
+}
+
+static gchar *
sanity_check_gegl (void)
{
gint gegl_major_version;
@@ -256,7 +298,7 @@
#define GEGL_REQUIRED_MAJOR 0
#define GEGL_REQUIRED_MINOR 0
-#define GEGL_REQUIRED_MICRO 16
+#define GEGL_REQUIRED_MICRO 17
gegl_get_version (&gegl_major_version,
&gegl_minor_version,
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Wed Jun 4 12:29:08 2008
@@ -40,7 +40,8 @@
m4_define([gimp_full_name], [GNU Image Manipulation Program])
# required versions of other packages
-m4_define([gegl_required_version], [0.0.16])
+m4_define([babl_required_version], [0.0.21])
+m4_define([gegl_required_version], [0.0.17])
m4_define([glib_required_version], [2.16.1])
m4_define([gtk_required_version], [2.12.1])
m4_define([gdk_pixbuf_required_version], [gtk_required_version])
@@ -429,6 +430,10 @@
###############################
+PKG_CHECK_MODULES(BABL, babl >= babl_required_version, :,
+ AC_MSG_ERROR([Test for BABL failed. Please get it from http://gegl.org/]))
+
+
PKG_CHECK_MODULES(GEGL, gegl >= gegl_required_version, :,
AC_MSG_ERROR([Test for GEGL failed. Please get it from http://gegl.org/]))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
