summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
dd3deb6)
* pdf/ev-poppler.cc:
Thumnail dimensions unified with other backends.
* shell/ev-window-title.c: (ev_window_title_update):
Fix warning.
+2005-10-18 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
+
+ * pdf/ev-poppler.cc:
+
+ Thumnail dimensions unified with other backends.
+
+ * shell/ev-window-title.c: (ev_window_title_update):
+
+ Fix warning.
+
2005-10-17 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
* data/ev-stock-zoom-fit-width.png:
2005-10-17 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
* data/ev-stock-zoom-fit-width.png:
make_thumbnail_for_size (PdfDocument *pdf_document,
gint page,
int rotation,
make_thumbnail_for_size (PdfDocument *pdf_document,
gint page,
int rotation,
- gint size,
- gboolean border)
{
PopplerPage *poppler_page;
{
PopplerPage *poppler_page;
- GdkPixbuf *pixbuf, *border_pixbuf;
int width, height;
double scale;
gdouble unscaled_width, unscaled_height;
int width, height;
double scale;
gdouble unscaled_width, unscaled_height;
width, height,
scale, rotation, pixbuf);
width, height,
scale, rotation, pixbuf);
- if (border) {
- border_pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, rotation, pixbuf);
- g_object_unref (pixbuf);
- pixbuf = border_pixbuf;
- }
g_object_unref (poppler_page);
g_object_unref (poppler_page);
gint page,
gint rotation,
gint size,
gint page,
gint rotation,
gint size,
{
PdfDocument *pdf_document;
PopplerPage *poppler_page;
GdkPixbuf *pixbuf;
{
PdfDocument *pdf_document;
PopplerPage *poppler_page;
GdkPixbuf *pixbuf;
+ GdkPixbuf *border_pixbuf;
pdf_document = PDF_DOCUMENT (document_thumbnails);
pdf_document = PDF_DOCUMENT (document_thumbnails);
pixbuf = poppler_page_get_thumbnail (poppler_page);
pixbuf = poppler_page_get_thumbnail (poppler_page);
- if (pixbuf != NULL) {
- /* The document provides its own thumbnails. */
- if (border) {
- GdkPixbuf *real_pixbuf;
-
- real_pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, rotation, pixbuf);
- g_object_unref (pixbuf);
- pixbuf = real_pixbuf;
- }
- } else {
/* There is no provided thumbnail. We need to make one. */
/* There is no provided thumbnail. We need to make one. */
- pixbuf = make_thumbnail_for_size (pdf_document, page, rotation, size, border);
+ pixbuf = make_thumbnail_for_size (pdf_document, page, rotation, size);
+ if (border) {
+ border_pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, rotation, pixbuf);
+ g_object_unref (pixbuf);
+ pixbuf = border_pixbuf;
+ }
+
g_object_unref (poppler_page);
return pixbuf;
g_object_unref (poppler_page);
return pixbuf;
double page_width, page_height;
poppler_page_get_size (poppler_page, &page_width, &page_height);
double page_width, page_height;
poppler_page_get_size (poppler_page, &page_width, &page_height);
- if (page_width > page_height) {
- *width = size;
- *height = (int) (size * page_height / page_width);
- } else {
- *width = (int) (size * page_width / page_height);
- *height = size;
- }
+ *width = size;
+ *height = (int) (size * page_height / page_width);
}
g_object_unref (poppler_page);
}
}
g_object_unref (poppler_page);
}
+ if (title && window_title->uri) {
ev_window_title_sanitize_extension (window_title, &title);
} else {
if (window_title->uri) {
ev_window_title_sanitize_extension (window_title, &title);
} else {
if (window_title->uri) {