p
/
fiv
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Optimize thumbnail extraction 

Don't go over the same data twice.
This commit is contained in:
Přemysl Eric Janouch 2023-06-07 18:10:33 +02:00
parent a5b5e32c3b
commit 07d4ea2dde
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fiv-thumbnail.c
View File

@ -219,9 +219,11 @@ adjust_thumbnail(cairo_surface_t *thumbnail, double row_height)
} }
static cairo_surface_t * static cairo_surface_t *
orient_thumbnail(cairo_surface_t *surface, FivIoOrientation orientation) orient_thumbnail(cairo_surface_t *surface)
{ {
if (!surface || orientation <= FivIoOrientation0) int orientation = (intptr_t) cairo_surface_get_user_data(
surface, &fiv_io_key_orientation);
if (orientation <= FivIoOrientation0)
return surface; return surface;
double w = 0, h = 0; double w = 0, h = 0;
@ -408,16 +410,10 @@ fiv_thumbnail_extract(GFile *target, FivThumbnailSize max_size, GError **error)
#endif // ! HAVE_LIBRAW #endif // ! HAVE_LIBRAW
g_mapped_file_unref(mf); g_mapped_file_unref(mf);
// Hardcode Exif orientation before adjust_thumbnail() might do so, if (!surface)
// before the early return below. return NULL;
if (surface) { if (max_size < FIV_THUMBNAIL_SIZE_MIN || max_size > FIV_THUMBNAIL_SIZE_MAX)
int orientation = (intptr_t) cairo_surface_get_user_data( return orient_thumbnail(surface);
surface, &fiv_io_key_orientation);
surface = orient_thumbnail(surface, orientation);
}
if (!surface || max_size < FIV_THUMBNAIL_SIZE_MIN ||
max_size > FIV_THUMBNAIL_SIZE_MAX)
return surface;
cairo_surface_t *result = cairo_surface_t *result =
adjust_thumbnail(surface, fiv_thumbnail_sizes[max_size].size); adjust_thumbnail(surface, fiv_thumbnail_sizes[max_size].size);