r17015 by fschmid - Fixed Bug 10277: "Path included in tif should be correctly flipped with frames"

[scribus-commit]

Author: fschmid
Date: Wed Nov 23 15:44:29 2011
New Revision: 17015

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17015
Log:
Fixed Bug 10277: "Path included in tif should be correctly flipped with frames"

Modified:
    branches/Version135/Scribus/scribus/pageitem_imageframe.cpp

Modified: branches/Version135/Scribus/scribus/pageitem_imageframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17015&path=/branches/Version135/Scribus/scribus/pageitem_imageframe.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/pageitem_imageframe.cpp (original)
+++ branches/Version135/Scribus/scribus/pageitem_imageframe.cpp Wed Nov 23 15:44:29 2011
@@ -66,13 +66,6 @@
 				p->fillPath();
 			}
 			p->save();
-			if (imageClip.size() != 0)
-			{
-				p->setupPolygon(&imageClip);
-				p->setClipPath();
-			}
-			p->setupPolygon(&PoLine);
-			p->setClipPath();
 			if (Pfile.isEmpty())
 			{
 				if ((Frame) && (m_Doc->guidesSettings.framesShown))
@@ -131,6 +124,8 @@
 				}
 				else
 				{
+					p->setupPolygon(&PoLine);
+					p->setClipPath();
 					if (imageFlippedH())
 					{
 						p->translate(Width, 0);
@@ -140,6 +135,11 @@
 					{
 						p->translate(0, Height);
 						p->scale(1, -1);
+					}
+					if (imageClip.size() != 0)
+					{
+						p->setupPolygon(&imageClip);
+						p->setClipPath();
 					}
 					p->translate(LocalX*LocalScX, LocalY*LocalScY);
 					p->scale(LocalScX, LocalScY);