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

diff --git a/src/fullscreen.c b/src/fullscreen.c
index 6094651..f6f4ae2 100644 (file)
--- a/src/fullscreen.c
+++ b/src/fullscreen.c
@@ -301,12 +301,12 @@ FullScreenData *fullscreen_start(GtkWidget *window, ImageWindow *imd,
 
        if (fs->same_region)
                {
-               DEBUG_0("Original vindow is not visible, enabling std. fullscreen mode");
+               DEBUG_0("Original window is not visible, enabling std. fullscreen mode");
                image_move_from_image(fs->imd, fs->normal_imd);
                }
        else
                {
-               DEBUG_0("Original vindow is still visible, enabling presentation fullscreen mode");
+               DEBUG_0("Original window is still visible, enabling presentation fullscreen mode");
                image_copy_from_image(fs->imd, fs->normal_imd);
                }
 

diff --git a/src/image.c b/src/image.c
index 12fe8fe..603da25 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -475,6 +475,8 @@ static void image_read_ahead_done_cb(ImageLoader *il, gpointer data)
 {
        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)

diff --git a/src/renderer-tiles.c b/src/renderer-tiles.c
index f48fe57..72ea055 100644 (file)
--- a/src/renderer-tiles.c
+++ b/src/renderer-tiles.c
@@ -1333,21 +1333,6 @@ static void rt_tile_render(RendererTiles *rt, ImageTile *it,
                {
                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;

diff --git a/src/secure_save.c b/src/secure_save.c
index 314f319..c8fe26a 100644 (file)
--- a/src/secure_save.c
+++ b/src/secure_save.c
@@ -9,12 +9,12 @@
  * This software comes with no warranty of any kind, use at your own risk!
  */
 
+#include "main.h"
 #include <glib/gprintf.h>
 #include <glib/gstdio.h>
 #include <errno.h>
 #include <utime.h>
 
-#include "main.h"
 #include "secure_save.h"
 
 

diff --git a/src/ui_fileops.h b/src/ui_fileops.h
index 12b9a61..295ef44 100644 (file)
--- a/src/ui_fileops.h
+++ b/src/ui_fileops.h
@@ -14,7 +14,7 @@
 #ifndef UI_FILEOPS_H
 #define UI_FILEOPS_H
 
-
+#include "config.h"
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/types.h>