[maemo-commits] [maemo-commits] r18852 - in projects/haf/trunk/libosso: debian src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-07-13 16:26:52 +0300 (Mon, 13 Jul 2009)
New Revision: 18852

Modified:
   projects/haf/trunk/libosso/debian/changelog
   projects/haf/trunk/libosso/src/osso-mem.c
Log:
fix from Leonid for NB#124765


Modified: projects/haf/trunk/libosso/debian/changelog
===================================================================
--- projects/haf/trunk/libosso/debian/changelog	2009-07-13 10:23:34 UTC (rev 18851)
+++ projects/haf/trunk/libosso/debian/changelog	2009-07-13 13:26:52 UTC (rev 18852)
@@ -1,3 +1,11 @@
+libosso (2.22-1~unreleased) unstable; urgency=low
+
+  * Patch from Leonid Moiseichuk:
+  * Fixes: NB#124765 - Image viewer application hangs in various scenarios
+    when large size images used.
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon, 13 Jul 2009 16:13:18 +0300
+
 libosso (2.21-1) unstable; urgency=low
 
   * Fixes: NB#121151 - libosso coverity findings

Modified: projects/haf/trunk/libosso/src/osso-mem.c
===================================================================
--- projects/haf/trunk/libosso/src/osso-mem.c	2009-07-13 10:23:34 UTC (rev 18851)
+++ projects/haf/trunk/libosso/src/osso-mem.c	2009-07-13 13:26:52 UTC (rev 18852)
@@ -248,7 +248,7 @@
    const int counter = load_meminfo(&total, 1);
 
    /* Setup available amount of RAM, if no meminfo available set 64MB */
-   sys_avail_ram = (counter && total ? total : (64 << 10));
+   sys_avail_ram = (counter && total ? (total >> 2) : (64 << 10));
 
    /* Check the availability of values */
    if (NSIZE == allowed_pages)
@@ -271,13 +271,11 @@
 
    if (NSIZE == sys_lowmem_limit)
    {
-      sys_avail_ram = sys_deny_limit;
       sys_lowmem_limit = sys_deny_limit;
    }
    else
    {
       /* Calibrate amount avaliable RAM and memory using sys_lowmem_limit percentage */
-      sys_avail_ram    = DIVIDE(sys_avail_ram    * sys_lowmem_limit, 100);
       sys_lowmem_limit = DIVIDE(sys_avail_memory * sys_lowmem_limit, 100);
    }
 
@@ -583,7 +581,7 @@
    available = (sys_avail_ram < current.usable ? sys_avail_ram : current.usable);
 
    /* If we're below the threshold, don't make things worse */
-   if(available > threshold)
+   if(threshold > 0 && available > threshold)
    {
       const struct mallinfo mi = mallinfo();