diff options
Diffstat (limited to 'src/camera/GPhoto.c')
-rw-r--r-- | src/camera/GPhoto.c | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/src/camera/GPhoto.c b/src/camera/GPhoto.c index a703945..38c3a97 100644 --- a/src/camera/GPhoto.c +++ b/src/camera/GPhoto.c @@ -1,4 +1,4 @@ -/* GPhoto.c generated by valac 0.32.1, the Vala compiler +/* GPhoto.c generated by valac 0.34.1, the Vala compiler * generated from GPhoto.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1032,103 +1032,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 1048 "GPhoto.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 1057 "GPhoto.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 1063 "GPhoto.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 1072 "GPhoto.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 1078 "GPhoto.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 1087 "GPhoto.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 1091 "GPhoto.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 1099 "GPhoto.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 1108 "GPhoto.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 1112 "GPhoto.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 1134 "GPhoto.c" } @@ -1769,7 +1769,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp46_ = mins; #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - _tmp47_ = gdk_pixbuf_new_from_stream_at_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, G_TYPE_INPUT_STREAM, GInputStream), IMPORT_PREVIEW_MAX_SCALE, IMPORT_PREVIEW_MAX_SCALE, TRUE, NULL, &_inner_error_); + _tmp47_ = gdk_pixbuf_new_from_stream_at_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, g_input_stream_get_type (), GInputStream), IMPORT_PREVIEW_MAX_SCALE, IMPORT_PREVIEW_MAX_SCALE, TRUE, NULL, &_inner_error_); #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp45_ = _tmp47_; #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -2472,7 +2472,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons #line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp31_ = (GMemoryInputStream*) g_memory_input_stream_new_from_data (_tmp30_, _tmp30__length1, _gp_on_mins_destroyed_gdestroy_notify); #line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, G_TYPE_INPUT_STREAM, GInputStream); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, g_input_stream_get_type (), GInputStream); #line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" buffer = (g_free (buffer), NULL); #line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -2577,7 +2577,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons #line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp51_ = NULL; #line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, G_TYPE_INPUT_STREAM, GInputStream); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, g_input_stream_get_type (), GInputStream); #line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _g_object_unref0 (_tmp51_); #line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" |