[patch] grcompiler-r815-tests.patch

grcompiler-r815-tests.patch (text/plain), 8.25 KB, created by David Leverton on 2008-02-12 04:00:50 UTC

Index: grcompiler/test/GrcRegressionTest/FileFont.cpp
===================================================================
--- grcompiler/test/GrcRegressionTest/FileFont.cpp	(revision 815)
+++ grcompiler/test/GrcRegressionTest/FileFont.cpp	(working copy)
@@ -31,15 +31,15 @@
 
 FileFont::FileFont()
 	: Font(),
-	m_file(NULL),
+	m_pfile(NULL),
 	m_pTableCache(NULL),
-	m_ascent(0),
-	m_descent(0),
-	m_emSquare(0),
+	m_mAscent(0),
+	m_mDescent(0),
+	m_mEmSquare(0),
 	m_pointSize(0),
 	m_dpiX(FUDGE_FACTOR),
 	m_dpiY(FUDGE_FACTOR),
-	m_isValid(false),
+	m_fIsValid(false),
 	m_pHeader(NULL),
 	m_pTableDir(NULL),
 	m_xScale(1.0f),
@@ -55,21 +55,21 @@
 FileFont::FileFont(FILE * file, float pointSize, 
 				   unsigned int dpiX, unsigned int dpiY)
 	: Font(),
-	m_file(file),
+	m_pfile(file),
 	m_pTableCache(NULL),
-	m_ascent(0),
-	m_descent(0),
-	m_emSquare(0),
+	m_mAscent(0),
+	m_mDescent(0),
+	m_mEmSquare(0),
 	m_pointSize(pointSize),
 	m_dpiX(dpiX),
 	m_dpiY(dpiY),
-	m_isValid(false),
+	m_fIsValid(false),
 	m_pHeader(NULL),
 	m_pTableDir(NULL),
 	m_xScale(1.0f),
 	m_yScale(1.0f)
 {
-	Assert(m_file); // shouldn't be null
+	Assert(m_pfile); // shouldn't be null
 	initializeFromFace();
 	
 }
@@ -77,22 +77,22 @@
 FileFont::FileFont(char * fileName, float pointSize, 
 				   unsigned int dpiX, unsigned int dpiY)
 	: Font(),
-	m_file(NULL),
+	m_pfile(NULL),
 	m_pTableCache(NULL),
-	m_ascent(0),
-	m_descent(0),
-	m_emSquare(0),
+	m_mAscent(0),
+	m_mDescent(0),
+	m_mEmSquare(0),
 	m_pointSize(pointSize),
 	m_dpiX(dpiX),
 	m_dpiY(dpiY),
-	m_isValid(false),
+	m_fIsValid(false),
 	m_pHeader(NULL),
 	m_pTableDir(NULL),
 	m_xScale(1.0f),
 	m_yScale(1.0f)
 {
 	Assert(fileName); // shouldn't be null but we play safe anyway
-	m_file = fopen(fileName, "rb");
+	m_pfile = fopen(fileName, "rb");
 
 	initializeFromFace();
 }
@@ -100,22 +100,22 @@
 FileFont::FileFont(std::string fileName, float pointSize, 
 				   unsigned int dpiX, unsigned int dpiY)
 	: Font(),
-	m_file(NULL),
+	m_pfile(NULL),
 	m_pTableCache(NULL),
-	m_ascent(0),
-	m_descent(0),
-	m_emSquare(0),
+	m_mAscent(0),
+	m_mDescent(0),
+	m_mEmSquare(0),
 	m_pointSize(pointSize),
 	m_dpiX(dpiX),
 	m_dpiY(dpiY),
-	m_isValid(false),
+	m_fIsValid(false),
 	m_pHeader(NULL),
 	m_pTableDir(NULL),
 	m_xScale(1.0f),
 	m_yScale(1.0f)
 {
 	Assert(fileName.length()); // shouldn't be null but we play safe anyway
-	m_file = fopen(fileName.c_str(), "rb");
+	m_pfile = fopen(fileName.c_str(), "rb");
 
 	initializeFromFace();
 }
@@ -131,62 +131,62 @@
 	m_clrFore = (unsigned long)kclrBlack;
 	m_clrBack = (unsigned long)kclrTransparent;
 
-	if (m_file)
+	if (m_pfile)
 	{
 		size_t lOffset;
 		size_t lSize;
 		TtfUtil::GetHeaderInfo(lOffset, lSize);
 		m_pHeader = new byte [lSize];
-		m_isValid = true;
+		m_fIsValid = true;
 		if (!m_pHeader) 
 		{
-			m_isValid = false;
+			m_fIsValid = false;
 			return;
 		}
-		m_isValid = (fseek(m_file, lOffset, SEEK_SET) == 0);
-		size_t bytesRead = fread(m_pHeader, 1, lSize, m_file);
+		m_fIsValid = (fseek(m_pfile, lOffset, SEEK_SET) == 0);
+		size_t bytesRead = fread(m_pHeader, 1, lSize, m_pfile);
 		Assert(static_cast<int>(bytesRead) == lSize);
-		m_isValid = TtfUtil::CheckHeader(m_pHeader);
+		m_fIsValid = TtfUtil::CheckHeader(m_pHeader);
 
-		if (!m_isValid) return;
-		m_isValid = TtfUtil::GetTableDirInfo(m_pHeader, lOffset, lSize);
+		if (!m_fIsValid) return;
+		m_fIsValid = TtfUtil::GetTableDirInfo(m_pHeader, lOffset, lSize);
 		m_pTableDir = new byte[lSize];
 		if (!m_pTableDir) 
 		{
-			m_isValid = false;
+			m_fIsValid = false;
 			return;
 		}
 		// if lOffset hasn't changed this isn't needed
-		fseek(m_file, lOffset, SEEK_SET);
-		bytesRead = fread(m_pTableDir, 1, lSize, m_file);
+		fseek(m_pfile, lOffset, SEEK_SET);
+		bytesRead = fread(m_pTableDir, 1, lSize, m_pfile);
 		Assert(static_cast<int>(bytesRead) == lSize);
 		
 		// now read head tables
-		m_isValid = TtfUtil::GetTableInfo(ktiOs2, m_pHeader, m_pTableDir, 
+		m_fIsValid = TtfUtil::GetTableInfo(ktiOs2, m_pHeader, m_pTableDir, 
 										  lOffset, lSize);
-		if (!m_isValid) 
+		if (!m_fIsValid) 
 		{
 			return;
 		}
 		byte * pTable = readTable(ktiOs2, lSize);
 		// get ascent, descent, style while we have the OS2 table loaded
-		if (!m_isValid || !pTable) 
+		if (!m_fIsValid || !pTable) 
 		{
 			return;
 		}
-		m_isValid = TtfUtil::FontOs2Style(pTable, m_fBold, m_fItalic);
-		m_ascent = static_cast<float>(TtfUtil::FontAscent(pTable));
-		m_descent = static_cast<float>(TtfUtil::FontDescent(pTable));
+		m_fIsValid = TtfUtil::FontOs2Style(pTable, m_fBold, m_fItalic);
+		m_mAscent = static_cast<float>(TtfUtil::FontAscent(pTable));
+		m_mDescent = static_cast<float>(TtfUtil::FontDescent(pTable));
 		
 		pTable = readTable(ktiName, lSize);
-		if (!m_isValid || !pTable) 
+		if (!m_fIsValid || !pTable) 
 		{
 			return;
 		}
 		if (!TtfUtil::Get31EngFamilyInfo(pTable, lOffset, lSize))
 		{
 			// not English name
-			m_isValid = false;
+			m_fIsValid = false;
 			return;
 		}
 		Assert(lSize %2 == 0);// should be utf16
@@ -204,28 +204,28 @@
 			{
 				utf32 cch32;
                 U16_NEXT(rgchwFace, c16, cchw, cch32);
-				m_faceName.push_back(cch32);
+				m_stuFaceName.push_back(cch32);
 			}
 //		}
 #else
 //		else
 //		{
-			m_faceName.assign(rgchwFace);
+			m_stuFaceName.assign(rgchwFace);
 //		}
 #endif
 		pTable = readTable(ktiHead, lSize);
-		if (!m_isValid || !pTable) 
+		if (!m_fIsValid || !pTable) 
 		{
 			return;
 		}
-		m_emSquare = static_cast<float>(TtfUtil::DesignUnits(pTable));
+		m_mEmSquare = static_cast<float>(TtfUtil::DesignUnits(pTable));
 		// can now set the scale
 		m_xScale = scaleFromDpi(m_dpiX);
 		m_yScale = scaleFromDpi(m_dpiY);
 	}
 	else
 	{
-		m_isValid = false;
+		m_fIsValid = false;
 	}
 }
 
@@ -249,7 +249,7 @@
 									  lOffset, lSize);
 	if (!isValid) 
 		return NULL;
-	fseek(m_file, lOffset, SEEK_SET);
+	fseek(m_pfile, lOffset, SEEK_SET);
 	// only allocate if needed
 	pTable = m_pTableCache->allocateTable(tableId, lSize);
 	
@@ -258,7 +258,7 @@
 		isValid = false;
 		return NULL;
 	}
-	size_t bytesRead = fread(pTable, 1, lSize, m_file);
+	size_t bytesRead = fread(pTable, 1, lSize, m_pfile);
 	isValid = (static_cast<int>(bytesRead) == lSize);
 	if (isValid)
 	{
@@ -287,14 +287,14 @@
 			delete [] m_pTableDir;
 			delete m_pTableCache;
 			m_pTableCache = NULL;
-			if (m_file) fclose(m_file);
+			if (m_pfile) fclose(m_pfile);
 		}
 	}
 	else
 	{
 		delete [] m_pHeader;
 		delete [] m_pTableDir;
-		if (m_file) fclose(m_file);
+		if (m_pfile) fclose(m_pfile);
 	}
 	// note the DecFontCount(); is done in the Font base class
 }
@@ -313,14 +313,14 @@
 FileFont::FileFont(const FileFont & font, float pointSize, 
 				   unsigned int dpiX, unsigned int dpiY)
 : Font(font),
-	m_file(font.m_file),
-	m_ascent(font.m_ascent),
-	m_descent(font.m_descent),
-	m_emSquare(font.m_emSquare),
+	m_pfile(font.m_pfile),
+	m_mAscent(font.m_mAscent),
+	m_mDescent(font.m_mDescent),
+	m_mEmSquare(font.m_mEmSquare),
 	m_pointSize(font.m_pointSize),
 	m_dpiX(font.m_dpiX),
 	m_dpiY(font.m_dpiY),
-	m_isValid(font.m_isValid),
+	m_fIsValid(font.m_fIsValid),
 	m_pHeader(font.m_pHeader),
 	m_pTableDir(font.m_pTableDir),
 	m_xScale(font.m_xScale),
@@ -343,7 +343,7 @@
 	// colors are not used
 	m_clrFore = font.m_clrFore;
 	m_clrBack = font.m_clrBack;
-	m_faceName.assign(font.m_faceName);
+	m_stuFaceName.assign(font.m_stuFaceName);
 	
 	m_pTableCache = font.m_pTableCache;
 	// use the same table cache between instances
@@ -398,9 +398,9 @@
 void FileFont::getFontMetrics(float * pAscent, float * pDescent,
 		float * pEmSquare)
 {
-		if (pEmSquare) *pEmSquare = m_emSquare * m_xScale;
-		if (pAscent) *pAscent = m_ascent * m_yScale;
-		if (pDescent) *pDescent = m_descent * m_yScale;
+		if (pEmSquare) *pEmSquare = m_mEmSquare * m_xScale;
+		if (pAscent) *pAscent = m_mAscent * m_yScale;
+		if (pDescent) *pDescent = m_mDescent * m_yScale;
 }
 
 
@@ -419,7 +419,7 @@
 bool FileFont::fontHasGraphiteTables()
 {
 	size_t tableSize;
-	bool isGraphiteFont = m_isValid;
+	bool isGraphiteFont = m_fIsValid;
 	isGraphiteFont &= (readTable(ktiSilf, tableSize) != NULL);
 	return isGraphiteFont;
 }