[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : luke
Repository : xara
Revision   : 1582
Date       : Fri Jul 28 11:37:39 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/bmpexprw.cpp
   M /Trunk/XaraLX/wxOil/imgmgkft.cpp

Fix-up some problems introduced in my virtualisation of SetImportDPI


Diff:
Index: Trunk/XaraLX/Kernel/bmpexprw.cpp
===================================================================
--- Trunk/XaraLX/Kernel/bmpexprw.cpp	(revision 1581)
+++ Trunk/XaraLX/Kernel/bmpexprw.cpp	(revision 1582)
@@ -2831,7 +2831,7 @@
 			{
 				// Setup import DPI from export options (this means we get the same resolution bitmap from
 				// a PDF)
-				((ImageMagickFilter *)pImportFilter)->SetImportDPI( pOptions->GetDPI() );
+				((BaseBitmapFilter *)pImportFilter)->SetImportDPI( pOptions->GetDPI() );
 
 				// Set the preview bitmap flag to avoid adding the bitmap to the global bitmap list
 				((BaseBitmapFilter *)pImportFilter)->SetPreviewBitmap(TRUE);
Index: Trunk/XaraLX/wxOil/imgmgkft.cpp
===================================================================
--- Trunk/XaraLX/wxOil/imgmgkft.cpp	(revision 1581)
+++ Trunk/XaraLX/wxOil/imgmgkft.cpp	(revision 1582)
@@ -1384,7 +1384,9 @@
 		wxScreenDC dc;
 		wxSize DefaultDPI=OSRenderRegion::GetFixedDCPPI(dc);
 		IMargv[p++]=_T("-density");
-		cdpi = camStrdup(wxString::Format(_T("%dx%d"), m_ImportDPI?m_ImportDPI:DefaultDPI.GetWidth(),m_ImportDPI?m_ImportDPI:DefaultDPI.GetHeight()));
+		UINT32	uHorzDpi = UINT32( m_ImportDPI ? m_ImportDPI : DefaultDPI.GetWidth() );
+		UINT32	uVertDpi = UINT32( m_ImportDPI ? m_ImportDPI : DefaultDPI.GetHeight() );
+		cdpi = camStrdup( wxString::Format( _T("%dx%d"), uHorzDpi, uVertDpi ) );
 		IMargv[p++]=cdpi;	
 	}
 	IMargv[p++]=cifn;


Xara