#include <config.h>
#include <stdio.h>
#include <glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include "tiffio.h"
#include "tiff2ps.h"
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;
}
gint rowstride, bytes;
guchar *pixels = NULL;
guchar *p;
+ int orientation;
cairo_surface_t *surface;
cairo_surface_t *rotated_surface;
static const cairo_user_data_key_t key;
return NULL;
}
+ if (! TIFFGetField (tiff_document->tiff, TIFFTAG_ORIENTATION, &orientation)) {
+ orientation = ORIENTATION_TOPLEFT;
+ }
+
tiff_document_get_resolution (tiff_document, &x_res, &y_res);
pop_handlers ();
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)
TIFFReadRGBAImageOriented (tiff_document->tiff,
width, height,
(uint32 *)pixels,
- ORIENTATION_TOPLEFT, 1);
+ orientation, 1);
pop_handlers ();
/* Convert the format returned by libtiff to
*/
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,
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)
{
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;
}