[gnumeric] Ensure that the pixbuf stores the image type.
- From: Jean Bréfort <jbrefort src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Ensure that the pixbuf stores the image type.
- Date: Sat, 28 Feb 2015 19:19:05 +0000 (UTC)
commit 7dd91e30e636c4130e8b2bb1936d110b05b8b40a
Author: Jean Brefort <jean brefort normalesup org>
Date: Sat Feb 28 20:18:32 2015 +0100
Ensure that the pixbuf stores the image type.
ChangeLog | 5 +++++
src/sheet-object-image.c | 6 +++++-
2 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 8678ad2..ce250b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-28 Jean Brefort <jean brefort normalesup org>
+
+ * src/sheet-object-image.c (gnm_soi_assign_to_sheet): ensure that the
+ pixbuf stores the image type.
+
2015-02-28 Morten Welinder <terra gnome org>
* src/sheet-object-image.c (SheetObjectImage): Just keep the
diff --git a/src/sheet-object-image.c b/src/sheet-object-image.c
index dae13c7..12f0b13 100644
--- a/src/sheet-object-image.c
+++ b/src/sheet-object-image.c
@@ -507,8 +507,12 @@ gnm_soi_assign_to_sheet (SheetObject *so, Sheet *sheet)
} else if (soi->name) {
GODoc *doc = GO_DOC (sheet->workbook);
GType type = go_image_type_for_format (soi->type);
- if (type != 0)
+ if (type != 0) {
soi->image = g_object_ref (go_doc_image_fetch (doc, soi->name, type));
+ if (GO_IS_PIXBUF (soi->image))
+ /* we need to ensure that the pixbuf type is set because it used to be
missed, see #745297 */
+ g_object_set (soi->image, "image-type", soi->type, NULL);
+ }
} else {
/* There is nothing we can do */
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]