backends: Fix several security issues in the dvi-backend.

[evince.git] / backend / ps / ev-spectre.c

diff --git a/backend/ps/ev-spectre.c b/backend/ps/ev-spectre.c
index 54b595700551c39219ee7de47b2cf1ff1d4c5a21..23957cd6c2f83652a00e32a7e2cc94c0bf66af33 100644 (file)
--- a/backend/ps/ev-spectre.c
+++ b/backend/ps/ev-spectre.c
@@ -14,41 +14,36 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <config.h>
 
 #include <config.h>
  */
 
 #include <config.h>
 
 #include <config.h>

-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>

 #include <stdlib.h>
 #include <libspectre/spectre.h>
 
 #include "ev-spectre.h"
 
 #include "ev-file-exporter.h"
 #include <stdlib.h>
 #include <libspectre/spectre.h>
 
 #include "ev-spectre.h"
 
 #include "ev-file-exporter.h"

-#include "ev-document-thumbnails.h"

 #include "ev-document-misc.h"
 
 struct _PSDocument {
 #include "ev-document-misc.h"
 
 struct _PSDocument {

-       GObject object;
+       EvDocument object;

 
        SpectreDocument *doc;
        SpectreExporter *exporter;
 };
 
 struct _PSDocumentClass {
 
        SpectreDocument *doc;
        SpectreExporter *exporter;
 };
 
 struct _PSDocumentClass {

-       GObjectClass parent_class;
+       EvDocumentClass parent_class;

 };
 
 };
 

-static void ps_document_document_iface_init            (EvDocumentIface           *iface);
-static void ps_document_file_exporter_iface_init       (EvFileExporterIface       *iface);
-static void ps_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface);
+static void ps_document_file_exporter_iface_init       (EvFileExporterInterface       *iface);

 
 EV_BACKEND_REGISTER_WITH_CODE (PSDocument, ps_document,
                          {
 
 EV_BACKEND_REGISTER_WITH_CODE (PSDocument, ps_document,
                          {

-                                EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS,
-                                                                ps_document_document_thumbnails_iface_init);

                                 EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_FILE_EXPORTER,
                                                                 ps_document_file_exporter_iface_init);
                         });
                                 EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_FILE_EXPORTER,
                                                                 ps_document_file_exporter_iface_init);
                         });


@@ -77,16 +72,6 @@ ps_document_dispose (GObject *object)
        G_OBJECT_CLASS (ps_document_parent_class)->dispose (object);
 }
 
        G_OBJECT_CLASS (ps_document_parent_class)->dispose (object);
 }
 

-static void
-ps_document_class_init (PSDocumentClass *klass)
-{
-       GObjectClass *object_class;
-
-       object_class = G_OBJECT_CLASS (klass);
-
-       object_class->dispose = ps_document_dispose;
-}
-

 /* EvDocumentIface */
 static gboolean
 ps_document_load (EvDocument *document,
 /* EvDocumentIface */
 static gboolean
 ps_document_load (EvDocument *document,


@@ -270,6 +255,16 @@ ps_document_get_info (EvDocument *document)
        return info;
 }
 
        return info;
 }
 

+static gboolean
+ps_document_get_backend_info (EvDocument            *document,
+                             EvDocumentBackendInfo *info)
+{
+       info->name = "libspectre";
+       info->version = SPECTRE_VERSION_STRING;
+
+       return TRUE;
+}
+

 static cairo_surface_t *
 ps_document_render (EvDocument      *document,
                    EvRenderContext *rc)
 static cairo_surface_t *
 ps_document_render (EvDocument      *document,
                    EvRenderContext *rc)


@@ -307,7 +302,7 @@ ps_document_render (EvDocument      *document,
        }
 
        if (spectre_page_status (ps_page)) {
        }
 
        if (spectre_page_status (ps_page)) {

-               g_warning (spectre_status_to_string (spectre_page_status (ps_page)));
+               g_warning ("%s", spectre_status_to_string (spectre_page_status (ps_page)));

                g_free (data);
                
                return NULL;
                g_free (data);
                
                return NULL;


@@ -331,77 +326,24 @@ ps_document_render (EvDocument      *document,
 }
 
 static void
 }
 
 static void

-ps_document_document_iface_init (EvDocumentIface *iface)
-{
-       iface->load = ps_document_load;
-       iface->save = ps_document_save;
-       iface->get_n_pages = ps_document_get_n_pages;
-       iface->get_page = ps_document_get_page;
-       iface->get_page_size = ps_document_get_page_size;
-       iface->get_page_label = ps_document_get_page_label;
-       iface->get_info = ps_document_get_info;
-       iface->render = ps_document_render;
-}
-
-/* EvDocumentThumbnailsIface */
-static GdkPixbuf *
-ps_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails,
-                                     EvRenderContext      *rc, 
-                                     gboolean              border)
-{
-       PSDocument      *ps = PS_DOCUMENT (document_thumbnails);
-       cairo_surface_t *surface;
-       GdkPixbuf       *pixbuf = NULL;
-
-       surface = ps_document_render (EV_DOCUMENT (ps), rc);
-       if (!surface) {
-               g_warning ("Error rendering thumbnail");
-               return NULL;
-       }
-               
-       pixbuf = ev_document_misc_pixbuf_from_surface (surface);
-       cairo_surface_destroy (surface);
-
-       if (border) {
-               GdkPixbuf *border_pixbuf;
-               
-               border_pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, pixbuf);
-               g_object_unref (pixbuf);
-               pixbuf = border_pixbuf;
-       }
-
-       return pixbuf;
-}
-
-static void
-ps_document_thumbnails_get_dimensions (EvDocumentThumbnails *document_thumbnails,
-                                      EvRenderContext      *rc, 
-                                      gint                 *width,
-                                      gint                 *height)
+ps_document_class_init (PSDocumentClass *klass)

 {
 {

-       PSDocument *ps = PS_DOCUMENT (document_thumbnails);
-       gdouble     page_width, page_height;
+       GObjectClass    *object_class = G_OBJECT_CLASS (klass);
+       EvDocumentClass *ev_document_class = EV_DOCUMENT_CLASS (klass);

 
 

-       ps_document_get_page_size (EV_DOCUMENT (ps),
-                                  rc->page,
-                                  &page_width, &page_height);
+       object_class->dispose = ps_document_dispose;

 
 

-       if (rc->rotation == 90 || rc->rotation == 270) {
-               *width = (gint) (page_height * rc->scale);
-               *height = (gint) (page_width * rc->scale);
-       } else {
-               *width = (gint) (page_width * rc->scale);
-               *height = (gint) (page_height * rc->scale);
-       }
+       ev_document_class->load = ps_document_load;
+       ev_document_class->save = ps_document_save;
+       ev_document_class->get_n_pages = ps_document_get_n_pages;
+       ev_document_class->get_page = ps_document_get_page;
+       ev_document_class->get_page_size = ps_document_get_page_size;
+       ev_document_class->get_page_label = ps_document_get_page_label;
+       ev_document_class->get_info = ps_document_get_info;
+       ev_document_class->get_backend_info = ps_document_get_backend_info;
+       ev_document_class->render = ps_document_render;

 }
 
 }
 

-static void
-ps_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface)
-{
-       iface->get_thumbnail = ps_document_thumbnails_get_thumbnail;
-       iface->get_dimensions = ps_document_thumbnails_get_dimensions;
-}
-       

 /* EvFileExporterIface */
 static void
 ps_document_file_exporter_begin (EvFileExporter        *exporter,
 /* EvFileExporterIface */
 static void
 ps_document_file_exporter_begin (EvFileExporter        *exporter,


@@ -459,7 +401,7 @@ ps_document_file_exporter_get_capabilities (EvFileExporter *exporter)
 }
 
 static void
 }
 
 static void

-ps_document_file_exporter_iface_init (EvFileExporterIface *iface)
+ps_document_file_exporter_iface_init (EvFileExporterInterface *iface)

 {
        iface->begin = ps_document_file_exporter_begin;
        iface->do_page = ps_document_file_exporter_do_page;
 {
        iface->begin = ps_document_file_exporter_begin;
        iface->do_page = ps_document_file_exporter_do_page;