r14006 by jghali - fix failure to compile pict import plugin with msvc caused by ambiguity with QByteArray::operator[]

scribus-commit scribus-commit at lists.scribus.net
Mon Sep 21 01:30:32 CEST 2009


Revision: 14006
Author: jghali
Date: 2009-09-20T23:29:18.636080Z
Commit message: fix failure to compile pict import plugin with msvc caused by ambiguity with QByteArray::operator[]

Changeset: 
M  /trunk/Scribus/scribus/plugins/pctimplugin/importpct.cpp

Diffs:
Index: scribus/plugins/pctimplugin/importpct.cpp
===================================================================
--- scribus/plugins/pctimplugin/importpct.cpp	(revision 14005)
+++ scribus/plugins/pctimplugin/importpct.cpp	(revision 14006)
@@ -1592,7 +1592,7 @@
 					if (component_size == 4)
 					{
 						uchar *q = (uchar*)(image.scanLine(rr));
-						for (quint16 xx = 0; xx < img.size(); xx++)
+						for (int xx = 0; xx < img.size(); xx++)
 						{
 							uchar i = (img[xx] >> 4) & 0x0F;
 							uchar j = img[xx] & 0x0F;
@@ -1623,7 +1623,7 @@
 				else if (component_size == 8)
 				{
 					QRgb *q = (QRgb*)(image.scanLine(rr));
-					for (quint16 xx = 0; xx < pixCols; xx++)
+					for (uint xx = 0; xx < (uint) pixCols; xx++)
 					{
 						uchar r, g, b;
 						uchar a = 255;




More information about the scribus-commit mailing list