Merge tag 'upstream/3.6.0'

Upstream version 3.6.0

1 files changed, 5 insertions, 5 deletions

diff --git a/src/page.c b/src/page.c
index a6d0673..8fa7c81 100644
--- a/src/page.c
+++ b/src/page.c
@@ -1,4 +1,4 @@
-/* page.c generated by valac 0.16.1, the Vala compiler
+/* page.c generated by valac 0.17.7, the Vala compiler
  * generated from page.vala, do not modify */
 
 /*
@@ -2152,8 +2152,8 @@ static gchar* page_get_icc_data_encoded (Page* self, const gchar* icc_profile_fi
 	_tmp4_ = contents;
 	_tmp6_ = string_to_utf8 (_tmp4_, &_tmp5_);
 	_tmp7_ = (guchar*) _tmp6_;
-	_tmp7__length1 = _tmp5_;
-	_tmp8_ = g_base64_encode (_tmp7_, _tmp5_);
+	_tmp7__length1 = (_tmp5_ * sizeof (gchar)) / sizeof (guchar);
+	_tmp8_ = g_base64_encode (_tmp7_, (_tmp5_ * sizeof (gchar)) / sizeof (guchar));
 	_tmp9_ = _tmp8_;
 	_tmp7_ = (g_free (_tmp7_), NULL);
 	result = _tmp9_;
@@ -2545,7 +2545,7 @@ static void page_instance_init (Page * self) {
 
 static void page_finalize (Page* obj) {
 	Page * self;
-	self = PAGE (obj);
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PAGE, Page);
 	_g_free0 (self->priv->color_profile);
 	self->priv->pixels = (g_free (self->priv->pixels), NULL);
 	_g_free0 (self->priv->crop_name);
@@ -2783,7 +2783,7 @@ static void pixbuf_writer_instance_init (PixbufWriter * self) {
 
 static void pixbuf_writer_finalize (PixbufWriter* obj) {
 	PixbufWriter * self;
-	self = PIXBUF_WRITER (obj);
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PIXBUF_WRITER, PixbufWriter);
 	_g_object_unref0 (self->stream);
 }