r17041 by fschmid - Fixed Bug 10277: "Path included in tif should be correctly flipped with frames", follow-up, fixing ps and pdf output

[scribus-commit]

Author: fschmid
Date: Tue Nov 29 16:16:25 2011
New Revision: 17041

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17041
Log:
Fixed Bug 10277: "Path included in tif should be correctly flipped with frames", follow-up, fixing ps and pdf output

Modified:
    trunk/Scribus/scribus/pdflib_core.cpp
    trunk/Scribus/scribus/pslib.cpp

Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17041&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp (original)
+++ trunk/Scribus/scribus/pdflib_core.cpp Tue Nov 29 16:16:25 2011
@@ -2076,6 +2076,10 @@
 							PutPage(ite->fillRule ? "h\nf*\n" : "h\nf\n");
 						}
 						PutPage("q\n");
+						if (ite->imageFlippedH())
+							PutPage("-1 0 0 1 "+FToStr(ite->width())+" 0 cm\n");
+						if (ite->imageFlippedV())
+							PutPage("1 0 0 -1 0 "+FToStr(-ite->height())+" cm\n");
 						if (ite->imageClip.size() != 0)
 						{
 							PutPage(SetClipPathImage(ite));
@@ -2083,10 +2087,6 @@
 						}
 						PutPage(SetClipPath(ite));
 						PutPage("h\nW*\nn\n");
-						if (ite->imageFlippedH())
-							PutPage("-1 0 0 1 "+FToStr(ite->width())+" 0 cm\n");
-						if (ite->imageFlippedV())
-							PutPage("1 0 0 -1 0 "+FToStr(-ite->height())+" cm\n");
 						if ((ite->PictureIsAvailable) && (!ite->Pfile.isEmpty()))
 						{
 							if (!PDF_Image(ite, ite->Pfile, ite->imageXScale(), ite->imageYScale(), ite->imageXOffset(), -ite->imageYOffset(), false, ite->IProfile, ite->UseEmbedded, ite->IRender, &tmpOut))
@@ -3731,17 +3731,17 @@
 				}
 			}
 			tmp += "q\n";
-			if (ite->imageClip.size() != 0)
-			{
-				tmp += SetClipPathImage(ite);
-				tmp += "h\nW*\nn\n";
-			}
-			tmp += SetClipPath(ite);
-			tmp += "h\nW*\nn\n";
 			if (ite->imageFlippedH())
 				tmp += "-1 0 0 1 "+FToStr(ite->width())+" 0 cm\n";
 			if (ite->imageFlippedV())
 				tmp += "1 0 0 -1 0 "+FToStr(-ite->height())+" cm\n";
+			if (ite->imageClip.size() != 0)
+			{
+				tmp += SetClipPathImage(ite);
+				tmp += "h\nW*\nn\n";
+			}
+			tmp += SetClipPath(ite);
+			tmp += "h\nW*\nn\n";
 			if ((ite->PictureIsAvailable) && (!ite->Pfile.isEmpty()))
 			{
 				if (!PDF_Image(ite, ite->Pfile, ite->imageXScale(), ite->imageYScale(), ite->imageXOffset(), -ite->imageYOffset(), false, ite->IProfile, ite->UseEmbedded, ite->IRender, &tmpOut))

Modified: trunk/Scribus/scribus/pslib.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17041&path=/trunk/Scribus/scribus/pslib.cpp
==============================================================================
--- trunk/Scribus/scribus/pslib.cpp (original)
+++ trunk/Scribus/scribus/pslib.cpp Tue Nov 29 16:16:25 2011
@@ -1760,6 +1760,16 @@
 				PS_newpath();
 			}
 			PS_save();
+			if (c->imageFlippedH())
+			{
+				PS_translate(c->width(), 0);
+				PS_scale(-1, 1);
+			}
+			if (c->imageFlippedV())
+			{
+				PS_translate(0, -c->height());
+				PS_scale(1, -1);
+			}
 			if (c->imageClip.size() != 0)
 			{
 				SetClipPath(&c->imageClip);
@@ -1769,16 +1779,6 @@
 			SetClipPath(&c->PoLine);
 			PS_closepath();
 			PS_clip(true);
-			if (c->imageFlippedH())
-			{
-				PS_translate(c->width(), 0);
-				PS_scale(-1, 1);
-			}
-			if (c->imageFlippedV())
-			{
-				PS_translate(0, -c->height());
-				PS_scale(1, -1);
-			}
 			if ((c->PictureIsAvailable) && (!c->Pfile.isEmpty()))
 			{
 				bool imageOk = false;