r18711 by fschmid - Fixed drawing of the frame of image objects when image is in high resolution.

[scribus-commit]

Author: fschmid
Date: Sat Jan 11 09:16:47 2014
New Revision: 18711

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18711
Log:
Fixed drawing of the frame of image objects when image is in high resolution.

Modified:
    trunk/Scribus/scribus/scpainter.cpp
    trunk/Scribus/scribus/scpainter.h

Modified: trunk/Scribus/scribus/scpainter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18711&path=/trunk/Scribus/scribus/scpainter.cpp
==============================================================================
--- trunk/Scribus/scribus/scpainter.cpp (original)
+++ trunk/Scribus/scribus/scpainter.cpp Sat Jan 11 09:16:47 2014
@@ -48,6 +48,7 @@
 	svgMode = false;
 	m_image = target;
 	m_matrix = QTransform();
+	zoomStack.clear();
 	cairo_surface_t *img = cairo_image_surface_create_for_data(m_image->bits(), CAIRO_FORMAT_ARGB32, w, h, w*4);
 	m_cr = cairo_create(img);
 	cairo_save( m_cr );
@@ -475,11 +476,14 @@
 void ScPainter::save()
 {
 	cairo_save( m_cr );
+	zoomStack.push(m_zoomFactor);
 }
 
 void ScPainter::restore()
 {
 	cairo_restore( m_cr );
+	if (!zoomStack.isEmpty())
+		m_zoomFactor = zoomStack.pop();
 }
 
 void ScPainter::setRasterOp(int blendMode)

Modified: trunk/Scribus/scribus/scpainter.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18711&path=/trunk/Scribus/scribus/scpainter.h
==============================================================================
--- trunk/Scribus/scribus/scpainter.h (original)
+++ trunk/Scribus/scribus/scpainter.h Sat Jan 11 09:16:47 2014
@@ -159,6 +159,7 @@
 	QImage imageQ;
 
 	QStack<layerProp> Layers;
+	QStack<double> zoomStack;
 	QImage *m_image;
 	double  m_layerTransparency;
 	int  m_blendMode;