r21151 by fschmid -

[scribus-commit]

Author: fschmid
Date: Fri Apr  1 19:04:06 2016
New Revision: 21151

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21151
Log:
Applied Patch from Bug #13900: Crash when using function savePageAsEPS without GUI

Modified:
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gmagick.cpp
    trunk/Scribus/scribus/plugins/export/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/ai/importai.cpp
    trunk/Scribus/scribus/pslib.cpp

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gmagick.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21151&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gmagick.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gmagick.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gmagick.cpp	Fri Apr  1 19:04:06 2016
@@ -134,6 +134,7 @@
 		*s = qRgba(r, g, b, a);
 		s++;
 	}
+
 	return true;
 }
 

Modified: trunk/Scribus/scribus/plugins/export/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21151&path=/trunk/Scribus/scribus/plugins/export/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/export/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/export/CMakeLists.txt	Fri Apr  1 19:04:06 2016
@@ -1,3 +1,4 @@
 ADD_SUBDIRECTORY(pixmapexport)
 ADD_SUBDIRECTORY(svgexplugin)
+ADD_SUBDIRECTORY(textexport)
 ADD_SUBDIRECTORY(xpsexport)

Modified: trunk/Scribus/scribus/plugins/import/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21151&path=/trunk/Scribus/scribus/plugins/import/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/CMakeLists.txt	Fri Apr  1 19:04:06 2016
@@ -1,6 +1,7 @@
 ADD_SUBDIRECTORY(ai)
 ADD_SUBDIRECTORY(cdr)
 ADD_SUBDIRECTORY(cgm)
+ADD_SUBDIRECTORY(cenon)
 ADD_SUBDIRECTORY(cvg)
 ADD_SUBDIRECTORY(drw)
 ADD_SUBDIRECTORY(emf)

Modified: trunk/Scribus/scribus/plugins/import/ai/importai.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21151&path=/trunk/Scribus/scribus/plugins/import/ai/importai.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ai/importai.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/ai/importai.cpp	Fri Apr  1 19:04:06 2016
@@ -2776,6 +2776,21 @@
 							}
 							m_Doc->addPattern(currentPatternDefName, pat);
 							importedPatterns.append(currentPatternDefName);
+						/*	double minx =  std::numeric_limits<double>::max();
+							double miny =  std::numeric_limits<double>::max();
+							double maxx = -std::numeric_limits<double>::max();
+							double maxy = -std::numeric_limits<double>::max();
+							double x1, x2, y1, y2;
+							currItem->getVisualBoundingRect(&x1, &y1, &x2, &y2);
+							minx = qMin(minx, x1);
+							miny = qMin(miny, y1);
+							maxx = qMax(maxx, x2);
+							maxy = qMax(maxy, y2);
+							currItem->gXpos = currItem->xPos() - minx;
+							currItem->gYpos = currItem->yPos() - miny;
+							currItem->setXYPos(currItem->gXpos, currItem->gYpos, true);
+							m_Doc->docPatterns[currentPatternDefName].width = maxx - minx;
+							m_Doc->docPatterns[currentPatternDefName].height = maxy - miny;*/
 						}
 					}
 					m_Doc->itemSelection_DeleteItem(tmpSel);

Modified: trunk/Scribus/scribus/pslib.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21151&path=/trunk/Scribus/scribus/pslib.cpp
==============================================================================
--- trunk/Scribus/scribus/pslib.cpp	(original)
+++ trunk/Scribus/scribus/pslib.cpp	Fri Apr  1 19:04:06 2016
@@ -1663,9 +1663,12 @@
 	int ap=0;
 	for (; ap < Doc->MasterPages.count() && !abortExport && !errorOccured; ++ap)
 	{
-		progressDialog->setOverallProgress(ap);
-		progressDialog->setProgress("EMP", ap);
-		ScQApp->processEvents();
+		if (usingGUI)
+		{
+			progressDialog->setOverallProgress(ap);
+			progressDialog->setProgress("EMP", ap);
+			ScQApp->processEvents();
+		}
 		if (Doc->MasterItems.count() != 0)
 		{
 			int Lnr = 0;
@@ -1722,10 +1725,12 @@
 	PutStream("%%EndSetup\n");
 	while (aa < pageNs.size() && !abortExport && !errorOccured)
 	{
-		progressDialog->setProgress("EP", aa);
-		progressDialog->setOverallProgress(ap+aa);
 		if (usingGUI)
+		{
+			progressDialog->setProgress("EP", aa);
+			progressDialog->setOverallProgress(ap+aa);
 			ScQApp->processEvents();
+		}
 		a = pageNs[aa]-1;
 		ScPage* page = Doc->Pages->at(a);
 		if ((!psExport) && (Doc->m_Selection->count() != 0))
@@ -1801,7 +1806,8 @@
 			aa++;
 	}
 	PS_close();
-	if (usingGUI) progressDialog->close();
+	if (usingGUI)
+		progressDialog->close();
 	if (errorOccured)
 		return 1;
 	else if (abortExport)