X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fspv%2Fspv.c;h=fc058281eccd633f1e1824cd78c12a728de8fb51;hb=bd5e8f74de87b9061ff62615f48fb378e844e87d;hp=5f537edfc84da8a6e6482ce55be4bc142ad7315f;hpb=5164eb1bfa0527dcb32248fb1fc7db55c2bcc94c;p=pspp diff --git a/src/output/spv/spv.c b/src/output/spv/spv.c index 5f537edfc8..fc058281ec 100644 --- a/src/output/spv/spv.c +++ b/src/output/spv/spv.c @@ -31,7 +31,7 @@ #include "libpspp/message.h" #include "libpspp/str.h" #include "libpspp/zip-reader.h" -#include "output/page-setup-item.h" +#include "output/page-setup.h" #include "output/pivot-table.h" #include "output/spv/detail-xml-parser.h" #include "output/spv/light-binary-parser.h" @@ -55,7 +55,6 @@ struct spv_reader { - struct string zip_errs; struct zip_reader *zip; struct spv_item *root; struct page_setup *page_setup; @@ -77,7 +76,7 @@ spv_item_type_to_string (enum spv_item_type type) case SPV_ITEM_TABLE: return "table"; case SPV_ITEM_GRAPH: return "graph"; case SPV_ITEM_MODEL: return "model"; - case SPV_ITEM_OBJECT: return "object"; + case SPV_ITEM_IMAGE: return "image"; default: return "**error**"; } } @@ -140,7 +139,7 @@ spv_item_get_class (const struct spv_item *item) case SPV_ITEM_MODEL: return SPV_CLASS_MODELS; - case SPV_ITEM_OBJECT: + case SPV_ITEM_IMAGE: return SPV_CLASS_OTHER; case SPV_ITEM_TREE: @@ -195,6 +194,51 @@ spv_item_get_text (const struct spv_item *item) return item->text; } +bool +spv_item_is_image (const struct spv_item *item) +{ + return item->type == SPV_ITEM_IMAGE; +} + +static cairo_status_t +read_from_zip_member (void *zm_, unsigned char *data, unsigned int length) +{ + struct zip_member *zm = zm_; + if (!zm) + return CAIRO_STATUS_READ_ERROR; + + while (length > 0) + { + int n = zip_member_read (zm, data, length); + if (n <= 0) + return CAIRO_STATUS_READ_ERROR; + + data += n; + length -= n; + } + + return CAIRO_STATUS_SUCCESS; +} + +cairo_surface_t * +spv_item_get_image (const struct spv_item *item_) +{ + struct spv_item *item = CONST_CAST (struct spv_item *, item_); + assert (spv_item_is_image (item)); + + if (!item->image) + { + struct zip_member *zm; + char *error = zip_member_open (item->spv->zip, item->png_member, &zm); + item->image = cairo_image_surface_create_from_png_stream ( + read_from_zip_member, zm); + zip_member_finish (zm); + free (error); + } + + return item->image; +} + struct spv_item * spv_item_next (const struct spv_item *item) { @@ -260,19 +304,16 @@ spv_item_destroy (struct spv_item *item) free (item->children); pivot_table_unref (item->table); - if (item->table_look) - { - pivot_table_look_uninit (item->table_look); - free (item->table_look); - } + pivot_table_look_unref (item->table_look); free (item->bin_member); free (item->xml_member); free (item->subtype); pivot_value_destroy (item->text); - free (item->object_type); - free (item->uri); + free (item->png_member); + if (item->image) + cairo_surface_destroy (item->image); free (item); } @@ -577,6 +618,8 @@ spv_item_load (const struct spv_item *item) { if (spv_item_is_table (item)) spv_item_get_table (item); + else if (spv_item_is_image (item)) + spv_item_get_image (item); } bool @@ -685,9 +728,10 @@ spv_read_xml_member (struct spv_reader *spv, const char *member_name, { *docp = NULL; - struct zip_member *zm = zip_member_open (spv->zip, member_name); - if (!zm) - return ds_steal_cstr (&spv->zip_errs); + struct zip_member *zm; + char *error = zip_member_open (spv->zip, member_name, &zm); + if (error) + return error; xmlParserCtxt *parser; xmlKeepBlanksDefault (keep_blanks); @@ -710,7 +754,7 @@ spv_read_xml_member (struct spv_reader *spv, const char *member_name, if (retval < 0) { - char *error = ds_steal_cstr (&spv->zip_errs); + char *error = zip_member_steal_error (zm); zip_member_finish (zm); xmlFreeDoc (doc); return error; @@ -853,7 +897,7 @@ pivot_table_open_legacy (struct spv_item *item) return error; } -struct pivot_table * +const struct pivot_table * spv_item_get_table (const struct spv_item *item_) { struct spv_item *item = CONST_CAST (struct spv_item *, item_); @@ -938,24 +982,17 @@ spv_decode_container (const struct spvsx_container *c, else if (spvsx_is_object (content)) { struct spvsx_object *object = spvsx_cast_object (content); - item->type = SPV_ITEM_OBJECT; - item->object_type = xstrdup (object->type); - item->uri = xstrdup (object->uri); + item->type = SPV_ITEM_IMAGE; + item->png_member = xstrdup (object->uri); } else if (spvsx_is_image (content)) { struct spvsx_image *image = spvsx_cast_image (content); - item->type = SPV_ITEM_OBJECT; - item->object_type = xstrdup ("image"); - item->uri = xstrdup (image->data_path->text); + item->type = SPV_ITEM_IMAGE; + item->png_member = xstrdup (image->data_path->text); } else if (spvsx_is_tree (content)) - { - struct spvsx_tree *tree = spvsx_cast_tree (content); - item->type = SPV_ITEM_TREE; - item->object_type = xstrdup ("tree"); - item->uri = xstrdup (tree->data_path->text); - } + item->type = SPV_ITEM_TREE; else NOT_REACHED (); @@ -1116,16 +1153,14 @@ spv_detect__ (struct zip_reader *zip, char **errorp) char * WARN_UNUSED_RESULT spv_detect (const char *filename) { - struct string zip_error; - struct zip_reader *zip = zip_reader_create (filename, &zip_error); - if (!zip) - return ds_steal_cstr (&zip_error); + struct zip_reader *zip; + char *error = zip_reader_create (filename, &zip); + if (error) + return error; - char *error; if (spv_detect__ (zip, &error) <= 0 && !error) error = xasprintf("%s: not an SPV file", filename); - zip_reader_destroy (zip); - ds_destroy (&zip_error); + zip_reader_unref (zip); return error; } @@ -1135,16 +1170,13 @@ spv_open (const char *filename, struct spv_reader **spvp) *spvp = NULL; struct spv_reader *spv = xzalloc (sizeof *spv); - ds_init_empty (&spv->zip_errs); - spv->zip = zip_reader_create (filename, &spv->zip_errs); - if (!spv->zip) + char *error = zip_reader_create (filename, &spv->zip); + if (error) { - char *error = ds_steal_cstr (&spv->zip_errs); spv_close (spv); return error; } - char *error; int detect = spv_detect__ (spv->zip, &error); if (detect <= 0) { @@ -1183,8 +1215,7 @@ spv_close (struct spv_reader *spv) { if (spv) { - ds_destroy (&spv->zip_errs); - zip_reader_destroy (spv->zip); + zip_reader_unref (spv->zip); spv_item_destroy (spv->root); page_setup_destroy (spv->page_setup); free (spv); @@ -1200,7 +1231,10 @@ spv_item_set_table_look (struct spv_item *item, (We can't just set item->table_look because light tables ignore it and legacy tables sometimes override it.) */ if (spv_item_is_table (item)) - pivot_table_set_look (spv_item_get_table (item), look); + { + spv_item_load (item); + pivot_table_set_look (item->table, look); + } for (size_t i = 0; i < item->n_children; i++) spv_item_set_table_look (item->children[i], look);