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/photos/TiffSupport.c | 124 +++++++++++++++++++++++++---------------------- 1 file changed, 65 insertions(+), 59 deletions(-) (limited to 'src/photos/TiffSupport.c') diff --git a/src/photos/TiffSupport.c b/src/photos/TiffSupport.c index 1b70973..1fcbfa7 100644 --- a/src/photos/TiffSupport.c +++ b/src/photos/TiffSupport.c @@ -1,4 +1,4 @@ -/* TiffSupport.c generated by valac 0.34.4, the Vala compiler +/* TiffSupport.c generated by valac 0.34.7, the Vala compiler * generated from TiffSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -811,21 +811,21 @@ static void photos_tiff_file_format_driver_class_init (PhotosTiffFileFormatDrive #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" ((PhotoFileFormatDriverClass *) klass)->finalize = photos_tiff_file_format_driver_finalize; #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->get_properties = photos_tiff_file_format_driver_real_get_properties; + ((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*)(PhotoFileFormatDriver*)) photos_tiff_file_format_driver_real_get_properties; #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->create_reader = photos_tiff_file_format_driver_real_create_reader; + ((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*)(PhotoFileFormatDriver*, const gchar*)) photos_tiff_file_format_driver_real_create_reader; #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->create_metadata = photos_tiff_file_format_driver_real_create_metadata; + ((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*)(PhotoFileFormatDriver*)) photos_tiff_file_format_driver_real_create_metadata; #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->can_write_image = photos_tiff_file_format_driver_real_can_write_image; + ((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*)(PhotoFileFormatDriver*)) photos_tiff_file_format_driver_real_can_write_image; #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->can_write_metadata = photos_tiff_file_format_driver_real_can_write_metadata; + ((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*)(PhotoFileFormatDriver*)) photos_tiff_file_format_driver_real_can_write_metadata; #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->create_writer = photos_tiff_file_format_driver_real_create_writer; + ((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*)(PhotoFileFormatDriver*, const gchar*)) photos_tiff_file_format_driver_real_create_writer; #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = photos_tiff_file_format_driver_real_create_metadata_writer; + ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*)(PhotoFileFormatDriver*, const gchar*)) photos_tiff_file_format_driver_real_create_metadata_writer; #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->create_sniffer = photos_tiff_file_format_driver_real_create_sniffer; + ((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*)(PhotoFileFormatDriver*, GFile*, PhotoFileSnifferOptions)) photos_tiff_file_format_driver_real_create_sniffer; #line 830 "TiffSupport.c" } @@ -1121,19 +1121,19 @@ static void photos_tiff_file_format_properties_class_init (PhotosTiffFileFormatP #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" ((PhotoFileFormatPropertiesClass *) klass)->finalize = photos_tiff_file_format_properties_finalize; #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_file_format = photos_tiff_file_format_properties_real_get_file_format; + ((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*)(PhotoFileFormatProperties*)) photos_tiff_file_format_properties_real_get_file_format; #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_flags = photos_tiff_file_format_properties_real_get_flags; + ((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*)(PhotoFileFormatProperties*)) photos_tiff_file_format_properties_real_get_flags; #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = photos_tiff_file_format_properties_real_get_default_extension; + ((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*)(PhotoFileFormatProperties*)) photos_tiff_file_format_properties_real_get_default_extension; #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = photos_tiff_file_format_properties_real_get_user_visible_name; + ((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*)(PhotoFileFormatProperties*)) photos_tiff_file_format_properties_real_get_user_visible_name; #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = photos_tiff_file_format_properties_real_get_known_extensions; + ((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*)(PhotoFileFormatProperties*, int*)) photos_tiff_file_format_properties_real_get_known_extensions; #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = photos_tiff_file_format_properties_real_get_default_mime_type; + ((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*)(PhotoFileFormatProperties*)) photos_tiff_file_format_properties_real_get_default_mime_type; #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = photos_tiff_file_format_properties_real_get_mime_types; + ((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*)(PhotoFileFormatProperties*, int*)) photos_tiff_file_format_properties_real_get_mime_types; #line 55 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _tmp0_ = g_strdup ("tif"); #line 55 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -1340,7 +1340,7 @@ static void photos_tiff_sniffer_class_init (PhotosTiffSnifferClass * klass) { #line 102 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" photos_tiff_sniffer_parent_class = g_type_class_peek_parent (klass); #line 102 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileSnifferClass *) klass)->sniff = photos_tiff_sniffer_real_sniff; + ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) photos_tiff_sniffer_real_sniff; #line 1345 "TiffSupport.c" } @@ -1463,7 +1463,7 @@ static void photos_tiff_writer_class_init (PhotosTiffWriterClass * klass) { #line 128 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" photos_tiff_writer_parent_class = g_type_class_peek_parent (klass); #line 128 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileWriterClass *) klass)->write = photos_tiff_writer_real_write; + ((PhotoFileWriterClass *) klass)->write = (void (*)(PhotoFileWriter*, GdkPixbuf*, JpegQuality, GError**)) photos_tiff_writer_real_write; #line 1468 "TiffSupport.c" } @@ -1541,7 +1541,7 @@ static void photos_tiff_metadata_writer_class_init (PhotosTiffMetadataWriterClas #line 144 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" photos_tiff_metadata_writer_parent_class = g_type_class_peek_parent (klass); #line 144 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileMetadataWriterClass *) klass)->write_metadata = photos_tiff_metadata_writer_real_write_metadata; + ((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*)(PhotoFileMetadataWriter*, PhotoMetadata*, GError**)) photos_tiff_metadata_writer_real_write_metadata; #line 1546 "TiffSupport.c" } @@ -1568,19 +1568,19 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error) GFile* _tmp1_ = NULL; GFileInputStream* _tmp2_ = NULL; GDataInputStream* dins = NULL; - GDataInputStream* _tmp3_ = NULL; + GDataInputStream* _tmp4_ = NULL; GDataStreamByteOrder order = 0; - guint16 _tmp4_ = 0U; - GDataInputStream* _tmp5_ = NULL; - GCancellable* _tmp6_ = NULL; - guint16 _tmp7_ = 0U; - GDataInputStream* _tmp8_ = NULL; - GDataStreamByteOrder _tmp9_ = 0; - guint16 lue = 0U; + guint16 _tmp5_ = 0U; + GDataInputStream* _tmp6_ = NULL; + GCancellable* _tmp7_ = NULL; + guint16 _tmp8_ = 0U; GDataInputStream* _tmp10_ = NULL; - GCancellable* _tmp11_ = NULL; - guint16 _tmp12_ = 0U; - guint16 _tmp13_ = 0U; + GDataStreamByteOrder _tmp11_ = 0; + guint16 lue = 0U; + GDataInputStream* _tmp12_ = NULL; + GCancellable* _tmp13_ = NULL; + guint16 _tmp14_ = 0U; + guint16 _tmp16_ = 0U; GError * _inner_error_ = NULL; #line 154 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); @@ -1594,26 +1594,30 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error) _tmp0_ = _tmp2_; #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 1598 "TiffSupport.c" + gboolean _tmp3_ = FALSE; #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_propagate_error (error, _inner_error_); #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - return FALSE; -#line 1602 "TiffSupport.c" + return _tmp3_; +#line 1604 "TiffSupport.c" } #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream)); + _tmp4_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream)); #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - dins = _tmp3_; + dins = _tmp4_; #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp5_ = dins; + _tmp6_ = dins; #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp6_ = cancellable; + _tmp7_ = cancellable; #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp7_ = g_data_input_stream_read_uint16 (_tmp5_, _tmp6_, &_inner_error_); + _tmp8_ = g_data_input_stream_read_uint16 (_tmp6_, _tmp7_, &_inner_error_); #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp4_ = _tmp7_; + _tmp5_ = _tmp8_; #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 1620 "TiffSupport.c" + gboolean _tmp9_ = FALSE; #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_propagate_error (error, _inner_error_); #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -1621,30 +1625,30 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error) #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _g_object_unref0 (_tmp0_); #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - return FALSE; -#line 1626 "TiffSupport.c" + return _tmp9_; +#line 1630 "TiffSupport.c" } #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - switch (_tmp4_) { + switch (_tmp5_) { #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" case 0x4949: -#line 1632 "TiffSupport.c" +#line 1636 "TiffSupport.c" { #line 161 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" order = G_DATA_STREAM_BYTE_ORDER_LITTLE_ENDIAN; #line 162 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" break; -#line 1638 "TiffSupport.c" +#line 1642 "TiffSupport.c" } #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" case 0x4D4D: -#line 1642 "TiffSupport.c" +#line 1646 "TiffSupport.c" { #line 165 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" order = G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN; #line 166 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" break; -#line 1648 "TiffSupport.c" +#line 1652 "TiffSupport.c" } default: { @@ -1656,25 +1660,27 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error) _g_object_unref0 (_tmp0_); #line 169 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1660 "TiffSupport.c" +#line 1664 "TiffSupport.c" } } #line 172 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp8_ = dins; + _tmp10_ = dins; #line 172 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp9_ = order; + _tmp11_ = order; #line 172 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - g_data_input_stream_set_byte_order (_tmp8_, _tmp9_); + g_data_input_stream_set_byte_order (_tmp10_, _tmp11_); #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp10_ = dins; + _tmp12_ = dins; #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp11_ = cancellable; + _tmp13_ = cancellable; #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp12_ = g_data_input_stream_read_uint16 (_tmp10_, _tmp11_, &_inner_error_); + _tmp14_ = g_data_input_stream_read_uint16 (_tmp12_, _tmp13_, &_inner_error_); #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - lue = _tmp12_; + lue = _tmp14_; #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 1683 "TiffSupport.c" + gboolean _tmp15_ = FALSE; #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_propagate_error (error, _inner_error_); #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -1682,13 +1688,13 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error) #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _g_object_unref0 (_tmp0_); #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - return FALSE; -#line 1687 "TiffSupport.c" + return _tmp15_; +#line 1693 "TiffSupport.c" } #line 176 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp13_ = lue; + _tmp16_ = lue; #line 176 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - if (((gint) _tmp13_) != 42) { + if (((gint) _tmp16_) != 42) { #line 177 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" result = FALSE; #line 177 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -1697,7 +1703,7 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error) _g_object_unref0 (_tmp0_); #line 177 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1701 "TiffSupport.c" +#line 1707 "TiffSupport.c" } #line 180 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" result = TRUE; @@ -1707,7 +1713,7 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error) _g_object_unref0 (_tmp0_); #line 180 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1711 "TiffSupport.c" +#line 1717 "TiffSupport.c" } -- cgit v1.2.3