Attachment 32846 Details for Bug 26264 – Patch

[patch] Patch

0001-cairo-Fix-downscaling-images-when-document-is-rotate.patch (text/plain), 2.01 KB, created by Carlos Garcia Campos on 2010-01-27 07:21:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2010-01-27 07:21:38 UTC

Size: 2.01 KB

patch

obsolete

>From 0e8e80401118d9f56b995af5a3713ffa472bacd0 Mon Sep 17 00:00:00 2001
>From: Carlos Garcia Campos <carlosgc@gnome.org>
>Date: Wed, 27 Jan 2010 16:15:40 +0100
>Subject: [PATCH] [cairo] Fix downscaling images when document is rotated
>
>Fixes bug #26264.
>---
> poppler/CairoOutputDev.cc |   36 ++++++++++++++++++++++++++++++++++--
> 1 files changed, 34 insertions(+), 2 deletions(-)
>
>diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
>index 5ca86b8..95b34b6 100644
>--- a/poppler/CairoOutputDev.cc
>+++ b/poppler/CairoOutputDev.cc
>@@ -1344,6 +1344,29 @@ void CairoOutputDev::endMaskClip(GfxState *state) {
>   clearSoftMask(state);
> }
> 
>+static void
>+get_singular_values (const cairo_matrix_t *matrix,
>+		     double               *major,
>+		     double               *minor)
>+{
>+	double xx = matrix->xx, xy = matrix->xy;
>+	double yx = matrix->yx, yy = matrix->yy;
>+
>+	double a = xx*xx+yx*yx;
>+	double b = xy*xy+yy*yy;
>+	double k = xx*xy+yx*yy;
>+
>+	double f = (a+b) * .5;
>+	double g = (a-b) * .5;
>+	double delta = sqrt (g*g + k*k);
>+
>+	if (major)
>+		*major = sqrt (f + delta);
>+	if (minor)
>+		*minor = sqrt (f - delta);
>+}
>+
>+
> cairo_surface_t *CairoOutputDev::downscaleSurface(cairo_surface_t *orig_surface) {
>   cairo_surface_t *dest_surface;
>   unsigned char *dest_buffer;
>@@ -1356,12 +1379,21 @@ cairo_surface_t *CairoOutputDev::downscaleSurface(cairo_surface_t *orig_surface)
>   if (printing)
>     return NULL;
> 
>+
>+  orig_width = cairo_image_surface_get_width (orig_surface);
>+  orig_height = cairo_image_surface_get_height (orig_surface);
>+
>   cairo_matrix_t matrix;
>   cairo_get_matrix(cairo, &matrix);
> 
>   /* this whole computation should be factored out */
>-  double xScale = matrix.xx;
>-  double yScale = matrix.yy;
>+  double xScale;
>+  double yScale;
>+  if (orig_width > orig_height)
>+    get_singular_values (&matrix, &xScale, &yScale);
>+  else
>+    get_singular_values (&matrix, &yScale, &xScale);
>+
>   int tx, tx2, ty, ty2; /* the integer co-oridinates of the resulting image */
>   int scaledHeight;
>   int scaledWidth;
>-- 
>1.6.3.3
>

Actions: View | Splinter Review

Attachments on bug 26264: 32846

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.