mirror of
https://invent.kde.org/graphics/okular
synced 2024-10-12 19:02:40 +00:00
Tweaks to enable the code to compile with MSVC 2003.Net.
svn path=/trunk/KDE/kdegraphics/kviewshell/plugins/dvi/; revision=496078
This commit is contained in:
parent
4c5fc9311e
commit
dd6007dfa4
19
dviFile.cpp
19
dviFile.cpp
|
@ -244,22 +244,21 @@ void dvifile::prepare_pages()
|
|||
for(int i=0; i<=total_pages; i++)
|
||||
page_offset[i] = 0;
|
||||
|
||||
|
||||
page_offset[total_pages] = beginning_of_postamble;
|
||||
quint16 i = total_pages-1;
|
||||
page_offset[i] = last_page_offset;
|
||||
page_offset[int(total_pages)] = beginning_of_postamble;
|
||||
int j = total_pages-1;
|
||||
page_offset[j] = last_page_offset;
|
||||
|
||||
// Follow back pointers through pages in the DVI file, storing the
|
||||
// offsets in the page_offset table.
|
||||
while (i > 0) {
|
||||
command_pointer = dvi_Data() + page_offset[i--];
|
||||
while (j > 0) {
|
||||
command_pointer = dvi_Data() + page_offset[j--];
|
||||
if (readUINT8() != BOP) {
|
||||
errorMsg = i18n("The page %1 does not start with the BOP command.").arg(i+1);
|
||||
errorMsg = i18n("The page %1 does not start with the BOP command.").arg(j+1);
|
||||
return;
|
||||
}
|
||||
command_pointer += 10 * 4;
|
||||
page_offset[i] = readUINT32();
|
||||
if ((dvi_Data()+page_offset[i] < dvi_Data())||(dvi_Data()+page_offset[i] > dvi_Data()+size_of_file))
|
||||
page_offset[j] = readUINT32();
|
||||
if ((dvi_Data()+page_offset[j] < dvi_Data())||(dvi_Data()+page_offset[j] > dvi_Data()+size_of_file))
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -341,7 +340,7 @@ void dvifile::renumber()
|
|||
bool bigEndian;
|
||||
qSysInfo (&wordSize, &bigEndian);
|
||||
|
||||
for(quint32 i=1; i<=total_pages; i++) {
|
||||
for(int i=1; i<=total_pages; i++) {
|
||||
quint8 *ptr = dviData.data() + page_offset[i-1]+1;
|
||||
quint8 *num = (quint8 *)&i;
|
||||
for(quint8 j=0; j<4; j++)
|
||||
|
|
|
@ -297,8 +297,8 @@ void dviRenderer::embedPostScript()
|
|||
errorMsg = QString::null;
|
||||
for(current_page=0; current_page < dviFile->total_pages; current_page++) {
|
||||
if (current_page < dviFile->total_pages) {
|
||||
command_pointer = dviFile->dvi_Data() + dviFile->page_offset[current_page];
|
||||
end_pointer = dviFile->dvi_Data() + dviFile->page_offset[current_page+1];
|
||||
command_pointer = dviFile->dvi_Data() + dviFile->page_offset[int(current_page)];
|
||||
end_pointer = dviFile->dvi_Data() + dviFile->page_offset[int(current_page+1)];
|
||||
} else
|
||||
command_pointer = end_pointer = 0;
|
||||
|
||||
|
@ -332,8 +332,8 @@ void dviRenderer::embedPostScript()
|
|||
PostScriptOutPutString = new QString();
|
||||
|
||||
if (current_page < dviFile->total_pages) {
|
||||
command_pointer = dviFile->dvi_Data() + dviFile->page_offset[current_page];
|
||||
end_pointer = dviFile->dvi_Data() + dviFile->page_offset[current_page+1];
|
||||
command_pointer = dviFile->dvi_Data() + dviFile->page_offset[int(current_page)];
|
||||
end_pointer = dviFile->dvi_Data() + dviFile->page_offset[int(current_page+1)];
|
||||
} else
|
||||
command_pointer = end_pointer = 0;
|
||||
|
||||
|
@ -506,8 +506,8 @@ bool dviRenderer::setFile(const QString &fname, const KURL &base)
|
|||
PostScriptOutPutString = new QString();
|
||||
|
||||
if (current_page < dviFile->total_pages) {
|
||||
command_pointer = dviFile->dvi_Data() + dviFile->page_offset[current_page];
|
||||
end_pointer = dviFile->dvi_Data() + dviFile->page_offset[current_page+1];
|
||||
command_pointer = dviFile->dvi_Data() + dviFile->page_offset[int(current_page)];
|
||||
end_pointer = dviFile->dvi_Data() + dviFile->page_offset[int(current_page+1)];
|
||||
} else
|
||||
command_pointer = end_pointer = 0;
|
||||
|
||||
|
|
|
@ -631,8 +631,8 @@ void dviRenderer::draw_page()
|
|||
if (dviFile->page_offset.isEmpty() == true)
|
||||
return;
|
||||
if (current_page < dviFile->total_pages) {
|
||||
command_pointer = dviFile->dvi_Data() + dviFile->page_offset[current_page];
|
||||
end_pointer = dviFile->dvi_Data() + dviFile->page_offset[current_page+1];
|
||||
command_pointer = dviFile->dvi_Data() + dviFile->page_offset[int(current_page)];
|
||||
end_pointer = dviFile->dvi_Data() + dviFile->page_offset[int(current_page+1)];
|
||||
} else
|
||||
command_pointer = end_pointer = 0;
|
||||
|
||||
|
|
|
@ -94,8 +94,8 @@ void dviRenderer::prescan_embedPS(char *cp, quint8 *beginningOfSpecialCommand)
|
|||
if (!QFile::exists(EPSfilename)) {
|
||||
// Find the number of the page
|
||||
quint32 currentOffset = beginningOfSpecialCommand - dviFile->dvi_Data();
|
||||
quint16 page;
|
||||
for(page=0; page < dviFile->total_pages; page++)
|
||||
int page=0;
|
||||
for(; page < dviFile->total_pages; page++)
|
||||
if ((dviFile->page_offset[page] <= currentOffset) && (currentOffset <= dviFile->page_offset[page+1]))
|
||||
break;
|
||||
if (is_pdf_file)
|
||||
|
@ -176,7 +176,7 @@ void dviRenderer::prescan_embedPS(char *cp, quint8 *beginningOfSpecialCommand)
|
|||
dviFile->size_of_file = dviFile->size_of_file + lengthOfNewSpecial-lengthOfOldSpecial;
|
||||
end_pointer = newDVI.data() + dviFile->size_of_file;
|
||||
quint32 currentOffset = beginningOfSpecialCommand-dviFile->dvi_Data();
|
||||
for(quint16 i=0; i < dviFile->total_pages; i++) {
|
||||
for(int i=0; i < dviFile->total_pages; i++) {
|
||||
if (dviFile->page_offset[i] > currentOffset) {
|
||||
dviFile->page_offset[i] = dviFile->page_offset[i] + lengthOfNewSpecial-lengthOfOldSpecial;
|
||||
command_pointer = dviFile->page_offset[i] + newDVI.data() + 4*10 + 1;
|
||||
|
@ -189,9 +189,8 @@ void dviRenderer::prescan_embedPS(char *cp, quint8 *beginningOfSpecialCommand)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
dviFile->beginning_of_postamble = dviFile->beginning_of_postamble + lengthOfNewSpecial - lengthOfOldSpecial;
|
||||
dviFile->page_offset[dviFile->total_pages] = dviFile->beginning_of_postamble;
|
||||
dviFile->page_offset[int(dviFile->total_pages)] = dviFile->beginning_of_postamble;
|
||||
|
||||
command_pointer = newDVI.data() + dviFile->beginning_of_postamble + 1;
|
||||
quint32 a = readUINT32();
|
||||
|
|
Loading…
Reference in a new issue