From 9e7cd144725a270e0460b21747619f447ca87684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 14 Apr 2017 18:51:46 +0200 Subject: New upstream version 0.26.1 --- src/ColorTransformation.c | 72 +++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'src/ColorTransformation.c') diff --git a/src/ColorTransformation.c b/src/ColorTransformation.c index 80325c1..05b6c8b 100644 --- a/src/ColorTransformation.c +++ b/src/ColorTransformation.c @@ -1,4 +1,4 @@ -/* ColorTransformation.c generated by valac 0.34.4, the Vala compiler +/* ColorTransformation.c generated by valac 0.34.7, the Vala compiler * generated from ColorTransformation.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -2395,7 +2395,7 @@ gint pixel_transformation_bundle_get_count (PixelTransformationBundle* self) { #line 333 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp0_ = self->priv->map; #line 333 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap)); + _tmp1_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 333 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp2_ = _tmp1_; #line 333 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -2437,7 +2437,7 @@ GeeIterable* pixel_transformation_bundle_get_transformations (PixelTransformatio #line 341 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp0_ = self->priv->map; #line 341 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap)); + _tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 341 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp2_ = _tmp1_; #line 341 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -2889,7 +2889,7 @@ static void pixel_transformation_bundle_instance_init (PixelTransformationBundle #line 237 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp5_ = gee_functions_get_equal_func_for (G_TYPE_INT, &_tmp3_, &_tmp4_); #line 237 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp6_ = gee_hash_map_new (G_TYPE_INT, NULL, NULL, TYPE_PIXEL_TRANSFORMATION, (GBoxedCopyFunc) pixel_transformation_ref, pixel_transformation_unref, _tmp2_, _tmp0_, _tmp1_, _tmp5_, _tmp3_, _tmp4_, NULL, NULL, NULL); + _tmp6_ = gee_hash_map_new (G_TYPE_INT, NULL, NULL, TYPE_PIXEL_TRANSFORMATION, (GBoxedCopyFunc) pixel_transformation_ref, (GDestroyNotify) pixel_transformation_unref, _tmp2_, _tmp0_, _tmp1_, _tmp5_, _tmp3_, _tmp4_, NULL, NULL, NULL); #line 237 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->priv->map = _tmp6_; #line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -3327,21 +3327,21 @@ static void pixel_transformation_class_init (PixelTransformationClass * klass) { #line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_type_class_add_private (klass, sizeof (PixelTransformationPrivate)); #line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - ((PixelTransformationClass *) klass)->get_preferred_format = pixel_transformation_real_get_preferred_format; + ((PixelTransformationClass *) klass)->get_preferred_format = (PixelFormat (*)(PixelTransformation*)) pixel_transformation_real_get_preferred_format; #line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - ((PixelTransformationClass *) klass)->get_composition_mode = pixel_transformation_real_get_composition_mode; + ((PixelTransformationClass *) klass)->get_composition_mode = (CompositionMode (*)(PixelTransformation*)) pixel_transformation_real_get_composition_mode; #line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - ((PixelTransformationClass *) klass)->compose_with = pixel_transformation_real_compose_with; + ((PixelTransformationClass *) klass)->compose_with = (void (*)(PixelTransformation*, PixelTransformation*)) pixel_transformation_real_compose_with; #line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - ((PixelTransformationClass *) klass)->is_identity = pixel_transformation_real_is_identity; + ((PixelTransformationClass *) klass)->is_identity = (gboolean (*)(PixelTransformation*)) pixel_transformation_real_is_identity; #line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - ((PixelTransformationClass *) klass)->transform_pixel_hsv = pixel_transformation_real_transform_pixel_hsv; + ((PixelTransformationClass *) klass)->transform_pixel_hsv = (void (*)(PixelTransformation*, HSVAnalyticPixel*, HSVAnalyticPixel*)) pixel_transformation_real_transform_pixel_hsv; #line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - ((PixelTransformationClass *) klass)->transform_pixel_rgb = pixel_transformation_real_transform_pixel_rgb; + ((PixelTransformationClass *) klass)->transform_pixel_rgb = (void (*)(PixelTransformation*, RGBAnalyticPixel*, RGBAnalyticPixel*)) pixel_transformation_real_transform_pixel_rgb; #line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - ((PixelTransformationClass *) klass)->to_string = pixel_transformation_real_to_string; + ((PixelTransformationClass *) klass)->to_string = (gchar* (*)(PixelTransformation*)) pixel_transformation_real_to_string; #line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - ((PixelTransformationClass *) klass)->copy = pixel_transformation_real_copy; + ((PixelTransformationClass *) klass)->copy = (PixelTransformation* (*)(PixelTransformation*)) pixel_transformation_real_copy; #line 3345 "ColorTransformation.c" } @@ -5507,19 +5507,19 @@ static void rgb_transformation_class_init (RGBTransformationClass * klass) { #line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala" ((PixelTransformationClass *) klass)->finalize = rgb_transformation_finalize; #line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - ((PixelTransformationClass *) klass)->get_preferred_format = rgb_transformation_real_get_preferred_format; + ((PixelTransformationClass *) klass)->get_preferred_format = (PixelFormat (*)(PixelTransformation*)) rgb_transformation_real_get_preferred_format; #line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - ((PixelTransformationClass *) klass)->get_composition_mode = rgb_transformation_real_get_composition_mode; + ((PixelTransformationClass *) klass)->get_composition_mode = (CompositionMode (*)(PixelTransformation*)) rgb_transformation_real_get_composition_mode; #line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - ((PixelTransformationClass *) klass)->compose_with = rgb_transformation_real_compose_with; + ((PixelTransformationClass *) klass)->compose_with = (void (*)(PixelTransformation*, PixelTransformation*)) rgb_transformation_real_compose_with; #line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - ((PixelTransformationClass *) klass)->transform_pixel_hsv = rgb_transformation_real_transform_pixel_hsv; + ((PixelTransformationClass *) klass)->transform_pixel_hsv = (void (*)(PixelTransformation*, HSVAnalyticPixel*, HSVAnalyticPixel*)) rgb_transformation_real_transform_pixel_hsv; #line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - ((PixelTransformationClass *) klass)->transform_pixel_rgb = rgb_transformation_real_transform_pixel_rgb; + ((PixelTransformationClass *) klass)->transform_pixel_rgb = (void (*)(PixelTransformation*, RGBAnalyticPixel*, RGBAnalyticPixel*)) rgb_transformation_real_transform_pixel_rgb; #line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - ((PixelTransformationClass *) klass)->is_identity = rgb_transformation_real_is_identity; + ((PixelTransformationClass *) klass)->is_identity = (gboolean (*)(PixelTransformation*)) rgb_transformation_real_is_identity; #line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - ((PixelTransformationClass *) klass)->copy = rgb_transformation_real_copy; + ((PixelTransformationClass *) klass)->copy = (PixelTransformation* (*)(PixelTransformation*)) rgb_transformation_real_copy; #line 5523 "ColorTransformation.c" } @@ -5608,9 +5608,9 @@ static void hsv_transformation_class_init (HSVTransformationClass * klass) { #line 598 "/home/jens/Source/shotwell/src/ColorTransformation.vala" hsv_transformation_parent_class = g_type_class_peek_parent (klass); #line 598 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - ((PixelTransformationClass *) klass)->get_preferred_format = hsv_transformation_real_get_preferred_format; + ((PixelTransformationClass *) klass)->get_preferred_format = (PixelFormat (*)(PixelTransformation*)) hsv_transformation_real_get_preferred_format; #line 598 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - ((PixelTransformationClass *) klass)->transform_pixel_rgb = hsv_transformation_real_transform_pixel_rgb; + ((PixelTransformationClass *) klass)->transform_pixel_rgb = (void (*)(PixelTransformation*, RGBAnalyticPixel*, RGBAnalyticPixel*)) hsv_transformation_real_transform_pixel_rgb; #line 5614 "ColorTransformation.c" } @@ -6566,7 +6566,7 @@ PixelTransformer* pixel_transformer_copy (PixelTransformer* self) { #line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp3_ = _transformation_list; #line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp5_ = _tmp4_; #line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -6643,7 +6643,7 @@ static void pixel_transformer_build_optimized_transformations (PixelTransformer* #line 794 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp0_ = self->priv->transformations; #line 794 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 794 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp2_ = _tmp1_; #line 794 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -6706,7 +6706,7 @@ static void pixel_transformer_build_optimized_transformations (PixelTransformer* #line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp7_ = self->priv->transformations; #line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp9_ = _tmp8_; #line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -7134,7 +7134,7 @@ void pixel_transformer_replace_transformation (PixelTransformer* self, PixelTran #line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp3_ = self->priv->transformations; #line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala" _tmp5_ = _tmp4_; #line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -8109,7 +8109,7 @@ static void pixel_transformer_instance_init (PixelTransformer * self) { #line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->priv = PIXEL_TRANSFORMER_GET_PRIVATE (self); #line 776 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - _tmp0_ = gee_array_list_new (TYPE_PIXEL_TRANSFORMATION, (GBoxedCopyFunc) pixel_transformation_ref, pixel_transformation_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (TYPE_PIXEL_TRANSFORMATION, (GBoxedCopyFunc) pixel_transformation_ref, (GDestroyNotify) pixel_transformation_unref, NULL, NULL, NULL); #line 776 "/home/jens/Source/shotwell/src/ColorTransformation.vala" self->priv->transformations = _tmp0_; #line 778 "/home/jens/Source/shotwell/src/ColorTransformation.vala" @@ -12546,13 +12546,13 @@ static void expansion_transformation_class_init (ExpansionTransformationClass * #line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_type_class_add_private (klass, sizeof (ExpansionTransformationPrivate)); #line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - ((PixelTransformationClass *) klass)->transform_pixel_hsv = expansion_transformation_real_transform_pixel_hsv; + ((PixelTransformationClass *) klass)->transform_pixel_hsv = (void (*)(PixelTransformation*, HSVAnalyticPixel*, HSVAnalyticPixel*)) expansion_transformation_real_transform_pixel_hsv; #line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - ((PixelTransformationClass *) klass)->to_string = expansion_transformation_real_to_string; + ((PixelTransformationClass *) klass)->to_string = (gchar* (*)(PixelTransformation*)) expansion_transformation_real_to_string; #line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - ((PixelTransformationClass *) klass)->is_identity = expansion_transformation_real_is_identity; + ((PixelTransformationClass *) klass)->is_identity = (gboolean (*)(PixelTransformation*)) expansion_transformation_real_is_identity; #line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - ((PixelTransformationClass *) klass)->copy = expansion_transformation_real_copy; + ((PixelTransformationClass *) klass)->copy = (PixelTransformation* (*)(PixelTransformation*)) expansion_transformation_real_copy; #line 12552 "ColorTransformation.c" } @@ -12833,11 +12833,11 @@ static void shadow_detail_transformation_class_init (ShadowDetailTransformationC #line 1370 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_type_class_add_private (klass, sizeof (ShadowDetailTransformationPrivate)); #line 1370 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - ((PixelTransformationClass *) klass)->transform_pixel_hsv = shadow_detail_transformation_real_transform_pixel_hsv; + ((PixelTransformationClass *) klass)->transform_pixel_hsv = (void (*)(PixelTransformation*, HSVAnalyticPixel*, HSVAnalyticPixel*)) shadow_detail_transformation_real_transform_pixel_hsv; #line 1370 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - ((PixelTransformationClass *) klass)->copy = shadow_detail_transformation_real_copy; + ((PixelTransformationClass *) klass)->copy = (PixelTransformation* (*)(PixelTransformation*)) shadow_detail_transformation_real_copy; #line 1370 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - ((PixelTransformationClass *) klass)->is_identity = shadow_detail_transformation_real_is_identity; + ((PixelTransformationClass *) klass)->is_identity = (gboolean (*)(PixelTransformation*)) shadow_detail_transformation_real_is_identity; #line 12837 "ColorTransformation.c" } @@ -13478,11 +13478,11 @@ static void highlight_detail_transformation_class_init (HighlightDetailTransform #line 1444 "/home/jens/Source/shotwell/src/ColorTransformation.vala" g_type_class_add_private (klass, sizeof (HighlightDetailTransformationPrivate)); #line 1444 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - ((PixelTransformationClass *) klass)->transform_pixel_hsv = highlight_detail_transformation_real_transform_pixel_hsv; + ((PixelTransformationClass *) klass)->transform_pixel_hsv = (void (*)(PixelTransformation*, HSVAnalyticPixel*, HSVAnalyticPixel*)) highlight_detail_transformation_real_transform_pixel_hsv; #line 1444 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - ((PixelTransformationClass *) klass)->copy = highlight_detail_transformation_real_copy; + ((PixelTransformationClass *) klass)->copy = (PixelTransformation* (*)(PixelTransformation*)) highlight_detail_transformation_real_copy; #line 1444 "/home/jens/Source/shotwell/src/ColorTransformation.vala" - ((PixelTransformationClass *) klass)->is_identity = highlight_detail_transformation_real_is_identity; + ((PixelTransformationClass *) klass)->is_identity = (gboolean (*)(PixelTransformation*)) highlight_detail_transformation_real_is_identity; #line 13482 "ColorTransformation.c" } -- cgit v1.2.3