Bitmap image rendering

(bzr r9508.1.6)

1 files changed, 7 insertions, 8 deletions

diff --git a/src/display/nr-arena-image.h b/src/display/nr-arena-image.h
index 209cb8de6..c2a3b805c 100644
--- a/src/display/nr-arena-image.h
+++ b/src/display/nr-arena-image.h
@@ -13,20 +13,18 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include "nr-arena-item.h"
+#include "style.h"
+
 #define NR_TYPE_ARENA_IMAGE (nr_arena_image_get_type ())
 #define NR_ARENA_IMAGE(o) (NR_CHECK_INSTANCE_CAST ((o), NR_TYPE_ARENA_IMAGE, NRArenaImage))
 #define NR_IS_ARENA_IMAGE(o) (NR_CHECK_INSTANCE_TYPE ((o), NR_TYPE_ARENA_IMAGE))
 
-#include "nr-arena-item.h"
-#include "style.h"
-
 NRType nr_arena_image_get_type (void);
 
 struct NRArenaImage : public NRArenaItem {
-    unsigned char *px;
-    unsigned int pxw;
-    unsigned int pxh;
-    unsigned int pxrs;
+    GdkPixbuf *pixbuf;
 
     double x, y;
     double width, height;
@@ -35,6 +33,7 @@ struct NRArenaImage : public NRArenaItem {
 
     /* From GRID to PIXELS */
     Geom::Matrix grid2px;
+    Geom::Matrix px2grid;
 
     SPStyle *style;
 
@@ -49,7 +48,7 @@ struct NRArenaImageClass {
     NRArenaItemClass parent_class;
 };
 
-void nr_arena_image_set_pixels (NRArenaImage *image, unsigned char const *px, unsigned int pxw, unsigned int pxh, unsigned int pxrs);
+void nr_arena_image_set_pixbuf (NRArenaImage *image, GdkPixbuf *pb);
 void nr_arena_image_set_geometry (NRArenaImage *image, double x, double y, double width, double height);
 void nr_arena_image_set_style (NRArenaImage *image, SPStyle *style);