r17014 by fschmid - Fixed Bug 10277: "Path included in tif should be correctly flipped with frames"
scribus-commit
scribus-commit at lists.scribus.net
Wed Nov 23 15:41:40 UTC 2011
Author: fschmid
Date: Wed Nov 23 15:41:40 2011
New Revision: 17014
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17014
Log:
Fixed Bug 10277: "Path included in tif should be correctly flipped with frames"
Modified:
trunk/Scribus/scribus/pageitem_imageframe.cpp
Modified: trunk/Scribus/scribus/pageitem_imageframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17014&path=/trunk/Scribus/scribus/pageitem_imageframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_imageframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_imageframe.cpp Wed Nov 23 15:41:40 2011
@@ -79,13 +79,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->guidesPrefs().framesShown))
@@ -144,6 +137,8 @@
}
else
{
+ p->setupPolygon(&PoLine);
+ p->setClipPath();
if (imageFlippedH())
{
p->translate(Width, 0);
@@ -153,6 +148,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->rotate(LocalRot);
More information about the scribus-commit
mailing list