X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=libdocument%2Fev-document-misc.c;h=889e4a88d0a08e51e1d3c2b92530ea1469bbb3df;hb=16cc05ec4f7663103e45a52ac06d292e6b75a8c0;hp=e8739a1ae8d073683117667c5a6823b0d1ea2ca3;hpb=217797d63b2d3b1c9a7a0511af1bbf3d99f0d482;p=evince.git

diff --git a/libdocument/ev-document-misc.c b/libdocument/ev-document-misc.c
index e8739a1a..889e4a88 100644
--- a/libdocument/ev-document-misc.c
+++ b/libdocument/ev-document-misc.c
@@ -17,10 +17,14 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "ev-document-misc.h"
+#include <config.h>
+
 #include <string.h>
+
 #include <gtk/gtk.h>
 
+#include "ev-document-misc.h"
+
 /* Returns a new GdkPixbuf that is suitable for placing in the thumbnail view.
  * It is four pixels wider and taller than the source.  If source_pixbuf is not
  * NULL, then it will fill the return pixbuf with the contents of
@@ -151,8 +155,9 @@ ev_document_misc_surface_from_pixbuf (GdkPixbuf *pixbuf)
 {
 	cairo_surface_t *surface;
 	cairo_t         *cr;
-	
-	surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
+
+	surface = cairo_image_surface_create (gdk_pixbuf_get_has_alpha (pixbuf) ?
+					      CAIRO_FORMAT_ARGB32 : CAIRO_FORMAT_RGB24,
 					      gdk_pixbuf_get_width (pixbuf),
 					      gdk_pixbuf_get_height (pixbuf));
 	cr = cairo_create (surface);
@@ -163,6 +168,73 @@ ev_document_misc_surface_from_pixbuf (GdkPixbuf *pixbuf)
 	return surface;
 }
 
+GdkPixbuf *
+ev_document_misc_pixbuf_from_surface (cairo_surface_t *surface)
+{
+	GdkPixbuf       *pixbuf;
+	cairo_surface_t *image;
+	cairo_t         *cr;
+	gboolean         has_alpha;
+	gint             width, height;
+	cairo_format_t   surface_format;
+	gint             pixbuf_n_channels;
+	gint             pixbuf_rowstride;
+	guchar          *pixbuf_pixels;
+	gint             x, y;
+
+	width = cairo_image_surface_get_width (surface);
+	height = cairo_image_surface_get_height (surface);
+	
+	surface_format = cairo_image_surface_get_format (surface);
+	has_alpha = (surface_format == CAIRO_FORMAT_ARGB32);
+
+	pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
+				 TRUE, 8,
+				 width, height);
+	pixbuf_n_channels = gdk_pixbuf_get_n_channels (pixbuf);
+	pixbuf_rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+	pixbuf_pixels = gdk_pixbuf_get_pixels (pixbuf);
+
+	image = cairo_image_surface_create_for_data (pixbuf_pixels,
+						     surface_format,
+						     width, height,
+						     pixbuf_rowstride);
+	cr = cairo_create (image);
+	cairo_set_source_surface (cr, surface, 0, 0);
+
+	if (has_alpha)
+		cairo_mask_surface (cr, surface, 0, 0);
+	else
+		cairo_paint (cr);
+
+	cairo_destroy (cr);
+	cairo_surface_destroy (image);
+
+	for (y = 0; y < height; y++) {
+		guchar *p = pixbuf_pixels + y * pixbuf_rowstride;
+
+		for (x = 0; x < width; x++) {
+			guchar tmp;
+			
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+			tmp = p[0];
+			p[0] = p[2];
+			p[2] = tmp;
+			p[3] = (has_alpha) ? p[3] : 0xff;
+#else
+			tmp = p[0];
+			p[0] = p[1];
+			p[1] = p[2];
+			p[2] = p[3];
+			p[3] = (has_alpha) ? tmp : 0xff;
+#endif			
+			p += pixbuf_n_channels;
+		}
+	}
+
+	return pixbuf;
+}
+
 cairo_surface_t *
 ev_document_misc_surface_rotate_and_scale (cairo_surface_t *surface,
 					   gint             dest_width,
@@ -190,7 +262,7 @@ ev_document_misc_surface_rotate_and_scale (cairo_surface_t *surface,
 	}
 
 	new_surface = cairo_surface_create_similar (surface,
-						    CAIRO_CONTENT_COLOR_ALPHA,
+						    cairo_surface_get_content (surface),
 						    new_width, new_height);
 
 	cr = cairo_create (new_surface);
@@ -207,10 +279,14 @@ ev_document_misc_surface_rotate_and_scale (cairo_surface_t *surface,
 	        default:
 			cairo_translate (cr, 0, 0);
 	}
-	cairo_pattern_set_filter (cairo_get_source (cr), CAIRO_FILTER_BILINEAR);
-	cairo_scale (cr,
-		     (gdouble)dest_width / width,
-		     (gdouble)dest_height / height);
+	
+	if (dest_width != width || dest_height != height) {
+		cairo_pattern_set_filter (cairo_get_source (cr), CAIRO_FILTER_BILINEAR);
+		cairo_scale (cr,
+			     (gdouble)dest_width / width,
+			     (gdouble)dest_height / height);
+	}
+	
 	cairo_rotate (cr, dest_rotation * G_PI / 180.0);
 	cairo_set_source_surface (cr, surface, 0, 0);
 	cairo_paint (cr);