diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-10-29 23:25:59 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-10-29 23:25:59 +0200 |
| commit | 6944ad9f9346341ee0fd120ec3ed0b7b56406436 (patch) | |
| tree | ae59422da384a9463c306e1983be5ac46ff97c7d /src/photos/RawSupport.c | |
| parent | 803e11e1c311a7ba4923d8d438eafa7ff62b463d (diff) | |
| parent | 72e3d4c55a6569d966059f762824c38d06055871 (diff) | |
Merge tag 'upstream/0.25.0'
Upstream version 0.25.0
Diffstat (limited to 'src/photos/RawSupport.c')
| -rw-r--r-- | src/photos/RawSupport.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/photos/RawSupport.c b/src/photos/RawSupport.c index 14d1fbe..ae5875d 100644 --- a/src/photos/RawSupport.c +++ b/src/photos/RawSupport.c @@ -1745,7 +1745,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { #line 1748 "RawSupport.c" - goto __catch29_graw_exception; + goto __catch30_graw_exception; } #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processor_unref0 (processor); @@ -1768,7 +1768,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { #line 1771 "RawSupport.c" - goto __catch29_graw_exception; + goto __catch30_graw_exception; } #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processor_unref0 (processor); @@ -1791,7 +1791,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { #line 1794 "RawSupport.c" - goto __catch29_graw_exception; + goto __catch30_graw_exception; } #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processor_unref0 (processor); @@ -1806,8 +1806,8 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, #line 1807 "RawSupport.c" } } - goto __finally29; - __catch29_graw_exception: + goto __finally30; + __catch30_graw_exception: { GError* exception = NULL; GError* _tmp11_ = NULL; @@ -1848,9 +1848,9 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, #line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_error_free0 (exception); #line 1851 "RawSupport.c" - goto __finally29; + goto __finally30; } - __finally29: + __finally30: #line 175 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 175 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1921,7 +1921,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1924 "RawSupport.c" - goto __catch30_g_error; + goto __catch31_g_error; } #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp32_ = detected; @@ -1937,8 +1937,8 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _media_metadata_unref0 (_tmp29_); #line 1939 "RawSupport.c" } - goto __finally30; - __catch30_g_error: + goto __finally31; + __catch31_g_error: { GError* err = NULL; #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1949,7 +1949,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _g_error_free0 (err); #line 1951 "RawSupport.c" } - __finally30: + __finally31: #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" |