yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-03 17:59:33 +02:00
Code Issues Releases Wiki Activity

DocPlugin: support for images (also supporting for blocked images in ZLFileImage)

Browse source
This commit is contained in:
Alexander Turkin 2012-07-04 18:03:17 +04:00
parent 0abb1f46a6
commit 401aaba8bf
26 changed files with 1320 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

58
jni/NativeFormats/fbreader/src/formats/doc/OleStreamReader.cpp
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2010 Geometer Plus <contact@geometerplus.com>
* Copyright (C) 2004-2012 Geometer Plus <contact@geometerplus.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -26,6 +26,7 @@
#include "OleMainStream.h"
#include "DocBookReader.h"
#include "OleUtil.h"
#include "DocImageDataReader.h"
#include "OleStreamReader.h"
@ -42,13 +43,14 @@ const ZLUnicodeUtil::Ucs2Char OleStreamReader::WORD_START_FIELD = 0x0013;
const ZLUnicodeUtil::Ucs2Char OleStreamReader::WORD_SEPARATOR_FIELD = 0x0014;
const ZLUnicodeUtil::Ucs2Char OleStreamReader::WORD_END_FIELD = 0x0015;
const ZLUnicodeUtil::Ucs2Char OleStreamReader::WORD_ZERO_WIDTH_UNBREAKABLE_SPACE = 0xfeff;
const ZLUnicodeUtil::Ucs2Char OleStreamReader::PICTURE = 0x0001;
const ZLUnicodeUtil::Ucs2Char OleStreamReader::DRAWN_OBJECT = 0x0008;
//unicode values:
const ZLUnicodeUtil::Ucs2Char OleStreamReader::NULL_SYMBOL = 0x0;
const ZLUnicodeUtil::Ucs2Char OleStreamReader::FILE_SEPARATOR = 0x1c;
const ZLUnicodeUtil::Ucs2Char OleStreamReader::LINE_FEED = 0x000a;
const ZLUnicodeUtil::Ucs2Char OleStreamReader::SOFT_HYPHEN = 0xad;
const ZLUnicodeUtil::Ucs2Char OleStreamReader::START_OF_HEADING = 0x0001;
const ZLUnicodeUtil::Ucs2Char OleStreamReader::SPACE = 0x20;
const ZLUnicodeUtil::Ucs2Char OleStreamReader::SHORT_DEFIS = 0x2D;
const ZLUnicodeUtil::Ucs2Char OleStreamReader::VERTICAL_LINE = 0x7C;
@ -67,6 +69,7 @@ void OleStreamReader::clear() {
myNextStyleInfoIndex = 0;
myNextCharInfoIndex = 0;
myNextBookmarkIndex = 0;
myNextPictureInfoIndex = 0;
}
bool OleStreamReader::readStream(OleMainStream &oleMainStream) {
@ -122,8 +125,8 @@ bool OleStreamReader::readStream(OleMainStream &oleMainStream) {
case WORD_END_FIELD:
handleEndField();
break;
case START_OF_HEADING:
handleStartOfHeading();
case PICTURE:
//pictures handle method is called from processPicture()
break;
default:
handleOtherControlChar(ucs2char);
@ -133,11 +136,11 @@ bool OleStreamReader::readStream(OleMainStream &oleMainStream) {
continue; //skip
} else {
//debug output
//std::string utf8String;
//ZLUnicodeUtil::Ucs2String ucs2String;
//ucs2String.push_back(ucs2char);
//ZLUnicodeUtil::ucs2ToUtf8(utf8String, ucs2String);
//printf("%s", utf8String.c_str());
// std::string utf8String;
// ZLUnicodeUtil::Ucs2String ucs2String;
// ucs2String.push_back(ucs2char);
// ZLUnicodeUtil::ucs2ToUtf8(utf8String, ucs2String);
// printf("%s", utf8String.c_str());
handleChar(ucs2char);
}
@ -152,7 +155,40 @@ bool OleStreamReader::getUcs2Char(OleMainStream &stream, ZLUnicodeUtil::Ucs2Char
return false;
}
}
ucs2char = myBuffer.at(myCurBufferPosition++);
processStyles(stream);
if (ucs2char == PICTURE) {
processPicture(stream);
}
++myCurCharPos;
return true;
}
void OleStreamReader::processPicture(OleMainStream &stream) {
shared_ptr<OleStream> dataStream = stream.dataStream();
if (dataStream.isNull()) {
return;
}
const OleMainStream::PictureInfoList &pictureInfoList = stream.getPictureInfoList();
if (pictureInfoList.empty()) {
return;
}
//seek to curCharPos, because not all entries in PictureInfo are real pictures
while(myNextPictureInfoIndex < pictureInfoList.size() && pictureInfoList.at(myNextPictureInfoIndex).first < myCurCharPos) {
++myNextPictureInfoIndex;
}
while (myNextPictureInfoIndex < pictureInfoList.size() && pictureInfoList.at(myNextPictureInfoIndex).first == myCurCharPos) {
OleMainStream::PictureInfo info = pictureInfoList.at(myNextPictureInfoIndex).second;
DocImageDataReader imageReader(dataStream);
ZLFileImage::Blocks list = imageReader.getImagePieceInfo(info.dataPos);
if (!list.empty()) {
handlePicture(list);
}
++myNextPictureInfoIndex;
}
}
void OleStreamReader::processStyles(OleMainStream &stream) {
const OleMainStream::StyleInfoList &styleInfoList = stream.getStyleInfoList();
if (!styleInfoList.empty()) {
while (myNextStyleInfoIndex < styleInfoList.size() && styleInfoList.at(myNextStyleInfoIndex).first == myCurCharPos) {
@ -179,10 +215,6 @@ bool OleStreamReader::getUcs2Char(OleMainStream &stream, ZLUnicodeUtil::Ucs2Char
++myNextBookmarkIndex;
}
}
ucs2char = myBuffer.at(myCurBufferPosition++);
++myCurCharPos;
return true;
}
bool OleStreamReader::fillBuffer(OleMainStream &stream) {