/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ps.cpp |
---|
92,13 → 92,13 |
QDataStream ts(&f); |
while (!ts.atEnd()) |
{ |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
if (tmp.startsWith("%%BeginICCProfile:")) |
{ |
QByteArray psdata; |
while (!ts.atEnd()) |
{ |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
for (int a = 2; a < tmp.length(); a += 2) |
{ |
bool ok; |
136,7 → 136,7 |
QString tmp; |
while (!ts.atEnd()) |
{ |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
if (tmp.startsWith("%%BeginFont:")) |
{ |
tmp = tmp.remove("%%BeginFont:"); |
221,7 → 221,7 |
ts.device()->seek(startPos); |
while (!ts.atEnd()) |
{ |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
if (tmp.startsWith("%%Creator: ")) |
m_Creator = tmp.remove("%%Creator: "); |
if (tmp.startsWith("%%Pages: ")) |
325,7 → 325,7 |
while (!ts.atEnd()) |
{ |
uint oldPos = ts.device()->pos(); |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
if (!tmp.startsWith("%%+")) |
{ |
ts.device()->seek(oldPos); |
357,7 → 357,7 |
while (!ts.atEnd()) |
{ |
uint oldPos = ts.device()->pos(); |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
if (!tmp.startsWith("%%+")) |
{ |
ts.device()->seek(oldPos); |
379,7 → 379,7 |
{ |
while (!ts.atEnd()) |
{ |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
if ((!tmp.isEmpty()) && (!tmp.startsWith("%"))) |
{ |
psFound = true; |
399,7 → 399,7 |
QByteArray psdata; |
while (!ts.atEnd()) |
{ |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
if (tmp.startsWith("%EndPhotoshop")) |
{ |
QDataStream strPhot( &psdata, QIODevice::ReadOnly); |
440,7 → 440,7 |
QByteArray psdata; |
while (!ts.atEnd()) |
{ |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
for (int a = 2; a < tmp.length(); a += 2) |
{ |
bool ok; |
1208,7 → 1208,7 |
QDataStream ts(&f); |
while (!ts.atEnd()) |
{ |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
if (tmp == m_psCommand) |
{ |
if (m_psDataType == 1) |
1241,7 → 1241,7 |
{ |
while (!ts.atEnd()) |
{ |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
if ((tmp.isEmpty()) || (tmp.startsWith("%%EndBinary"))) |
break; |
if (m_psDataType == 2) |
1339,7 → 1339,7 |
QDataStream ts(&f); |
while (!ts.atEnd()) |
{ |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
if (tmp == m_psCommand) |
{ |
if (m_psDataType == 1) |
1374,7 → 1374,7 |
{ |
while (!ts.atEnd()) |
{ |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
if ((tmp.isEmpty()) || (tmp.startsWith("%%EndBinary"))) |
break; |
if (m_psDataType == 2) |
/trunk/Scribus/scribus/pdflib_core.cpp |
---|
10341,7 → 10341,7 |
QDataStream ts(&f); |
while (!ts.atEnd()) |
{ |
QString tmp = readLinefromDataStream(ts); |
QString tmp = readLineFromDataStream(ts); |
if (tmp.startsWith("%%BoundingBox:")) |
{ |
found = true; |
/trunk/Scribus/scribus/plugins/import/ai/importai.cpp |
---|
793,7 → 793,7 |
QDataStream ts(&f); |
while (!ts.atEnd()) |
{ |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
if (tmp.startsWith("%%BoundingBox:")) |
{ |
found = true; |
880,7 → 880,7 |
while (!ts.atEnd()) |
{ |
quint64 oldPos = ts.device()->pos(); |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
if (!tmp.startsWith("%%+")) |
{ |
ts.device()->seek(oldPos); |
944,7 → 944,7 |
while (!ts.atEnd()) |
{ |
quint64 oldPos = ts.device()->pos(); |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
if (!tmp.startsWith("%%+")) |
{ |
ts.device()->seek(oldPos); |
979,7 → 979,7 |
while (!ts.atEnd()) |
{ |
bool isX = false; |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
if ((tmp.endsWith("Xa") || tmp.endsWith(" k") || tmp.endsWith(" x")) && (tmp.length() > 4)) |
{ |
ScTextStream ts2(&tmp, QIODevice::ReadOnly); |
1002,7 → 1002,7 |
} |
FarNam = QString::fromUtf8(farN.constData()); |
} |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
if (tmp.endsWith("Pc")) |
{ |
if (!isX) |
2719,7 → 2719,7 |
QString tmpData = ""; |
while (!ts.atEnd()) |
{ |
tmp = removeAIPrefix(readLinefromDataStream(ts)); |
tmp = removeAIPrefix(readLineFromDataStream(ts)); |
if (importerFlags & LoadSavePlugin::lfKeepPatterns) |
{ |
if (tmp.startsWith("%_")) |
2833,7 → 2833,7 |
{ |
while (!ts.atEnd()) |
{ |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
if (tmp.contains("EndRaster")) |
break; |
if(progressDialog) |
2870,7 → 2870,7 |
QString tmp; |
while (!ts.atEnd()) |
{ |
tmp = removeAIPrefix(readLinefromDataStream(ts)); |
tmp = removeAIPrefix(readLineFromDataStream(ts)); |
if (!patternMode) |
{ |
int an = tmp.indexOf("("); |
2931,7 → 2931,7 |
{ |
while (!ts.atEnd()) |
{ |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
if (tmp.contains("EndRaster")) |
break; |
if(progressDialog) |
2957,7 → 2957,7 |
QString cumulated = ""; |
while (!ts.atEnd()) |
{ |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
if (tmp.startsWith("%")) |
break; |
tmp.remove("["); |
2986,7 → 2986,7 |
if (tmp.startsWith("%%BeginData")) |
{ |
ScTextStream gVals2(&tmp, QIODevice::ReadOnly); |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
} |
QByteArray psdata; |
psdata.resize(dataSize); |
3012,7 → 3012,7 |
while (!ts.atEnd()) |
{ |
if (first) |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
first = true; |
if (tmp.startsWith("%AI5_EndRaster")) |
break; |
3128,12 → 3128,12 |
{ |
while (!ts.atEnd()) |
{ |
tmp = removeAIPrefix(readLinefromDataStream(ts)); |
tmp = removeAIPrefix(readLineFromDataStream(ts)); |
if (tmp.startsWith("BeginGradient")) |
{ |
while (!ts.atEnd()) |
{ |
tmp = removeAIPrefix(readLinefromDataStream(ts)); |
tmp = removeAIPrefix(readLineFromDataStream(ts)); |
if (tmp.startsWith("EndGradient")) |
break; |
else |
3161,7 → 3161,7 |
{ |
while (!ts.atEnd()) |
{ |
tmp = removeAIPrefix(readLinefromDataStream(ts)); |
tmp = removeAIPrefix(readLineFromDataStream(ts)); |
if (tmp.startsWith("EndGradient")) |
break; |
else |
3177,7 → 3177,7 |
{ |
while (!ts.atEnd()) |
{ |
tmp = removeAIPrefix(readLinefromDataStream(ts)); |
tmp = removeAIPrefix(readLineFromDataStream(ts)); |
if (tmp.startsWith("EndPalette")) |
break; |
if(progressDialog) |
3195,7 → 3195,7 |
while (!ts.atEnd()) |
{ |
processSymbol(ts); |
tmp = removeAIPrefix(readLinefromDataStream(ts)); |
tmp = removeAIPrefix(readLineFromDataStream(ts)); |
if (tmp.startsWith("EndSymbol")) |
break; |
if(progressDialog) |
3209,7 → 3209,7 |
{ |
while (!ts.atEnd()) |
{ |
tmp = removeAIPrefix(readLinefromDataStream(ts)); |
tmp = removeAIPrefix(readLineFromDataStream(ts)); |
if (tmp.startsWith("EndDocumentData")) |
break; |
if(progressDialog) |
3221,10 → 3221,10 |
} |
else if (tmp.startsWith("BeginTextDocument")) |
{ |
tmp = removeAIPrefix(readLinefromDataStream(ts)); |
tmp = removeAIPrefix(readLineFromDataStream(ts)); |
while (!ts.atEnd()) |
{ |
tmp = removeAIPrefix(readLinefromDataStream(ts)); |
tmp = removeAIPrefix(readLineFromDataStream(ts)); |
if (tmp.startsWith("EndTextDocument")) |
{ |
// QByteArray fData; |
3244,7 → 3244,7 |
{ |
while (!ts.atEnd()) |
{ |
tmp = removeAIPrefix(readLinefromDataStream(ts)); |
tmp = removeAIPrefix(readLineFromDataStream(ts)); |
if (tmp.startsWith("%%EndProlog")) |
break; |
if(progressDialog) |
3258,7 → 3258,7 |
{ |
while (!ts.atEnd()) |
{ |
tmp = removeAIPrefix(readLinefromDataStream(ts)); |
tmp = removeAIPrefix(readLineFromDataStream(ts)); |
if (tmp.startsWith("%%EndData")) |
break; |
if(progressDialog) |
3272,7 → 3272,7 |
{ |
while (!ts.atEnd()) |
{ |
tmp = removeAIPrefix(readLinefromDataStream(ts)); |
tmp = removeAIPrefix(readLineFromDataStream(ts)); |
if (tmp.startsWith("%%EndCrops")) |
break; |
if(progressDialog) |
3295,7 → 3295,7 |
{ |
while (!ts.atEnd()) |
{ |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
if (tmp.contains("EndRaster")) |
break; |
if(progressDialog) |
3309,7 → 3309,7 |
{ |
while (!ts.atEnd()) |
{ |
tmp = removeAIPrefix(readLinefromDataStream(ts)); |
tmp = removeAIPrefix(readLineFromDataStream(ts)); |
if (tmp.startsWith("EndSVGFilter")) |
break; |
if(progressDialog) |
3323,7 → 3323,7 |
{ |
while (!ts.atEnd()) |
{ |
tmp = removeAIPrefix(readLinefromDataStream(ts)); |
tmp = removeAIPrefix(readLineFromDataStream(ts)); |
if (tmp.startsWith("EndArtStyles")) |
break; |
if(progressDialog) |
3337,7 → 3337,7 |
{ |
while (!ts.atEnd()) |
{ |
tmp = removeAIPrefix(readLinefromDataStream(ts)); |
tmp = removeAIPrefix(readLineFromDataStream(ts)); |
if (tmp.startsWith("EndPluginObject")) |
break; |
if(progressDialog) |
3351,7 → 3351,7 |
{ |
while (!ts.atEnd()) |
{ |
QString rl = readLinefromDataStream(ts); |
QString rl = readLineFromDataStream(ts); |
tmp = removeAIPrefix(rl); |
if (tmp.startsWith("BeginRaster")) |
{ |
3467,7 → 3467,7 |
QDataStream ts(&f); |
while (!ts.atEnd()) |
{ |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
if (tmp.startsWith("%")) |
processComment(ts, tmp); |
else |
/trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp |
---|
457,16 → 457,16 |
if (f.open(QIODevice::ReadOnly)) |
{ |
QDataStream ts(&f); |
QString version = readLinefromDataStream(ts); |
QString version = readLineFromDataStream(ts); |
if (!version.startsWith("#FIG 3")) |
{ |
f.close(); |
return false; |
} |
QString orientation = readLinefromDataStream(ts); |
QString justification = readLinefromDataStream(ts); |
QString units = readLinefromDataStream(ts); |
QString papersize = readLinefromDataStream(ts); |
QString orientation = readLineFromDataStream(ts); |
QString justification = readLineFromDataStream(ts); |
QString units = readLineFromDataStream(ts); |
QString papersize = readLineFromDataStream(ts); |
PageSize ps(papersize); |
if (orientation.startsWith("Landscape")) |
{ |
799,18 → 799,18 |
Code >> command >> subtype >> line_style >> thickness >> pen_color >> fill_color >> depth >> pen_style; |
Code >> area_fill >> style_val >> join_style >> cap_style >> radius >> forward_arrow >> backward_arrow >> npoints; |
if (forward_arrow == 1) |
fArrowData = readLinefromDataStream(ts); |
fArrowData = readLineFromDataStream(ts); |
if (backward_arrow == 1) |
bArrowData = readLinefromDataStream(ts); |
bArrowData = readLineFromDataStream(ts); |
if (subtype == 5) |
{ |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
ScTextStream imf(&tmp, QIODevice::ReadOnly); |
imf >> imgFlipped >> imgFile; |
} |
while (!ts.atEnd()) |
{ |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
ScTextStream pts(&tmp, QIODevice::ReadOnly); |
while (!pts.atEnd()) |
{ |
937,12 → 937,12 |
Code >> command >> subtype >> line_style >> thickness >> pen_color >> fill_color >> depth >> pen_style; |
Code >> area_fill >> style_val >> cap_style >> forward_arrow >> backward_arrow >> npoints; |
if (forward_arrow == 1) |
fArrowData = readLinefromDataStream(ts); |
fArrowData = readLineFromDataStream(ts); |
if (backward_arrow == 1) |
bArrowData = readLinefromDataStream(ts); |
bArrowData = readLineFromDataStream(ts); |
while (!ts.atEnd()) |
{ |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
ScTextStream pts(&tmp, QIODevice::ReadOnly); |
while (!pts.atEnd()) |
{ |
968,7 → 968,7 |
pointsRead = 0; |
while (!ts.atEnd()) |
{ |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
ScTextStream pts(&tmp, QIODevice::ReadOnly); |
while (!pts.atEnd()) |
{ |
1050,9 → 1050,9 |
Code >> area_fill >> style_val >> cap_style >> direction >> forward_arrow >> backward_arrow; |
Code >> center_x >> center_y >> x1 >> y1 >> x2 >> y2 >> x3 >> y3; |
if (forward_arrow == 1) |
fArrowData = readLinefromDataStream(ts); |
fArrowData = readLineFromDataStream(ts); |
if (backward_arrow == 1) |
bArrowData = readLinefromDataStream(ts); |
bArrowData = readLineFromDataStream(ts); |
useColor(pen_color, 0, false); |
useColor(fill_color, area_fill, true); |
LineW = thickness / 80.0 * 72.0; |
1632,21 → 1632,21 |
qApp->processEvents(); |
} |
QDataStream ts(&f); |
QString version = readLinefromDataStream(ts); |
QString orientation = readLinefromDataStream(ts); |
QString justification = readLinefromDataStream(ts); |
QString units = readLinefromDataStream(ts); |
QString papersize = readLinefromDataStream(ts); |
QString magnification = readLinefromDataStream(ts); |
QString multiple = readLinefromDataStream(ts); |
QString transparent = readLinefromDataStream(ts); |
tmp = readLinefromDataStream(ts); |
QString version = readLineFromDataStream(ts); |
QString orientation = readLineFromDataStream(ts); |
QString justification = readLineFromDataStream(ts); |
QString units = readLineFromDataStream(ts); |
QString papersize = readLineFromDataStream(ts); |
QString magnification = readLineFromDataStream(ts); |
QString multiple = readLineFromDataStream(ts); |
QString transparent = readLineFromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
if (tmp.startsWith("#")) |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
QString resolution = tmp; |
while (!ts.atEnd()) |
{ |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
if (tmp.startsWith("#")) |
continue; |
processData(ts, tmp); |
/trunk/Scribus/scribus/util.cpp |
---|
780,7 → 780,7 |
} |
QString readLinefromDataStream(QDataStream &s) |
QString readLineFromDataStream(QDataStream &s) |
{ |
QString ret; |
uchar charData; |
/trunk/Scribus/scribus/util.h |
---|
134,7 → 134,7 |
const QString SCRIBUS_API numberToLetterSequence(const QString& letters, uint num); |
void SCRIBUS_API parsePagesString(QString pages, std::vector<int>* pageNs, int sourcePageCount); |
QString SCRIBUS_API readLinefromDataStream(QDataStream &s); |
QString SCRIBUS_API readLineFromDataStream(QDataStream &s); |
void SCRIBUS_API setCurrentComboItem(QComboBox *box, QString text); |
void SCRIBUS_API setCurrentComboItemFromData(QComboBox *box, QString data); |
void SCRIBUS_API removeComboItem(QComboBox *box, QString text); |
/trunk/Scribus/scribus/util_color.cpp |
---|
641,7 → 641,7 |
QDataStream ts(&f); |
while (!ts.atEnd()) |
{ |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
if ((tmp.startsWith("%%CMYKCustomColor")) || (tmp.startsWith("%%CMYKProcessColor"))) |
{ |
if (tmp.contains("(atend)")) |
666,7 → 666,7 |
while (!ts.atEnd()) |
{ |
quint64 oldPos = ts.device()->pos(); |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
if (!tmp.startsWith("%%+")) |
{ |
ts.device()->seek(oldPos); |
710,7 → 710,7 |
while (!ts.atEnd()) |
{ |
quint64 oldPos = ts.device()->pos(); |
tmp = readLinefromDataStream(ts); |
tmp = readLineFromDataStream(ts); |
if (!tmp.startsWith("%%+")) |
{ |
ts.device()->seek(oldPos); |