Improve grammar/usage for conversion macro function to convert meters into feet....

[andy/viking.git] / src / thumbnails.c

diff --git a/src/thumbnails.c b/src/thumbnails.c
index 6d42bd5f8b4f0ee5b7f0001045f0d3787d27dba3..0461114b65554655f631eb1b75c0e42d20e4c670 100644 (file)
--- a/src/thumbnails.c
+++ b/src/thumbnails.c
@@ -31,18 +31,16 @@
 #endif
 
 #include <stdlib.h>
-#include <sys/stat.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include <errno.h>
 #include <string.h>
+#include <glib.h>
+#include <glib/gstdio.h>
 #include "viking.h"
 #include "thumbnails.h"
-#include "thumbnails_pixbuf.h"
+#include "icons/icons.h"
 
 #ifdef __CYGWIN__
 #ifdef __CYGWIN_USE_BIG_TYPES__
@@ -63,15 +61,14 @@
 #define MAX(a,b) (((a)>(b))?(a):(b))
 #endif
 
+#define HOME_DIR g_get_home_dir()
+
 #ifdef WINDOWS
-#define HOME_DIR "C:\\VIKING"
 #define THUMB_DIR "\\THUMBNAILS\\" /* viking maps default viking\maps */
 #define THUMB_SUB_DIR "normal\\"
-#define mkdir(a,b) mkdir(a)
 #define realpath(X,Y) _fullpath(Y,X,MAX_PATH)
 
 #else
-#define HOME_DIR g_get_home_dir()
 #define THUMB_DIR "/.thumbnails/"
 #define THUMB_SUB_DIR "normal/"
 #endif
@@ -100,7 +97,7 @@ gboolean a_thumbnails_exists ( const gchar *filename )
 
 GdkPixbuf *a_thumbnails_get_default ()
 {
-  return gdk_pixbuf_from_pixdata ( &tnnyl_pixbuf, FALSE, NULL );
+  return gdk_pixbuf_from_pixdata ( &thumbnails_pixbuf, FALSE, NULL );
 }
 
 /* filename must be absolute. you could have a function to make sure it exists and absolutize it */
@@ -145,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)
         {
@@ -164,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;
@@ -175,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);
 
@@ -190,13 +193,9 @@ static GdkPixbuf *save_thumbnail(const char *pathname, GdkPixbuf *full)
        g_free(path);
                
        to = g_string_new(HOME_DIR);
-#ifndef WINDOWS
-       mkdir(to->str, 0700);
-#endif
        g_string_append(to, THUMB_DIR);
-       mkdir(to->str, 0700);
        g_string_append(to, THUMB_SUB_DIR);
-       mkdir(to->str, 0700);
+       g_mkdir_with_parents(to->str, 0700);
        g_string_append(to, md5);
        name_len = to->len + 4; /* Truncate to this length when renaming */
 #ifdef WINDOWS
@@ -215,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);
 
@@ -556,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);
 }