X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/5bfafde97984d80b9692f5f0ee5ec75c92d936ae..cf2cd67f378e292d5c67efb2da5558b52058b87d:/src/thumbnails.c

diff --git a/src/thumbnails.c b/src/thumbnails.c
index 5a7b2a1e..0461114b 100644
--- a/src/thumbnails.c
+++ b/src/thumbnails.c
@@ -142,9 +142,12 @@ GdkPixbuf *a_thumbnails_scale_pixbuf(GdkPixbuf *src, int max_w, int max_h)
 
 static GdkPixbuf *child_create_thumbnail(const gchar *path)
 {
-	GdkPixbuf *image;
+	GdkPixbuf *image, *tmpbuf;
 
 	image = gdk_pixbuf_new_from_file(path, NULL);
+	tmpbuf = gdk_pixbuf_apply_embedded_orientation(image);
+	g_object_unref(G_OBJECT(image));
+	image = tmpbuf;
 
 	if (image)
         {
@@ -161,6 +164,7 @@ static GdkPixbuf *save_thumbnail(const char *pathname, GdkPixbuf *full)
 	struct stat info;
 	gchar *path;
 	int original_width, original_height;
+	const gchar* orientation;
 	GString *to;
 	char *md5, *swidth, *sheight, *ssize, *smtime, *uri;
 	mode_t old_mask;
@@ -172,6 +176,8 @@ static GdkPixbuf *save_thumbnail(const char *pathname, GdkPixbuf *full)
 
 	thumb = a_thumbnails_scale_pixbuf(full, PIXMAP_THUMB_SIZE, PIXMAP_THUMB_SIZE);
 
+	orientation = gdk_pixbuf_get_option (full, "orientation");
+
 	original_width = gdk_pixbuf_get_width(full);
 	original_height = gdk_pixbuf_get_height(full);
 
@@ -208,6 +214,7 @@ static GdkPixbuf *save_thumbnail(const char *pathname, GdkPixbuf *full)
 			"tEXt::Thumb::MTime", smtime,
 			"tEXt::Thumb::URI", uri,
 			"tEXt::Software", PROJECT,
+			"tEXt::Software::Orientation", orientation ? orientation : "0",
 			NULL);
 	umask(old_mask);
 
@@ -549,6 +556,6 @@ static char *md5_hash(const char *message)
 	MD5Context ctx;
 
 	MD5Init(&ctx);
-	MD5Update(&ctx, message, strlen(message));
+	MD5Update(&ctx, (md5byte *) message, strlen(message));
 	return MD5Final(&ctx);
 }