p
/
fiv
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make Exif orientation work with SVG 

SVG doesn't contain Exif, but this is how we handle rotation/mirroring.
This commit is contained in:
Přemysl Eric Janouch 2021-12-19 12:14:52 +01:00
parent 56d623fe52
commit 3da1d32df7
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
fiv-view.c
View File

@ -173,31 +173,30 @@ get_surface_dimensions(FivView *self, double *width, double *height)
cairo_rectangle_t extents = {}; cairo_rectangle_t extents = {};
switch (cairo_surface_get_type(self->page)) { switch (cairo_surface_get_type(self->page)) {
case CAIRO_SURFACE_TYPE_IMAGE: case CAIRO_SURFACE_TYPE_IMAGE:
switch (self->orientation) { extents.width = cairo_image_surface_get_width(self->page);
case FivIoOrientation90: extents.height = cairo_image_surface_get_height(self->page);
case FivIoOrientationMirror90: break;
case FivIoOrientation270:
case FivIoOrientationMirror270:
*width = cairo_image_surface_get_height(self->page);
*height = cairo_image_surface_get_width(self->page);
break;
default:
*width = cairo_image_surface_get_width(self->page);
*height = cairo_image_surface_get_height(self->page);
}
return;
case CAIRO_SURFACE_TYPE_RECORDING: case CAIRO_SURFACE_TYPE_RECORDING:
if (!cairo_recording_surface_get_extents(self->page, &extents)) { if (!cairo_recording_surface_get_extents(self->page, &extents))
cairo_recording_surface_ink_extents(self->page, cairo_recording_surface_ink_extents(self->page,
&extents.x, &extents.y, &extents.width, &extents.height); &extents.x, &extents.y, &extents.width, &extents.height);
} break;
*width = extents.width;
*height = extents.height;
return;
default: default:
g_assert_not_reached(); g_assert_not_reached();
} }
switch (self->orientation) {
case FivIoOrientation90:
case FivIoOrientationMirror90:
case FivIoOrientation270:
case FivIoOrientationMirror270:
*width = extents.height;
*height = extents.width;
return;
default:
*width = extents.width;
*height = extents.height;
}
} }
static void static void
@ -379,16 +378,19 @@ fiv_view_draw(GtkWidget *widget, cairo_t *cr)
// FIXME: Recording surfaces do not work well with CAIRO_SURFACE_TYPE_XLIB, // FIXME: Recording surfaces do not work well with CAIRO_SURFACE_TYPE_XLIB,
// we always get a shitty pixmap, where transparency contains junk. // we always get a shitty pixmap, where transparency contains junk.
cairo_matrix_t matrix = get_orientation_matrix(self->orientation, sw, sh);
cairo_translate(cr, x, y);
if (cairo_surface_get_type(self->frame) == CAIRO_SURFACE_TYPE_RECORDING) { if (cairo_surface_get_type(self->frame) == CAIRO_SURFACE_TYPE_RECORDING) {
cairo_surface_t *image = cairo_surface_t *image =
cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w, h); cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w, h);
cairo_t *tcr = cairo_create(image); cairo_t *tcr = cairo_create(image);
cairo_scale(tcr, self->scale, self->scale); cairo_scale(tcr, self->scale, self->scale);
cairo_set_source_surface(tcr, self->frame, 0, 0); cairo_set_source_surface(tcr, self->frame, 0, 0);
cairo_pattern_set_matrix(cairo_get_source(tcr), &matrix);
cairo_paint(tcr); cairo_paint(tcr);
cairo_destroy(tcr); cairo_destroy(tcr);
cairo_set_source_surface(cr, image, x, y); cairo_set_source_surface(cr, image, 0, 0);
cairo_paint(cr); cairo_paint(cr);
cairo_surface_destroy(image); cairo_surface_destroy(image);
return TRUE; return TRUE;
@ -396,14 +398,12 @@ fiv_view_draw(GtkWidget *widget, cairo_t *cr)
// XXX: The rounding together with padding may result in up to // XXX: The rounding together with padding may result in up to
// a pixel's worth of made-up picture data. // a pixel's worth of made-up picture data.
cairo_rectangle(cr, x, y, w, h); cairo_rectangle(cr, 0, 0, w, h);
cairo_clip(cr); cairo_clip(cr);
cairo_translate(cr, x, y);
cairo_scale(cr, self->scale, self->scale); cairo_scale(cr, self->scale, self->scale);
cairo_set_source_surface(cr, self->frame, 0, 0); cairo_set_source_surface(cr, self->frame, 0, 0);
cairo_matrix_t matrix = get_orientation_matrix(self->orientation, sw, sh);
cairo_pattern_t *pattern = cairo_get_source(cr); cairo_pattern_t *pattern = cairo_get_source(cr);
cairo_pattern_set_matrix(pattern, &matrix); cairo_pattern_set_matrix(pattern, &matrix);
cairo_pattern_set_extend(pattern, CAIRO_EXTEND_PAD); cairo_pattern_set_extend(pattern, CAIRO_EXTEND_PAD);