r16773 by fschmid - Initialize the "progressDialog" variable to NULL in constructor.

scribus-commit scribus-commit at lists.scribus.net
Mon Aug 8 18:21:17 UTC 2011


Author: fschmid
Date: Mon Aug  8 18:21:16 2011
New Revision: 16773

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=16773
Log:
Initialize the "progressDialog" variable to NULL in constructor.

Modified:
    trunk/Scribus/scribus/plugins/import/ai/importai.cpp
    trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
    trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp
    trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
    trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp
    trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
    trunk/Scribus/scribus/plugins/import/sml/importsml.cpp
    trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
    trunk/Scribus/scribus/plugins/import/xar/importxar.cpp

Modified: trunk/Scribus/scribus/plugins/import/ai/importai.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16773&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 Mon Aug  8 18:21:16 2011
@@ -1805,7 +1805,61 @@
 		else if (command == "Xy")
 		{
 			ScTextStream ts2(&Cdata, QIODevice::ReadOnly);
-			ts2 >> blendMode >> Opacity;
+			int mode = 0;
+			ts2 >> mode >> Opacity;
+			// Adjusting blendmodes, taken from the PDF importer
+			switch (mode)
+			{
+				default:
+				case 0:
+					blendMode = 0;
+					break;
+				case 4:
+					blendMode = 1;
+					break;
+				case 5:
+					blendMode = 2;
+					break;
+				case 1:
+					blendMode = 3;
+					break;
+				case 2:
+					blendMode = 4;
+					break;
+				case 3:
+					blendMode = 5;
+					break;
+				case 8:
+					blendMode = 6;
+					break;
+				case 9:
+					blendMode = 7;
+					break;
+				case 10:
+					blendMode = 8;
+					break;
+				case 11:
+					blendMode = 9;
+					break;
+				case 6:
+					blendMode = 10;
+					break;
+				case 7:
+					blendMode = 11;
+					break;
+				case 12:
+					blendMode = 12;
+					break;
+				case 13:
+					blendMode = 13;
+					break;
+				case 14:
+					blendMode = 14;
+					break;
+				case 15:
+					blendMode = 15;
+					break;
+			}
 		}
 		else if (command == "XR")
 		{

Modified: trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16773&path=/trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp Mon Aug  8 18:21:16 2011
@@ -61,6 +61,7 @@
 	m_Doc=doc;
 	importerFlags = flags;
 	interactive = (flags & LoadSavePlugin::lfInteractive);
+	progressDialog = NULL;
 }
 
 QImage CgmPlug::readThumbnail(QString fName)

Modified: trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16773&path=/trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp Mon Aug  8 18:21:16 2011
@@ -54,6 +54,7 @@
 	m_Doc=doc;
 	importerFlags = flags;
 	interactive = (flags & LoadSavePlugin::lfInteractive);
+	progressDialog = NULL;
 }
 
 QImage CvgPlug::readThumbnail(QString fName)

Modified: trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16773&path=/trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pct/importpct.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pct/importpct.cpp Mon Aug  8 18:21:16 2011
@@ -57,6 +57,7 @@
 	m_Doc=doc;
 	importerFlags = flags;
 	interactive = (flags & LoadSavePlugin::lfInteractive);
+	progressDialog = NULL;
 }
 
 QImage PctPlug::readThumbnail(QString fName)

Modified: trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16773&path=/trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp Mon Aug  8 18:21:16 2011
@@ -57,6 +57,7 @@
 	m_Doc = doc;
 	importerFlags = flags;
 	interactive = (flags & LoadSavePlugin::lfInteractive);
+	progressDialog = NULL;
 }
 
 QImage PdfPlug::readThumbnail(QString fName)
@@ -317,6 +318,16 @@
 					GBool printing = gFalse;
 					dev->startDoc(pdfDoc->getXRef(), pdfDoc->getCatalog());
 					int rotate = pdfDoc->getPageRotate(firstPage);
+				/*	PDFRectangle *rect = pdfDoc->getPage(firstPage)->getMediaBox();
+					qDebug() << "Media Box" << rect->x1 << rect->y1 << rect->x2 << rect->y2;
+					rect = pdfDoc->getPage(firstPage)->getCropBox();
+					qDebug() << "Crop Box " << rect->x1 << rect->y1 << rect->x2 << rect->y2;
+					rect = pdfDoc->getPage(firstPage)->getBleedBox();
+					qDebug() << "Bleed Box" << rect->x1 << rect->y1 << rect->x2 << rect->y2;
+					rect = pdfDoc->getPage(firstPage)->getTrimBox();
+					qDebug() << "Trim Box " << rect->x1 << rect->y1 << rect->x2 << rect->y2;
+					rect = pdfDoc->getPage(firstPage)->getArtBox();
+					qDebug() << "Art Box  " << rect->x1 << rect->y1 << rect->x2 << rect->y2; */
 					if (importerFlags & LoadSavePlugin::lfCreateDoc)
 					{
 						m_Doc->currentPage()->setInitialHeight(pdfDoc->getPageMediaHeight(firstPage));

Modified: trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16773&path=/trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/shape/importshape.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/shape/importshape.cpp Mon Aug  8 18:21:16 2011
@@ -56,6 +56,7 @@
 	m_Doc=doc;
 	importerFlags = flags;
 	interactive = (flags & LoadSavePlugin::lfInteractive);
+	progressDialog = NULL;
 }
 
 QImage ShapePlug::readThumbnail(QString fName)

Modified: trunk/Scribus/scribus/plugins/import/sml/importsml.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16773&path=/trunk/Scribus/scribus/plugins/import/sml/importsml.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/sml/importsml.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/sml/importsml.cpp Mon Aug  8 18:21:16 2011
@@ -54,6 +54,7 @@
 	m_Doc=doc;
 	importerFlags = flags;
 	interactive = (flags & LoadSavePlugin::lfInteractive);
+	progressDialog = NULL;
 }
 
 QImage SmlPlug::readThumbnail(QString fName)

Modified: trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16773&path=/trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp Mon Aug  8 18:21:16 2011
@@ -422,6 +422,7 @@
 	m_Doc=doc;
 	importerFlags = flags;
 	interactive = (flags & LoadSavePlugin::lfInteractive);
+	progressDialog = NULL;
 }
 
 QImage WpgPlug::readThumbnail(QString fName)

Modified: trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16773&path=/trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xar/importxar.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/xar/importxar.cpp Mon Aug  8 18:21:16 2011
@@ -64,6 +64,7 @@
 	m_Doc=doc;
 	importerFlags = flags;
 	interactive = (flags & LoadSavePlugin::lfInteractive);
+	progressDialog = NULL;
 }
 
 bool XarPlug::readColors(const QString& fNameIn, ColorList &colors)




More information about the scribus-commit mailing list