r18236 by fschmid - Fixed size of imported graphic.

[scribus-commit]

Author: fschmid
Date: Mon Apr  8 20:58:46 2013
New Revision: 18236

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18236
Log:
Fixed size of imported graphic.

Modified:
    trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp

Modified: trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18236&path=/trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp Mon Apr  8 20:58:46 2013
@@ -538,8 +538,10 @@
 				m_BBox.setTop ( qMin((int) cmd->params[ 0 ], m_BBox.top()) );
 			}
 			if ( rdFunc == 0x020C && !m_IsPlaceable ) {         // SETWINDOWEXT: dimensions
-				m_BBox.setWidth ( qMax((int) cmd->params[ 1 ], m_BBox.width()) );
-				m_BBox.setHeight( qMax((int) cmd->params[ 0 ], m_BBox.height()));
+				m_BBox.setWidth((int) cmd->params[ 1 ]);
+				m_BBox.setHeight((int) cmd->params[ 0 ]);
+//				m_BBox.setWidth ( qMax((int) cmd->params[ 1 ], m_BBox.width()) );
+//				m_BBox.setHeight( qMax((int) cmd->params[ 0 ], m_BBox.height()));
 			}
 
 			if ( i<rdSize )
@@ -548,6 +550,7 @@
 				return false;
 			}
 		}
+		m_BBox = m_BBox.normalized();
 		//----- Test records validities
 		m_Valid = (rdFunc == 0) && (m_BBox.width() != 0) && (m_BBox.height() != 0);
 		if ( !m_Valid ) {