[QGIS Commit] r12097 - trunk/qgis/src/core/composer

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2009-11-13 03:14:22 -0500 (Fri, 13 Nov 2009)
New Revision: 12097

Modified:
   trunk/qgis/src/core/composer/qgscomposerpicture.cpp
Log:
Disable composer svg cash if dpi is different. Fix for bug #2085

Modified: trunk/qgis/src/core/composer/qgscomposerpicture.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgscomposerpicture.cpp	2009-11-11 22:45:45 UTC (rev 12096)
+++ trunk/qgis/src/core/composer/qgscomposerpicture.cpp	2009-11-13 08:14:22 UTC (rev 12097)
@@ -57,6 +57,11 @@
   drawBackground( painter );
 
   int newDpi = ( painter->device()->logicalDpiX() + painter->device()->logicalDpiY() ) / 2;
+  if ( newDpi != mCachedDpi )
+  {
+    mSvgCacheUpToDate = false;
+  }
+
   if ( mMode != Unknown )
   {
     double rectPixelWidth = rect().width() * newDpi / 25.4;
@@ -225,7 +230,7 @@
     return false;
   }
 #if 0
-  if(!cornerPointOnRotatedAndScaledRect(x4, y4, width, height))
+  if ( !cornerPointOnRotatedAndScaledRect( x4, y4, width, height ) )
   {
     return false;
   }