diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-05-01 14:43:08 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-05-01 14:43:08 +0200 |
| commit | 2b3f22361da0c1d8e6ce70d71352821758186db7 (patch) | |
| tree | 5d10633b47369b3aa52a05bf889ede0dbe5ee108 /src/photos/BmpSupport.c | |
| parent | 211da5fc3048ca2b6ccee2166b0aaaade55cb84f (diff) | |
| parent | dc6c76eb04dfe3d4262a1806808f0bc0bf523238 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/photos/BmpSupport.c')
| -rw-r--r-- | src/photos/BmpSupport.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/photos/BmpSupport.c b/src/photos/BmpSupport.c index eeffbb9..e6f204c 100644 --- a/src/photos/BmpSupport.c +++ b/src/photos/BmpSupport.c @@ -502,10 +502,10 @@ static PhotoFileFormatFlags photos_bmp_file_format_properties_real_get_flags (Ph static gchar* photos_bmp_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base); static gchar* photos_bmp_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base); static gchar** photos_bmp_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1); -static gchar** _vala_array_dup10 (gchar** self, int length); +static gchar** _vala_array_dup8 (gchar** self, int length); static gchar* photos_bmp_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base); static gchar** photos_bmp_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1); -static gchar** _vala_array_dup11 (gchar** self, int length); +static gchar** _vala_array_dup9 (gchar** self, int length); PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type); static void photos_bmp_file_format_properties_finalize (PhotoFileFormatProperties * obj); gpointer photo_file_sniffer_ref (gpointer instance); @@ -716,7 +716,7 @@ static gchar* photos_bmp_file_format_properties_real_get_default_extension (Phot } -static gchar** _vala_array_dup10 (gchar** self, int length) { +static gchar** _vala_array_dup8 (gchar** self, int length) { gchar** result; int i; #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -753,7 +753,7 @@ static gchar** photos_bmp_file_format_properties_real_get_known_extensions (Phot #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp0__length1 = photos_bmp_file_format_properties_KNOWN_EXTENSIONS_length1; #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup10 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); + _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup8 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp1__length1 = _tmp0__length1; #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -799,7 +799,7 @@ static gchar* photos_bmp_file_format_properties_real_get_default_mime_type (Phot } -static gchar** _vala_array_dup11 (gchar** self, int length) { +static gchar** _vala_array_dup9 (gchar** self, int length) { gchar** result; int i; #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -836,7 +836,7 @@ static gchar** photos_bmp_file_format_properties_real_get_mime_types (PhotoFileF #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp0__length1 = photos_bmp_file_format_properties_KNOWN_MIME_TYPES_length1; #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup11 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); + _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup9 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp1__length1 = _tmp0__length1; #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" |