Author: fschmid
Date: Tue Jul 9 20:06:04 2013
New Revision: 18355
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18355
Log:
Fixed Bug #11650: 1.5 doesnt import 1.4 gradient well
Modified:
trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
trunk/Scribus/scribus/plugins/import/CMakeLists.txt
Modified:
trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=18355&path=/trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
==============================================================================
---
trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
(original)
+++
trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
Tue Jul 9 20:06:04 2013
@@ -1438,6 +1438,10 @@
OB->GrStartY =
ScCLocale::toDoubleC(obj->attribute("GRSTARTY"), 0.0);
OB->GrEndX =
ScCLocale::toDoubleC(obj->attribute("GRENDX"), 0.0);
OB->GrEndY =
ScCLocale::toDoubleC(obj->attribute("GRENDY"), 0.0);
+ OB->GrFocalX = OB->GrStartX;
+ OB->GrFocalY = OB->GrStartY;
+ OB->GrScale = 1.0;
+ OB->GrSkew = 0.0;
OB->GrColor = obj->attribute("GRCOLOR","");
if (OB->GrColor.isEmpty())
OB->GrColor = "Black";
Modified:
trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=18355&path=/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
==============================================================================
---
trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
(original)
+++
trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
Tue Jul 9 20:06:04 2013
@@ -2959,6 +2959,10 @@
currItem->GrStartY = attrs.valueAsDouble("GRSTARTY",
0.0);
currItem->GrEndX = attrs.valueAsDouble("GRENDX",
currItem->width());
currItem->GrEndY = attrs.valueAsDouble("GRENDY", 0.0);
+ currItem->GrFocalX = currItem->GrStartX;
+ currItem->GrFocalY = currItem->GrStartY;
+ currItem->GrScale = 1.0;
+ currItem->GrSkew = 0.0;
GrColor = attrs.valueAsString("GRCOLOR","");
if (!GrColor.isEmpty())
{
Modified:
trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=18355&path=/trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
==============================================================================
---
trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
(original)
+++
trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
Tue Jul 9 20:06:04 2013
@@ -1933,6 +1933,10 @@
currItem->GrStartY =
ScCLocale::toDoubleC(obj->attribute("GRSTARTY"), 0.0);
currItem->GrEndX =
ScCLocale::toDoubleC(obj->attribute("GRENDX"), currItem->width());
currItem->GrEndY =
ScCLocale::toDoubleC(obj->attribute("GRENDY"), 0.0);
+ currItem->GrFocalX = currItem->GrStartX;
+ currItem->GrFocalY = currItem->GrStartY;
+ currItem->GrScale = 1.0;
+ currItem->GrSkew = 0.0;
GrColor = obj->attribute("GRCOLOR","");
if (!GrColor.isEmpty())
{
Modified: trunk/Scribus/scribus/plugins/import/CMakeLists.txt
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=18355&path=/trunk/Scribus/scribus/plugins/import/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/CMakeLists.txt Tue Jul 9 20:06:04 2013
@@ -1,4 +1,5 @@
ADD_SUBDIRECTORY(ai)
+ADD_SUBDIRECTORY(cdr)
ADD_SUBDIRECTORY(cgm)
ADD_SUBDIRECTORY(cvg)
ADD_SUBDIRECTORY(drw)
@@ -10,11 +11,12 @@
ELSE(HAVE_POPPLER)
ADD_SUBDIRECTORY(ps)
ENDIF(HAVE_POPPLER)
-# ADD_SUBDIRECTORY(pub)
+ADD_SUBDIRECTORY(pub)
ADD_SUBDIRECTORY(shape)
ADD_SUBDIRECTORY(sml)
ADD_SUBDIRECTORY(svg)
ADD_SUBDIRECTORY(uniconvertor)
+ADD_SUBDIRECTORY(vsd)
ADD_SUBDIRECTORY(wmf)
ADD_SUBDIRECTORY(wpg)
ADD_SUBDIRECTORY(xar)
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
