diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-01-21 19:19:04 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-01-21 19:19:04 +0100 |
| commit | f39ea21098340bd99c48669f152c9068046c2c99 (patch) | |
| tree | d1166fce1a4a8c470dfaf364816f767678c4729e /src/photos/GRaw.c | |
| parent | bc48a4cff815ed156b603c92e684779c317417ba (diff) | |
| parent | a7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e (diff) | |
Merge tag 'upstream/0.25.3'
Upstream version 0.25.3
Diffstat (limited to 'src/photos/GRaw.c')
| -rw-r--r-- | src/photos/GRaw.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/photos/GRaw.c b/src/photos/GRaw.c index 36e9c88..2b56cbf 100644 --- a/src/photos/GRaw.c +++ b/src/photos/GRaw.c @@ -1,4 +1,4 @@ -/* GRaw.c generated by valac 0.32.1, the Vala compiler +/* GRaw.c generated by valac 0.34.4, the Vala compiler * generated from GRaw.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -498,7 +498,7 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type #line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp10_ = _tmp9_; #line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp11_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_); + _tmp11_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_); #line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp12_ = _tmp11_; #line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -510,7 +510,7 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type #line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_bytes_unref0 (bytes); #line 513 "GRaw.c" - goto __catch27_g_error; + goto __catch29_g_error; } #line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp13_ = _tmp7_; @@ -526,8 +526,8 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type _g_bytes_unref0 (bytes); #line 528 "GRaw.c" } - goto __finally27; - __catch27_g_error: + goto __finally29; + __catch29_g_error: { GError* err = NULL; GError* _tmp14_ = NULL; @@ -548,9 +548,9 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type #line 132 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_error_free0 (err); #line 551 "GRaw.c" - goto __finally27; + goto __finally29; } - __finally27: + __finally29: #line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala" |