Changeset 250 for trunk/src/IDocument.cxx

Timestamp:

07/18/06 15:50:44 (2 years ago)

Author:

jordi

Message:

When a new file is loaded, the page cache is emptied to prevent showing pages from previous files. See bug #43.

Part of this fix is thanks to LoneFox?.

Files:

• trunk/src/IDocument.cxx (modified) (6 diffs)

trunk/src/IDocument.cxx

@@ -277 +277 @@
 IDocument::notifyLoad ()
 {
+    // Empty the cache to avoid displaying pages from previous file.
+    clearCache ();
     // Add the two first pages, if they exists, to the cache.
     addPageToCache (1);
@@ -723 +725 @@
 {
     if ( NULL == m_Format )
-    {        
+    {
         return "";
     }
@@ -1366 +1368 @@
         job->setPageNumber (pageNum);
         IJob::enqueue (job);
-        
+
         G_LOCK (pageSearch);
         // Check which cached page to drop.
@@ -1417 +1419 @@
     G_LOCK (pageSearch);
     PageCache *cached = NULL;
-    for ( GList *page = g_list_first (m_PageCache) ; 
+    for ( GList *page = g_list_first (m_PageCache) ;
           NULL != page && NULL == cached ;
           page = g_list_next (page) )
@@ -1443 +1445 @@
     gint pageCount = g_list_length (m_PageCache);
     guint32 minAge = G_MAXUINT32;
-    for ( GList *page = g_list_first (m_PageCache) ; 
+    for ( GList *page = g_list_first (m_PageCache) ;
           NULL != page ;
           page = g_list_next (page) )
@@ -1476 +1478 @@
 IDocument::clearCache ()
 {
+    G_LOCK (pageSearch);
     // Delete all cached pages.
-    for ( GList *page = g_list_first (m_PageCache) ; 
+    for ( GList *page = g_list_first (m_PageCache) ;
           NULL != page ;
           page = g_list_next (page) )
     {
         PageCache *cachedPage = (PageCache *)page->data;
+        G_LOCK (pageImage);
         delete cachedPage->pageImage;
+        G_UNLOCK (pageImage);
         delete cachedPage;
     }
     g_list_free (m_PageCache);
+    m_PageCache = NULL;
+    G_UNLOCK (pageSearch);
 }