Merge branch 'master' into 'wip/chergert/bidi-temp-allocs'wip/chergert/bidi-temp-allocs

# Conflicts:
#   pango/pango-bidi-type.c

1 files changed, 47 insertions, 0 deletions

diff --git a/utils/viewer-cairo.h b/utils/viewer-cairo.h
new file mode 100644
index 00000000..e843664f
--- /dev/null
+++ b/utils/viewer-cairo.h
@@ -0,0 +1,47 @@
+/* viewer-cairo.h: Common headers for Cairo-based viewers
+ *
+ * Copyright (C) 1999,2004,2005 Red Hat, Inc.
+ * Copyright (C) 2001 Sun Microsystems
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+#ifndef VIEWER_CAIRO_H
+#define VIEWER_CAIRO_H
+
+#include <cairo.h>
+
+#include "viewer.h"
+
+typedef struct _CairoViewerIface CairoViewerIface;
+
+struct _CairoViewerIface
+{
+  const PangoViewer *backend_class;
+
+  cairo_surface_t * (*create_surface) (gpointer instance,
+				       gpointer surface,
+				       int      width,
+				       int      height);
+
+  void (*paint_background) (gpointer  instance,
+			    cairo_t  *cr);
+};
+
+gpointer cairo_viewer_iface_create (const CairoViewerIface **iface_out);
+
+void cairo_viewer_add_options (GOptionGroup *group);
+
+#endif /* VIEWER_CAIRO_H */