From 9e7cd144725a270e0460b21747619f447ca87684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 14 Apr 2017 18:51:46 +0200 Subject: New upstream version 0.26.1 --- src/camera/GPhoto.c | 233 ++++++++++++++++++++++++++-------------------------- 1 file changed, 117 insertions(+), 116 deletions(-) (limited to 'src/camera/GPhoto.c') diff --git a/src/camera/GPhoto.c b/src/camera/GPhoto.c index 41e795c..89722c6 100644 --- a/src/camera/GPhoto.c +++ b/src/camera/GPhoto.c @@ -1,4 +1,4 @@ -/* GPhoto.c generated by valac 0.34.4, the Vala compiler +/* GPhoto.c generated by valac 0.34.7, the Vala compiler * generated from GPhoto.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -727,19 +727,19 @@ static void gp_context_wrapper_class_init (GPContextWrapperClass * klass) { #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" ((GPContextWrapperClass *) klass)->finalize = gp_context_wrapper_finalize; #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - ((GPContextWrapperClass *) klass)->idle = gp_context_wrapper_real_idle; + ((GPContextWrapperClass *) klass)->idle = (void (*)(GPContextWrapper*)) gp_context_wrapper_real_idle; #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - ((GPContextWrapperClass *) klass)->error = gp_context_wrapper_real_error; + ((GPContextWrapperClass *) klass)->error = (void (*)(GPContextWrapper*, const gchar*, void*)) gp_context_wrapper_real_error; #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - ((GPContextWrapperClass *) klass)->status = gp_context_wrapper_real_status; + ((GPContextWrapperClass *) klass)->status = (void (*)(GPContextWrapper*, const gchar*, void*)) gp_context_wrapper_real_status; #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - ((GPContextWrapperClass *) klass)->message = gp_context_wrapper_real_message; + ((GPContextWrapperClass *) klass)->message = (void (*)(GPContextWrapper*, const gchar*, void*)) gp_context_wrapper_real_message; #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - ((GPContextWrapperClass *) klass)->progress_start = gp_context_wrapper_real_progress_start; + ((GPContextWrapperClass *) klass)->progress_start = (void (*)(GPContextWrapper*, gfloat, const gchar*, void*)) gp_context_wrapper_real_progress_start; #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - ((GPContextWrapperClass *) klass)->progress_update = gp_context_wrapper_real_progress_update; + ((GPContextWrapperClass *) klass)->progress_update = (void (*)(GPContextWrapper*, gfloat, void*)) gp_context_wrapper_real_progress_update; #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - ((GPContextWrapperClass *) klass)->progress_stop = gp_context_wrapper_real_progress_stop; + ((GPContextWrapperClass *) klass)->progress_stop = (void (*)(GPContextWrapper*)) gp_context_wrapper_real_progress_stop; #line 744 "GPhoto.c" } @@ -858,9 +858,9 @@ static void gp_spin_idle_wrapper_class_init (GPSpinIdleWrapperClass * klass) { #line 78 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" gp_spin_idle_wrapper_parent_class = g_type_class_peek_parent (klass); #line 78 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - ((GPContextWrapperClass *) klass)->idle = gp_spin_idle_wrapper_real_idle; + ((GPContextWrapperClass *) klass)->idle = (void (*)(GPContextWrapper*)) gp_spin_idle_wrapper_real_idle; #line 78 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - ((GPContextWrapperClass *) klass)->progress_update = gp_spin_idle_wrapper_real_progress_update; + ((GPContextWrapperClass *) klass)->progress_update = (void (*)(GPContextWrapper*, gfloat, void*)) gp_spin_idle_wrapper_real_progress_update; #line 865 "GPhoto.c" } @@ -981,6 +981,7 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c int _tmp18_ = 0; const gchar* _tmp19_ = NULL; GError* _tmp20_ = NULL; + gboolean _tmp21_ = FALSE; #line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp15_ = res; #line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -998,8 +999,8 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c #line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_propagate_error (error, _inner_error_); #line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" - return FALSE; -#line 1003 "GPhoto.c" + return _tmp21_; +#line 1004 "GPhoto.c" } #line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" result = TRUE; @@ -1007,15 +1008,15 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c if (info) { #line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" *info = _vala_info; -#line 1011 "GPhoto.c" +#line 1012 "GPhoto.c" } else { #line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" (_vala_info); -#line 1015 "GPhoto.c" +#line 1016 "GPhoto.c" } #line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 1019 "GPhoto.c" +#line 1020 "GPhoto.c" } @@ -1048,7 +1049,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) { _tmp2_ = start; #line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { -#line 1052 "GPhoto.c" +#line 1053 "GPhoto.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; #line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" @@ -1057,13 +1058,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) { _tmp4_ = start; #line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; -#line 1061 "GPhoto.c" +#line 1062 "GPhoto.c" } #line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = end; #line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { -#line 1067 "GPhoto.c" +#line 1068 "GPhoto.c" glong _tmp6_ = 0L; glong _tmp7_ = 0L; #line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" @@ -1072,13 +1073,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) { _tmp7_ = end; #line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; -#line 1076 "GPhoto.c" +#line 1077 "GPhoto.c" } #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = start; #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { -#line 1082 "GPhoto.c" +#line 1083 "GPhoto.c" glong _tmp10_ = 0L; glong _tmp11_ = 0L; #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" @@ -1087,11 +1088,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) { _tmp11_ = string_length; #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; -#line 1091 "GPhoto.c" +#line 1092 "GPhoto.c" } else { #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = FALSE; -#line 1095 "GPhoto.c" +#line 1096 "GPhoto.c" } #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); @@ -1099,7 +1100,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) { _tmp13_ = end; #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { -#line 1103 "GPhoto.c" +#line 1104 "GPhoto.c" glong _tmp14_ = 0L; glong _tmp15_ = 0L; #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" @@ -1108,11 +1109,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) { _tmp15_ = string_length; #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; -#line 1112 "GPhoto.c" +#line 1113 "GPhoto.c" } else { #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = FALSE; -#line 1116 "GPhoto.c" +#line 1117 "GPhoto.c" } #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); @@ -1134,7 +1135,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) { result = _tmp21_; #line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 1138 "GPhoto.c" +#line 1139 "GPhoto.c" } @@ -1204,7 +1205,7 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con _tmp9_ = g_str_has_prefix (_tmp8_, prefix); #line 133 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (_tmp9_) { -#line 1208 "GPhoto.c" +#line 1209 "GPhoto.c" const gchar* _tmp10_ = NULL; gint _tmp11_ = 0; gint _tmp12_ = 0; @@ -1230,7 +1231,7 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con _g_free0 (path); #line 134 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" path = _tmp16_; -#line 1234 "GPhoto.c" +#line 1235 "GPhoto.c" } else { #line 136 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" result = NULL; @@ -1242,13 +1243,13 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con (port_info); #line 136 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 1246 "GPhoto.c" +#line 1247 "GPhoto.c" } #line 138 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp17_ = photo_metadata_new (); #line 138 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" metadata = _tmp17_; -#line 1252 "GPhoto.c" +#line 1253 "GPhoto.c" { PhotoMetadata* _tmp18_ = NULL; const gchar* _tmp19_ = NULL; @@ -1298,7 +1299,7 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con _g_free0 (_tmp22_); #line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1302 "GPhoto.c" +#line 1303 "GPhoto.c" goto __catch61_g_error; } } @@ -1313,7 +1314,7 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con _media_metadata_unref0 (metadata); #line 142 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" metadata = NULL; -#line 1317 "GPhoto.c" +#line 1318 "GPhoto.c" } __finally61: #line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -1332,7 +1333,7 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con g_clear_error (&_inner_error_); #line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return NULL; -#line 1336 "GPhoto.c" +#line 1337 "GPhoto.c" } #line 145 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" result = metadata; @@ -1344,14 +1345,14 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con (port_info); #line 145 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 1348 "GPhoto.c" +#line 1349 "GPhoto.c" } static guint8* _vala_array_dup23 (guint8* self, int length) { #line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return g_memdup (self, length * sizeof (guint8)); -#line 1355 "GPhoto.c" +#line 1356 "GPhoto.c" } @@ -1392,7 +1393,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol _vala_raw_length1 = 0; #line 151 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _vala_raw_length = (gsize) 0; -#line 1396 "GPhoto.c" +#line 1397 "GPhoto.c" { guint8* _tmp0_ = NULL; GPContext* _tmp1_ = NULL; @@ -1423,7 +1424,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol __tmp0__size_ = _tmp0__length1; #line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1427 "GPhoto.c" +#line 1428 "GPhoto.c" goto __catch62_g_error; } #line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -1442,7 +1443,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol _vala_raw_length1 = _tmp7__length1; #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp0_ = (g_free (_tmp0_), NULL); -#line 1446 "GPhoto.c" +#line 1447 "GPhoto.c" } goto __finally62; __catch62_g_error: @@ -1497,27 +1498,27 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol if (raw) { #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" *raw = _vala_raw; -#line 1501 "GPhoto.c" +#line 1502 "GPhoto.c" } else { #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _vala_raw = (g_free (_vala_raw), NULL); -#line 1505 "GPhoto.c" +#line 1506 "GPhoto.c" } #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (raw_length1) { #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" *raw_length1 = _vala_raw_length1; -#line 1511 "GPhoto.c" +#line 1512 "GPhoto.c" } #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (raw_length) { #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" *raw_length = _vala_raw_length; -#line 1517 "GPhoto.c" +#line 1518 "GPhoto.c" } #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 1521 "GPhoto.c" +#line 1522 "GPhoto.c" } #line 159 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp14_ = metadata; @@ -1533,27 +1534,27 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol if (raw) { #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" *raw = _vala_raw; -#line 1537 "GPhoto.c" +#line 1538 "GPhoto.c" } else { #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _vala_raw = (g_free (_vala_raw), NULL); -#line 1541 "GPhoto.c" +#line 1542 "GPhoto.c" } #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (raw_length1) { #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" *raw_length1 = _vala_raw_length1; -#line 1547 "GPhoto.c" +#line 1548 "GPhoto.c" } #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (raw_length) { #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" *raw_length = _vala_raw_length; -#line 1553 "GPhoto.c" +#line 1554 "GPhoto.c" } #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 1557 "GPhoto.c" +#line 1558 "GPhoto.c" } #line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp16_ = metadata; @@ -1581,7 +1582,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol _photo_preview_unref0 (preview); #line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _media_metadata_unref0 (metadata); -#line 1585 "GPhoto.c" +#line 1586 "GPhoto.c" goto __finally62; } #line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -1604,7 +1605,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol _photo_preview_unref0 (preview); #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _media_metadata_unref0 (metadata); -#line 1608 "GPhoto.c" +#line 1609 "GPhoto.c" } __finally62: #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -1613,7 +1614,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol g_propagate_error (error, _inner_error_); #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return NULL; -#line 1617 "GPhoto.c" +#line 1618 "GPhoto.c" } #line 165 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp25_ = _vala_raw; @@ -1629,27 +1630,27 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol if (raw) { #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" *raw = _vala_raw; -#line 1633 "GPhoto.c" +#line 1634 "GPhoto.c" } else { #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _vala_raw = (g_free (_vala_raw), NULL); -#line 1637 "GPhoto.c" +#line 1638 "GPhoto.c" } #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (raw_length1) { #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" *raw_length1 = _vala_raw_length1; -#line 1643 "GPhoto.c" +#line 1644 "GPhoto.c" } #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (raw_length) { #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" *raw_length = _vala_raw_length; -#line 1649 "GPhoto.c" +#line 1650 "GPhoto.c" } #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 1653 "GPhoto.c" +#line 1654 "GPhoto.c" } #line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp26_ = _vala_raw; @@ -1661,7 +1662,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol _tmp27_ = _vala_raw_length; #line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (_tmp27_ > ((gsize) 32)) { -#line 1665 "GPhoto.c" +#line 1666 "GPhoto.c" { gsize i = 0UL; gsize _tmp28_ = 0UL; @@ -1669,14 +1670,14 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol _tmp28_ = _vala_raw_length; #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" i = _tmp28_ - 2; -#line 1673 "GPhoto.c" +#line 1674 "GPhoto.c" { gboolean _tmp29_ = FALSE; #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp29_ = TRUE; #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" while (TRUE) { -#line 1680 "GPhoto.c" +#line 1681 "GPhoto.c" gsize _tmp31_ = 0UL; gsize _tmp32_ = 0UL; gboolean _tmp33_ = FALSE; @@ -1686,13 +1687,13 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol guint8 _tmp36_ = 0U; #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (!_tmp29_) { -#line 1690 "GPhoto.c" +#line 1691 "GPhoto.c" gsize _tmp30_ = 0UL; #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp30_ = i; #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" i = _tmp30_ - 1; -#line 1696 "GPhoto.c" +#line 1697 "GPhoto.c" } #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp29_ = FALSE; @@ -1704,7 +1705,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol if (!(_tmp31_ > (_tmp32_ - 32))) { #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" break; -#line 1708 "GPhoto.c" +#line 1709 "GPhoto.c" } #line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp34_ = _vala_raw; @@ -1716,7 +1717,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol _tmp36_ = _tmp34_[_tmp35_]; #line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (_tmp36_ == JPEG_MARKER_PREFIX) { -#line 1720 "GPhoto.c" +#line 1721 "GPhoto.c" guint8* _tmp37_ = NULL; gint _tmp37__length1 = 0; gsize _tmp38_ = 0UL; @@ -1731,15 +1732,15 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol _tmp39_ = _tmp37_[_tmp38_ + 1]; #line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp33_ = _tmp39_ == JPEG_MARKER_EOI; -#line 1735 "GPhoto.c" +#line 1736 "GPhoto.c" } else { #line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp33_ = FALSE; -#line 1739 "GPhoto.c" +#line 1740 "GPhoto.c" } #line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (_tmp33_) { -#line 1743 "GPhoto.c" +#line 1744 "GPhoto.c" const gchar* _tmp40_ = NULL; gsize _tmp41_ = 0UL; #line 179 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -1752,7 +1753,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol _vala_raw_length = _tmp41_ + 2; #line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" break; -#line 1756 "GPhoto.c" +#line 1757 "GPhoto.c" } } } @@ -1784,7 +1785,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol _g_object_unref0 (mins); #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return NULL; -#line 1788 "GPhoto.c" +#line 1789 "GPhoto.c" } #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp48_ = _tmp45_; @@ -1800,27 +1801,27 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol if (raw) { #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" *raw = _vala_raw; -#line 1804 "GPhoto.c" +#line 1805 "GPhoto.c" } else { #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _vala_raw = (g_free (_vala_raw), NULL); -#line 1808 "GPhoto.c" +#line 1809 "GPhoto.c" } #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (raw_length1) { #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" *raw_length1 = _vala_raw_length1; -#line 1814 "GPhoto.c" +#line 1815 "GPhoto.c" } #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (raw_length) { #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" *raw_length = _vala_raw_length; -#line 1820 "GPhoto.c" +#line 1821 "GPhoto.c" } #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 1824 "GPhoto.c" +#line 1825 "GPhoto.c" } @@ -1864,7 +1865,7 @@ GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folde g_propagate_error (error, _inner_error_); #line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return NULL; -#line 1868 "GPhoto.c" +#line 1869 "GPhoto.c" } #line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp5_ = ins; @@ -1876,7 +1877,7 @@ GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folde _g_object_unref0 (ins); #line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 1880 "GPhoto.c" +#line 1881 "GPhoto.c" } #line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp7_ = ins; @@ -1892,7 +1893,7 @@ GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folde _g_object_unref0 (ins); #line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return NULL; -#line 1896 "GPhoto.c" +#line 1897 "GPhoto.c" } #line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp9_ = _tmp6_; @@ -1906,7 +1907,7 @@ GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folde _g_object_unref0 (ins); #line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 1910 "GPhoto.c" +#line 1911 "GPhoto.c" } @@ -1961,7 +1962,7 @@ void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, con _tmp5_ = fd; #line 201 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (_tmp5_ < 0) { -#line 1965 "GPhoto.c" +#line 1966 "GPhoto.c" gint _tmp6_ = 0; GFile* _tmp7_ = NULL; gchar* _tmp8_ = NULL; @@ -1988,7 +1989,7 @@ void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, con g_propagate_error (error, _inner_error_); #line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return; -#line 1992 "GPhoto.c" +#line 1993 "GPhoto.c" } #line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp12_ = fd; @@ -2004,7 +2005,7 @@ void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, con _tmp15_ = res; #line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (_tmp15_ != GP_OK) { -#line 2008 "GPhoto.c" +#line 2009 "GPhoto.c" gint _tmp16_ = 0; int _tmp17_ = 0; int _tmp18_ = 0; @@ -2030,7 +2031,7 @@ void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, con _gp_file_unref0 (camera_file); #line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return; -#line 2034 "GPhoto.c" +#line 2035 "GPhoto.c" } #line 212 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp21_ = camera; @@ -2050,7 +2051,7 @@ void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, con _tmp27_ = res; #line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (_tmp27_ != GP_OK) { -#line 2054 "GPhoto.c" +#line 2055 "GPhoto.c" gint _tmp28_ = 0; int _tmp29_ = 0; const gchar* _tmp30_ = NULL; @@ -2082,7 +2083,7 @@ void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, con _gp_file_unref0 (camera_file); #line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return; -#line 2086 "GPhoto.c" +#line 2087 "GPhoto.c" } #line 219 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp35_ = fd; @@ -2090,7 +2091,7 @@ void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, con close (_tmp35_); #line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _gp_file_unref0 (camera_file); -#line 2094 "GPhoto.c" +#line 2095 "GPhoto.c" } @@ -2122,7 +2123,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar camera_raw_length1 = 0; #line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _camera_raw_size_ = camera_raw_length1; -#line 2126 "GPhoto.c" +#line 2127 "GPhoto.c" { guint8* _tmp0_ = NULL; GPContext* _tmp1_ = NULL; @@ -2153,7 +2154,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar __tmp0__size_ = _tmp0__length1; #line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2157 "GPhoto.c" +#line 2158 "GPhoto.c" goto __catch63_g_error; } #line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -2174,7 +2175,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar _camera_raw_size_ = camera_raw_length1; #line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp0_ = (g_free (_tmp0_), NULL); -#line 2178 "GPhoto.c" +#line 2179 "GPhoto.c" } goto __finally63; __catch63_g_error: @@ -2204,7 +2205,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar camera_raw = (g_free (camera_raw), NULL); #line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 2208 "GPhoto.c" +#line 2209 "GPhoto.c" } __finally63: #line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -2215,7 +2216,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar camera_raw = (g_free (camera_raw), NULL); #line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return NULL; -#line 2219 "GPhoto.c" +#line 2220 "GPhoto.c" } #line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp14_ = camera_raw; @@ -2225,7 +2226,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar if (_tmp14_ == NULL) { #line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp13_ = TRUE; -#line 2229 "GPhoto.c" +#line 2230 "GPhoto.c" } else { guint8* _tmp15_ = NULL; gint _tmp15__length1 = 0; @@ -2235,7 +2236,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar _tmp15__length1 = camera_raw_length1; #line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp13_ = _tmp15__length1 == 0; -#line 2239 "GPhoto.c" +#line 2240 "GPhoto.c" } #line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (_tmp13_) { @@ -2245,7 +2246,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar camera_raw = (g_free (camera_raw), NULL); #line 232 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 2249 "GPhoto.c" +#line 2250 "GPhoto.c" } #line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp16_ = photo_metadata_new (); @@ -2269,7 +2270,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar camera_raw = (g_free (camera_raw), NULL); #line 235 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return NULL; -#line 2273 "GPhoto.c" +#line 2274 "GPhoto.c" } #line 237 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" result = metadata; @@ -2277,21 +2278,21 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar camera_raw = (g_free (camera_raw), NULL); #line 237 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 2281 "GPhoto.c" +#line 2282 "GPhoto.c" } static guint8* _vala_array_dup24 (guint8* self, int length) { #line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return g_memdup (self, length * sizeof (guint8)); -#line 2288 "GPhoto.c" +#line 2289 "GPhoto.c" } static void _gp_on_mins_destroyed_gdestroy_notify (void* data) { #line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" gp_on_mins_destroyed (data); -#line 2295 "GPhoto.c" +#line 2296 "GPhoto.c" } @@ -2350,7 +2351,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons _tmp2_ = res; #line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (_tmp2_ != GP_OK) { -#line 2354 "GPhoto.c" +#line 2355 "GPhoto.c" int _tmp3_ = 0; int _tmp4_ = 0; const gchar* _tmp5_ = NULL; @@ -2371,7 +2372,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons _gp_file_unref0 (camera_file); #line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return NULL; -#line 2375 "GPhoto.c" +#line 2376 "GPhoto.c" } #line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp7_ = camera; @@ -2391,7 +2392,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons _tmp13_ = res; #line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (_tmp13_ != GP_OK) { -#line 2395 "GPhoto.c" +#line 2396 "GPhoto.c" int _tmp14_ = 0; const gchar* _tmp15_ = NULL; const gchar* _tmp16_ = NULL; @@ -2418,7 +2419,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons _gp_file_unref0 (camera_file); #line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return NULL; -#line 2422 "GPhoto.c" +#line 2423 "GPhoto.c" } #line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp22_ = gp_file_get_data_and_size (camera_file, &_tmp20_, &_tmp21_); @@ -2432,7 +2433,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons _tmp23_ = res; #line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (_tmp23_ == GP_OK) { -#line 2436 "GPhoto.c" +#line 2437 "GPhoto.c" guint8* buffer = NULL; gulong _tmp24_ = 0UL; guint8* _tmp25_ = NULL; @@ -2488,7 +2489,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons _gp_file_unref0 (camera_file); #line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 2492 "GPhoto.c" +#line 2493 "GPhoto.c" } #line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp32_ = app_dirs_get_temp_dir (); @@ -2518,7 +2519,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons _tmp40_ = res; #line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (_tmp40_ != GP_OK) { -#line 2522 "GPhoto.c" +#line 2523 "GPhoto.c" int _tmp41_ = 0; const gchar* _tmp42_ = NULL; const gchar* _tmp43_ = NULL; @@ -2561,7 +2562,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons _gp_file_unref0 (camera_file); #line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return NULL; -#line 2565 "GPhoto.c" +#line 2566 "GPhoto.c" } #line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp52_ = temp; @@ -2579,7 +2580,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons _gp_file_unref0 (camera_file); #line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return NULL; -#line 2583 "GPhoto.c" +#line 2584 "GPhoto.c" } #line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp54_ = _tmp51_; @@ -2595,7 +2596,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons _gp_file_unref0 (camera_file); #line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 2599 "GPhoto.c" +#line 2600 "GPhoto.c" } @@ -2605,7 +2606,7 @@ void gp_on_mins_destroyed (void* data) { _tmp0_ = data; #line 278 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" g_free (_tmp0_); -#line 2609 "GPhoto.c" +#line 2610 "GPhoto.c" } @@ -2664,7 +2665,7 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha _tmp2_ = res; #line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (_tmp2_ != GP_OK) { -#line 2668 "GPhoto.c" +#line 2669 "GPhoto.c" int _tmp3_ = 0; int _tmp4_ = 0; const gchar* _tmp5_ = NULL; @@ -2685,7 +2686,7 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha _gp_file_unref0 (camera_file); #line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return NULL; -#line 2689 "GPhoto.c" +#line 2690 "GPhoto.c" } #line 289 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp7_ = camera; @@ -2707,7 +2708,7 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha _tmp14_ = res; #line 290 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (_tmp14_ != GP_OK) { -#line 2711 "GPhoto.c" +#line 2712 "GPhoto.c" int _tmp15_ = 0; const gchar* _tmp16_ = NULL; const gchar* _tmp17_ = NULL; @@ -2734,7 +2735,7 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha _gp_file_unref0 (camera_file); #line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return NULL; -#line 2738 "GPhoto.c" +#line 2739 "GPhoto.c" } #line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp21_ = camera_file; @@ -2750,7 +2751,7 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha _tmp25_ = res; #line 299 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" if (_tmp25_ != GP_OK) { -#line 2754 "GPhoto.c" +#line 2755 "GPhoto.c" guint8* _tmp26_ = NULL; gint _tmp26__length1 = 0; #line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" @@ -2761,7 +2762,7 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha if (result_length1) { #line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" *result_length1 = _tmp26__length1; -#line 2765 "GPhoto.c" +#line 2766 "GPhoto.c" } #line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" result = _tmp26_; @@ -2769,7 +2770,7 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha _gp_file_unref0 (camera_file); #line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 2773 "GPhoto.c" +#line 2774 "GPhoto.c" } #line 302 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" _tmp27_ = data_len; @@ -2801,7 +2802,7 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha if (result_length1) { #line 305 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" *result_length1 = _tmp32__length1; -#line 2805 "GPhoto.c" +#line 2806 "GPhoto.c" } #line 305 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" result = _tmp32_; @@ -2809,7 +2810,7 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha _gp_file_unref0 (camera_file); #line 305 "/home/jens/Source/shotwell/src/camera/GPhoto.vala" return result; -#line 2813 "GPhoto.c" +#line 2814 "GPhoto.c" } -- cgit v1.2.3