r21403 by jghali -

[scribus-commit]

Author: jghali
Date: Fri Jul  8 15:08:35 2016
New Revision: 21403

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21403
Log:
#14209: Scribus freeze when exporting docs using specific OTF fonts

Modified:
    trunk/Scribus/scribus/fonts/cff.cpp

Modified: trunk/Scribus/scribus/fonts/cff.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21403&path=/trunk/Scribus/scribus/fonts/cff.cpp
==============================================================================
--- trunk/Scribus/scribus/fonts/cff.cpp	(original)
+++ trunk/Scribus/scribus/fonts/cff.cpp	Fri Jul  8 15:08:35 2016
@@ -871,15 +871,16 @@
 			case 0x1:
 			case 0x81:
 				gid = 1;
-				for (int r = 0; r < N; ++r)
+				for (int i = 0; i < N; ++i)
 				{
 					uchar first = m_bytes[pos++];
 					uchar nLeft = m_bytes[pos++];
-					for (code = first; code <= first + nLeft; ++code)
+					int lastCode = (int) first + (int) nLeft;
+					for (int j = first; j <= lastCode; ++j)
 					{
-						if (result[code] == 0)
+						if (result[j] == 0)
 						{
-							result[code] = gid;
+							result[j] = gid;
 						}
 						++gid;
 					}