#include <config.h>
#include <stdio.h>
#include <glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include "tiffio.h"
#include "tiff2ps.h"
struct _TiffDocumentClass
{
- GObjectClass parent_class;
+ EvDocumentClass parent_class;
};
struct _TiffDocument
{
- GObject parent_instance;
+ EvDocument parent_instance;
TIFF *tiff;
gint n_pages;
typedef struct _TiffDocumentClass TiffDocumentClass;
-static void tiff_document_document_iface_init (EvDocumentIface *iface);
static void tiff_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface);
static void tiff_document_document_file_exporter_iface_init (EvFileExporterIface *iface);
gchar *filename;
TIFF *tiff;
- push_handlers ();
filename = g_filename_from_uri (uri, NULL, error);
- if (!filename) {
- pop_handlers ();
+ if (!filename)
return FALSE;
- }
+ push_handlers ();
tiff = TIFFOpen (filename, "r");
if (tiff) {
guint32 w, h;
if (!tiff) {
pop_handlers ();
+
+ g_set_error_literal (error,
+ EV_DOCUMENT_ERROR,
+ EV_DOCUMENT_ERROR_INVALID,
+ _("Invalid document"));
+
+ g_free (filename);
return FALSE;
}
rowstride = cairo_format_stride_for_width (CAIRO_FORMAT_RGB24, width);
#else
rowstride = width * 4;
+#endif
if (rowstride / 4 != width)
- /* overflow */
+ /* overflow, or cairo was changed in an unsupported way */
return NULL;
-#endif
bytes = height * rowstride;
if (bytes / rowstride != height)
*/
p = pixels;
while (p < pixels + bytes) {
- uint32 pixel = *(uint32 *)p;
- int r = TIFFGetR(pixel);
- int g = TIFFGetG(pixel);
- int b = TIFFGetB(pixel);
- int a = TIFFGetA(pixel);
-
- *p++ = b;
- *p++ = g;
- *p++ = r;
- *p++ = a;
+ guint32 *pixel = (guint32*)p;
+ guint8 r = TIFFGetR(*pixel);
+ guint8 g = TIFFGetG(*pixel);
+ guint8 b = TIFFGetB(*pixel);
+ guint8 a = TIFFGetA(*pixel);
+
+ *pixel = (a << 24) | (r << 16) | (g << 8) | b;
+
+ p += 4;
}
rotated_surface = ev_document_misc_surface_rotate_and_scale (surface,
return rotated_pixbuf;
}
-static void
-tiff_document_finalize (GObject *object)
-{
- TiffDocument *tiff_document = TIFF_DOCUMENT (object);
-
- if (tiff_document->tiff)
- TIFFClose (tiff_document->tiff);
- if (tiff_document->uri)
- g_free (tiff_document->uri);
-
- G_OBJECT_CLASS (tiff_document_parent_class)->finalize (object);
-}
-
-static void
-tiff_document_class_init (TiffDocumentClass *klass)
-{
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
- gobject_class->finalize = tiff_document_finalize;
-}
-
static gchar *
tiff_document_get_page_label (EvDocument *document,
EvPage *page)
{
TiffDocument *tiff_document = TIFF_DOCUMENT (document);
static gchar *label;
-
+
if (TIFFGetField (tiff_document->tiff, TIFFTAG_PAGENAME, &label) &&
g_utf8_validate (label, -1, NULL)) {
return g_strdup (label);
}
-
+
return NULL;
}
-static EvDocumentInfo *
-tiff_document_get_info (EvDocument *document)
+static void
+tiff_document_finalize (GObject *object)
{
- EvDocumentInfo *info;
+ TiffDocument *tiff_document = TIFF_DOCUMENT (object);
- info = g_new0 (EvDocumentInfo, 1);
- info->fields_mask = 0;
+ if (tiff_document->tiff)
+ TIFFClose (tiff_document->tiff);
+ if (tiff_document->uri)
+ g_free (tiff_document->uri);
- return info;
+ G_OBJECT_CLASS (tiff_document_parent_class)->finalize (object);
}
static void
-tiff_document_document_iface_init (EvDocumentIface *iface)
+tiff_document_class_init (TiffDocumentClass *klass)
{
- iface->load = tiff_document_load;
- iface->save = tiff_document_save;
- iface->get_n_pages = tiff_document_get_n_pages;
- iface->get_page_size = tiff_document_get_page_size;
- iface->render = tiff_document_render;
- iface->get_page_label = tiff_document_get_page_label;
- iface->get_info = tiff_document_get_info;
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ EvDocumentClass *ev_document_class = EV_DOCUMENT_CLASS (klass);
+
+ gobject_class->finalize = tiff_document_finalize;
+
+ ev_document_class->load = tiff_document_load;
+ ev_document_class->save = tiff_document_save;
+ ev_document_class->get_n_pages = tiff_document_get_n_pages;
+ ev_document_class->get_page_size = tiff_document_get_page_size;
+ ev_document_class->render = tiff_document_render;
+ ev_document_class->get_page_label = tiff_document_get_page_label;
}
static GdkPixbuf *