output-item: Collapse the inheritance hierarchy into a single struct.

[pspp] / src / output / spv / spv.c

diff --git a/src/output/spv/spv.c b/src/output/spv/spv.c
index 574f068f54077a6c69b0e46053e96bea7290fb02..fdafb5aba7c96c3ef3cb0ff9a815b2360257a96a 100644 (file)
--- 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"
@@ -201,7 +201,6 @@ spv_item_is_image (const struct spv_item *item)
   return item->type == SPV_ITEM_IMAGE;
 }
 
-#ifdef HAVE_CAIRO
 static cairo_status_t
 read_from_zip_member (void *zm_, unsigned char *data, unsigned int length)
 {
@@ -240,7 +239,6 @@ spv_item_get_image (const struct spv_item *item_)
 
   return item->image;
 }
-#endif
 
 struct spv_item *
 spv_item_next (const struct spv_item *item)
@@ -315,10 +313,8 @@ spv_item_destroy (struct spv_item *item)
       pivot_value_destroy (item->text);
 
       free (item->png_member);
-#ifdef HAVE_CAIRO
       if (item->image)
         cairo_surface_destroy (item->image);
-#endif
 
       free (item);
     }
@@ -623,10 +619,8 @@ spv_item_load (const struct spv_item *item)
 {
   if (spv_item_is_table (item))
     spv_item_get_table (item);
-#ifdef HAVE_CAIRO
   else if (spv_item_is_image (item))
     spv_item_get_image (item);
-#endif
 }
 
 bool