[Evince-commits] r41 - in trunk: debian shell

[ed_ at garage.maemo.org]

Author: ed_
Date: 2008-03-30 18:22:25 +0300 (Sun, 30 Mar 2008)
New Revision: 41

Modified:
   trunk/debian/changelog
   trunk/shell/ev-jobs.c
Log:
hopefully fixed double memory allocation fo images in pdf documents
 Closes: #2027, Thanks to Vlad Vasiliev


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-03-16 21:19:46 UTC (rev 40)
+++ trunk/debian/changelog	2008-03-30 15:22:25 UTC (rev 41)
@@ -5,8 +5,10 @@
   * moved "close" menu item to the toplevel menu, to follow maemo
     de-facto UI conventions. Thanks to Michele Campeotto
   * disabled screen tap navigation in special mode Closes: #2070FR
+  * hopefully fixed double memory allocation fo images in pdf documents
+    Closes: #2027 Thanks to Vlad Vasiliev
 
- -- Ed Bartosh <bartosh at gmail.com>  Sun, 16 Mar 2008 23:05:44 +0200
+ -- Ed Bartosh <bartosh at gmail.com>  Sun, 30 Mar 2008 18:06:30 +0300
 
 evince (2.21.1-1.maemo5) unstable; urgency=low
 

Modified: trunk/shell/ev-jobs.c
===================================================================
--- trunk/shell/ev-jobs.c	2008-03-16 21:19:46 UTC (rev 40)
+++ trunk/shell/ev-jobs.c	2008-03-30 15:22:25 UTC (rev 41)
@@ -403,10 +403,15 @@
 			job->form_field_mapping =
 				ev_document_forms_get_form_fields (EV_DOCUMENT_FORMS (EV_JOB(job)->document),
 								   job->rc->page);
-		if (job->include_images && EV_IS_DOCUMENT_IMAGES (EV_JOB (job)->document))
-			job->image_mapping =
-				ev_document_images_get_images (EV_DOCUMENT_IMAGES (EV_JOB (job)->document),
-							       job->rc->page);
+		EvDocumentInfo  *ev_d_info;
+		ev_d_info = ev_document_get_info(EV_DOCUMENT(EV_JOB(job)->document)); 
+		
+		if (!ev_d_info->format || ev_d_info->format && strncasecmp("pdf",ev_d_info->format,3) != 0)
+		    if (job->include_images && EV_IS_DOCUMENT_IMAGES (EV_JOB (job)->document))
+			    job->image_mapping =
+				    ev_document_images_get_images (EV_DOCUMENT_IMAGES (EV_JOB (job)->document),
+							        job->rc->page);
+							       
 		EV_JOB (job)->finished = TRUE;
 	}