diff options
Diffstat (limited to 'src/VideoSupport.c')
-rw-r--r-- | src/VideoSupport.c | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/src/VideoSupport.c b/src/VideoSupport.c index 989976f..aad43f3 100644 --- a/src/VideoSupport.c +++ b/src/VideoSupport.c @@ -1,4 +1,4 @@ -/* VideoSupport.c generated by valac 0.32.1, the Vala compiler +/* VideoSupport.c generated by valac 0.34.1, the Vala compiler * generated from VideoSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1921,103 +1921,103 @@ static gchar* string_slice (const gchar* self, glong start, glong end) { glong _tmp19_ = 0L; glong _tmp20_ = 0L; gchar* _tmp21_ = NULL; -#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { #line 1937 "VideoSupport.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; #line 1946 "VideoSupport.c" } -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { #line 1952 "VideoSupport.c" glong _tmp6_ = 0L; glong _tmp7_ = 0L; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; #line 1961 "VideoSupport.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { #line 1967 "VideoSupport.c" glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; #line 1976 "VideoSupport.c" } else { -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = FALSE; #line 1980 "VideoSupport.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { #line 1988 "VideoSupport.c" glong _tmp14_ = 0L; glong _tmp15_ = 0L; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; #line 1997 "VideoSupport.c" } else { -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 2001 "VideoSupport.c" } -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = start; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = end; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp21_; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 2023 "VideoSupport.c" } @@ -3492,7 +3492,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide #line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp22_ = unix_input; #line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala" - _tmp23_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_); + _tmp23_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_); #line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala" _tmp21_ = _tmp23_; #line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala" |