Revision: 1127
http://geeqie.svn.sourceforge.net/geeqie/?rev=1127&view=rev
Author: nadvornik
Date: 2008-09-03 19:58:21 +0000 (Wed, 03 Sep 2008)
Log Message:
-----------
dropped IMAGE_THROTTLE_LARGER_IMAGES code
Modified Paths:
--------------
trunk/src/image.c
Modified: trunk/src/image.c
===================================================================
--- trunk/src/image.c 2008-09-03 19:52:11 UTC (rev 1126)
+++ trunk/src/image.c 2008-09-03 19:58:21 UTC (rev 1127)
@@ -32,22 +32,8 @@
#include <math.h>
-
-/* size of the image loader buffer (512 bytes x defined number) */
-#define IMAGE_LOAD_BUFFER_COUNT 8
-
-/* define this so that more bytes are read per idle loop on larger images (>
1MB) */
-#define IMAGE_THROTTLE_LARGER_IMAGES 1
-
-/* throttle factor to increase read bytes by (2 is double, 3 is triple, etc.)
*/
-#define IMAGE_THROTTLE_FACTOR 32
-
-/* the file size at which throttling take place */
-#define IMAGE_THROTTLE_THRESHOLD 1048576
-
static GList *image_list = NULL;
-
static void image_update_title(ImageWindow *imd);
static void image_read_ahead_start(ImageWindow *imd);
static void image_cache_set(ImageWindow *imd, FileData *fd);
@@ -593,20 +579,6 @@
image_load_done_cb(il, data);
}
-#ifdef IMAGE_THROTTLE_LARGER_IMAGES
-static void image_load_buffer_throttle(ImageLoader *il)
-{
- if (!il || il->bytes_total < IMAGE_THROTTLE_THRESHOLD) return;
-
- /* Larger image files usually have larger chunks of data per pixel...
- * So increase the buffer read size so that the rendering chunks called
- * are also larger.
- */
-
- image_loader_set_buffer_size(il, IMAGE_LOAD_BUFFER_COUNT *
IMAGE_THROTTLE_FACTOR);
-}
-#endif
-
/* this read ahead is located here merely for the callbacks, above */
static gint image_read_ahead_check(ImageWindow *imd)
@@ -630,12 +602,7 @@
g_signal_connect (G_OBJECT(imd->il), "area_ready",
(GCallback)image_load_area_cb, imd);
g_signal_connect (G_OBJECT(imd->il), "error",
(GCallback)image_load_error_cb, imd);
g_signal_connect (G_OBJECT(imd->il), "done",
(GCallback)image_load_done_cb, imd);
- image_loader_set_buffer_size(imd->il, IMAGE_LOAD_BUFFER_COUNT);
-#ifdef IMAGE_THROTTLE_LARGER_IMAGES
- image_load_buffer_throttle(imd->il);
-#endif
-
g_object_set(G_OBJECT(imd->pr), "loading", TRUE, NULL);
image_state_set(imd, IMAGE_STATE_LOADING);
@@ -700,7 +667,6 @@
g_signal_connect (G_OBJECT(imd->il), "area_ready",
(GCallback)image_load_area_cb, imd);
g_signal_connect (G_OBJECT(imd->il), "error",
(GCallback)image_load_error_cb, imd);
g_signal_connect (G_OBJECT(imd->il), "done",
(GCallback)image_load_done_cb, imd);
- image_loader_set_buffer_size(imd->il, IMAGE_LOAD_BUFFER_COUNT);
if (!image_loader_start(imd->il))
{
@@ -718,10 +684,6 @@
image_state_set(imd, IMAGE_STATE_LOADING);
-#ifdef IMAGE_THROTTLE_LARGER_IMAGES
- image_load_buffer_throttle(imd->il);
-#endif
-
if (!imd->delay_flip && !image_get_pixbuf(imd))
image_load_pixbuf_ready(imd);
return TRUE;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Geeqie-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
