[gnome-photos/wip/rishi/thumbnailer: 8/8] local-item, utils: foo
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-photos/wip/rishi/thumbnailer: 8/8] local-item, utils: foo
- Date: Fri, 10 Feb 2017 23:51:50 +0000 (UTC)
commit 47afccc43dfe0b687b1a39e5597b77350a1a5251
Author: Debarshi Ray <debarshir gnome org>
Date: Thu Feb 9 20:32:12 2017 +0100
local-item, utils: foo
src/photos-local-item.c | 4 +++-
src/photos-utils.c | 26 ++++++++------------------
src/photos-utils.h | 1 +
3 files changed, 12 insertions(+), 19 deletions(-)
---
diff --git a/src/photos-local-item.c b/src/photos-local-item.c
index 0fbc860..dc372e8 100644
--- a/src/photos-local-item.c
+++ b/src/photos-local-item.c
@@ -99,6 +99,7 @@ static gboolean
photos_local_item_create_thumbnail (PhotosBaseItem *item, GCancellable *cancellable, GError **error)
{
GFile *file;
+ GQuark orientation;
gboolean ret_val;
const gchar *mime_type;
const gchar *uri;
@@ -108,7 +109,8 @@ photos_local_item_create_thumbnail (PhotosBaseItem *item, GCancellable *cancella
file = g_file_new_for_uri (uri);
mime_type = photos_base_item_get_mime_type (item);
mtime = photos_base_item_get_mtime (item);
- ret_val = photos_utils_create_thumbnail (file, mime_type, mtime, cancellable, error);
+ orientation = photos_base_item_get_orientation (item);
+ ret_val = photos_utils_create_thumbnail (file, mime_type, mtime, orientation, cancellable, error);
g_object_unref (file);
return ret_val;
diff --git a/src/photos-utils.c b/src/photos-utils.c
index 34a7375..5e5ba3a 100644
--- a/src/photos-utils.c
+++ b/src/photos-utils.c
@@ -55,12 +55,14 @@
#include "photos-operation-jpg-guess-sizes.h"
#include "photos-operation-png-guess-sizes.h"
#include "photos-operation-saturation.h"
+#include "photos-quarks.h"
#include "photos-query.h"
#include "photos-share-point.h"
#include "photos-share-point-email.h"
#include "photos-share-point-google.h"
#include "photos-share-point-online.h"
#include "photos-source.h"
+#include "photos-thumbnail-factory.h"
#include "photos-tool.h"
#include "photos-tool-colors.h"
#include "photos-tool-crop.h"
@@ -426,34 +428,22 @@ gboolean
photos_utils_create_thumbnail (GFile *file,
const gchar *mime_type,
gint64 mtime,
+ GQuark orientation,
GCancellable *cancellable,
GError **error)
{
- GnomeDesktopThumbnailFactory *factory = NULL;
+ PhotosThumbnailFactory *factory = NULL;
gboolean ret_val = FALSE;
- gchar *uri = NULL;
- GdkPixbuf *pixbuf = NULL;
- uri = g_file_get_uri (file);
- factory = gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE);
- pixbuf = gnome_desktop_thumbnail_factory_generate_thumbnail (factory, uri, mime_type);
- if (pixbuf == NULL)
- {
- /* FIXME: use proper #defines and enumerated types */
- g_set_error (error,
- g_quark_from_static_string ("gnome-desktop-error"),
- 0,
- "GnomeDesktopThumbnailFactory failed");
- goto out;
- }
+ factory = photos_thumbnail_factory_dup_singleton (NULL, NULL);
+ if (!photos_thumbnail_factory_generate_thumbnail (factory, file, mime_type, orientation, cancellable,
error))
+ goto out;
- gnome_desktop_thumbnail_factory_save_thumbnail (factory, pixbuf, uri, (time_t) mtime);
+ //gnome_desktop_thumbnail_factory_save_thumbnail (factory, pixbuf, uri, (time_t) mtime);
ret_val = TRUE;
out:
- g_clear_object (&pixbuf);
g_clear_object (&factory);
- g_free (uri);
return ret_val;
}
diff --git a/src/photos-utils.h b/src/photos-utils.h
index 4c5393e..1dcf954 100644
--- a/src/photos-utils.h
+++ b/src/photos-utils.h
@@ -73,6 +73,7 @@ GIcon *photos_utils_create_symbolic_icon_for_scale (const gchar *name,
gboolean photos_utils_create_thumbnail (GFile *file,
const gchar *mime_type,
gint64 mtime,
+ GQuark orientation,
GCancellable *cancellable,
GError **error);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]