r24186 by craig - Fix resources typo

[scribus-commit]

Author: craig
Date: Fri Nov  6 00:22:46 2020
New Revision: 24186

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24186
Log:
Fix resources typo

Modified:
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader.cpp
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader.h
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_jpeg.cpp
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ps.cpp
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_psd.cpp
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp
    trunk/Scribus/scribus/scribusdoc.cpp

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24186&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader.cpp	Fri Nov  6 00:22:46 2020
@@ -108,7 +108,7 @@
 	return ret;
 }
 
-void ScImgDataLoader::parseRessourceData( QDataStream & s, const PSDHeader & header, uint size )
+void ScImgDataLoader::parseResourceData( QDataStream & s, const PSDHeader & header, uint size )
 {
 	uint signature, resSize, offset, resBase, vRes, hRes, adj;
 	ushort resID, hResUnit, vResUnit, dummyW;

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24186&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader.h
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader.h	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader.h	Fri Nov  6 00:22:46 2020
@@ -43,7 +43,7 @@
 
 	QString getPascalString(QDataStream & s);
 	double decodePSDfloat(uint data);
-	void parseRessourceData( QDataStream & s, const PSDHeader & header, uint size );
+	void parseResourceData( QDataStream & s, const PSDHeader & header, uint size );
 
 public:
 	virtual ~ScImgDataLoader() {};

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_jpeg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24186&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_jpeg.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_jpeg.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_jpeg.cpp	Fri Nov  6 00:22:46 2020
@@ -336,7 +336,7 @@
 		else if (cinfo.output_components == 1)
 			m_imageInfoRecord.colorspace = ColorSpaceGray;
 		m_imageInfoRecord.progressive = jpeg_has_multiple_scans(&cinfo);
-		parseRessourceData(strPhot, fakeHeader, PhotoshopLen);
+		parseResourceData(strPhot, fakeHeader, PhotoshopLen);
 		// Photoshop resolution is more accurate than jpeg header resolution
 		xres = m_imageInfoRecord.xres;
 		yres = m_imageInfoRecord.yres;

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ps.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24186&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ps.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ps.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ps.cpp	Fri Nov  6 00:22:46 2020
@@ -407,7 +407,7 @@
 								ts2 >> x >> y >> b >> h;
 								fakeHeader.width = qRound(b);
 								fakeHeader.height = qRound(h);
-								parseRessourceData(strPhot, fakeHeader, psdata.size());
+								parseResourceData(strPhot, fakeHeader, psdata.size());
 								m_imageInfoRecord.valid = (m_imageInfoRecord.PDSpathData.size()) > 0;
 								if (!m_imageInfoRecord.PDSpathData.empty())
 								{

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_psd.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24186&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_psd.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_psd.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_psd.cpp	Fri Nov  6 00:22:46 2020
@@ -264,8 +264,8 @@
 	uint tmp;
 	uint cresStart;
 	uint cdataStart;
-	uint ressourceDataLen;
-	uint startRessource;
+	uint resourceDataLen;
+	uint startResource;
 
 	cresStart = s.device()->pos();
 	// Skip mode data. FIX: this is incorrect, it's the Colormap Data for indexed Images
@@ -275,12 +275,12 @@
 	LoadPSDResources(s, header, cresStart); 
 	
 	s.device()->seek( cdataStart + tmp );
-	s >> ressourceDataLen;
-	startRessource = s.device()->pos();
+	s >> resourceDataLen;
+	startResource = s.device()->pos();
 
 	if  ((!m_imageInfoRecord.exifInfo.thumbnail.isNull()) && (header.reserved[0] == 't'))
 		return true;
-	bool ret = LoadPSDImgData(s, header, startRessource + ressourceDataLen);
+	bool ret = LoadPSDImgData(s, header, startResource + resourceDataLen);
 	return ret;
 }
 
@@ -292,7 +292,7 @@
 	uint tmp;
 	uint cdataStart;
 	uint resourceDataLen;
-//	uint startRessource;
+//	uint startResource;
 
 	s.device()->seek( dataOffset );
 
@@ -489,9 +489,9 @@
 	}
 	s.device()->seek( cdataStart + tmp );
 	s >> resourceDataLen;
-//	startRessource = s.device()->pos();
+//	startResource = s.device()->pos();
 	if (resourceDataLen != 0)
-		parseRessourceData(s, header, resourceDataLen);
+		parseResourceData(s, header, resourceDataLen);
 	return true;
 }
 

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24186&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp	Fri Nov  6 00:22:46 2020
@@ -752,7 +752,7 @@
 			PSDHeader fakeHeader;
 			fakeHeader.width = widtht;
 			fakeHeader.height = heightt;
-			parseRessourceData(strPhot, fakeHeader, PhotoshopLen);
+			parseResourceData(strPhot, fakeHeader, PhotoshopLen);
 			m_imageInfoRecord.exifInfo.width = widtht;
 			m_imageInfoRecord.exifInfo.height = heightt;
 			if (!m_imageInfoRecord.valid)

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24186&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp	(original)
+++ trunk/Scribus/scribus/scribusdoc.cpp	Fri Nov  6 00:22:46 2020
@@ -10146,7 +10146,7 @@
 void ScribusDoc::updatePic()
 {
 	//TODO? Getting the pointer with m_Selection->itemAt(i) over and over again in the loop 
-	// seems to be a waste of ressources
+	// seems to be a waste of resources
 	uint docSelectionCount = m_Selection->count();
 	if (docSelectionCount <= 0)
 		return;