diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-05-01 14:43:08 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-05-01 14:43:08 +0200 |
commit | 2b3f22361da0c1d8e6ce70d71352821758186db7 (patch) | |
tree | 5d10633b47369b3aa52a05bf889ede0dbe5ee108 /src/photos/GRaw.c | |
parent | 211da5fc3048ca2b6ccee2166b0aaaade55cb84f (diff) | |
parent | dc6c76eb04dfe3d4262a1806808f0bc0bf523238 (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/photos/GRaw.c')
-rw-r--r-- | src/photos/GRaw.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/photos/GRaw.c b/src/photos/GRaw.c index 6ea3ba4..304cc1a 100644 --- a/src/photos/GRaw.c +++ b/src/photos/GRaw.c @@ -531,7 +531,7 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_bytes_unref0 (bytes); #line 534 "GRaw.c" - goto __catch29_g_error; + goto __catch33_g_error; } #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp13_ = _tmp7_; @@ -547,8 +547,8 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type _g_bytes_unref0 (bytes); #line 549 "GRaw.c" } - goto __finally29; - __catch29_g_error: + goto __finally33; + __catch33_g_error: { GError* err = NULL; GError* _tmp14_; @@ -569,9 +569,9 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type #line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_error_free0 (err); #line 572 "GRaw.c" - goto __finally29; + goto __finally33; } - __finally29: + __finally33: #line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala" |