Mercurial > hg > forks > geeqie
changeset 2258:a9b5d451b83a
Merge requests 12, 13 and 14 into master
* origin/merge-requests/12:
Fix typo in debug messages
* origin/merge-requests/13:
fix include statements for large file support on 32-bit
* origin/merge-requests/14:
Add support for Green-Magenta and Yellow-Blue anaglyph modes
| author | Klaus Ethgen <Klaus@Ethgen.de> |
|---|---|
| date | Tue, 11 Aug 2015 23:26:32 +0100 |
| parents | f2b8d63842ca (diff) 349d01cd2671 (current diff) |
| children | 07b24c8cac7e |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/image.c Tue Aug 11 23:26:32 2015 +0100 +++ b/src/image.c Tue Aug 11 23:26:32 2015 +0100 @@ -475,6 +475,8 @@ { ImageWindow *imd = data; + if (!imd->read_ahead_fd || !imd->read_ahead_il) return; + DEBUG_1("%s read ahead done for :%s", get_exec_time(), imd->read_ahead_fd->path); if (!imd->read_ahead_fd->pixbuf)
--- a/src/renderer-tiles.c Tue Aug 11 23:26:32 2015 +0100 +++ b/src/renderer-tiles.c Tue Aug 11 23:26:32 2015 +0100 @@ -1333,21 +1333,6 @@ { draw = rt_source_tile_render(rt, it, x, y, w, h, new_data, fast); } - else if ((pr->zoom == 1.0 || pr->scale == 1.0) && - pr->aspect_ratio == 1.0 && - !has_alpha && - orientation == EXIF_ORIENTATION_TOP_LEFT && - !(pr->func_post_process && !(pr->post_process_slow && fast)) && - !(rt->stereo_mode & PR_STEREO_ANAGLYPH)) - { - /* special case: faster, simple, scale 1.0, base orientation, no postprocessing */ - cairo_t *cr; - cr = cairo_create(it->surface); - cairo_rectangle (cr, x, y, w, h); - gdk_cairo_set_source_pixbuf(cr, pr->pixbuf, -it->x - GET_RIGHT_PIXBUF_OFFSET(rt), -it->y); - cairo_fill (cr); - cairo_destroy (cr); - } else { gdouble scale_x, scale_y;