mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Uploading libcdr-0.0.12: fixing fdo#62538 and fdo#53278

Browse Source 
Change-Id: Ia7121c5e77ac86941fc70e08d1c824a93e842aff
This commit is contained in:
Fridrich Štrba 2013-04-07 22:15:09 +02:00
parent 86f8fba8e7
commit 29339357cf
3 changed files with 2 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
download.lst
View File

@ -1,5 +1,5 @@
CDR_MD5SUM := 107a3d18f637b342684b3c21eb0fcd7d
export CDR_TARBALL := libcdr-0.0.11.tar.bz2
CDR_MD5SUM := 6db2c96a4ae5977da8b84893c1441038
export CDR_TARBALL := libcdr-0.0.12.tar.bz2
MSPUB_MD5SUM := 881c4628ec5f54d47f35d5d19e335662
export MSPUB_TARBALL := libmspub-0.0.5.tar.bz2
MWAW_MD5SUM := 7c08542921466eee797e0be23e9535b3

6
libcdr/UnpackedTarball_cdr.mk
View File

@ -11,10 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cdr))
$(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,cdr,1))
$(eval $(call gb_UnpackedTarball_add_patches,cdr,\
libcdr/libcdr-0.0.11-encoding.patch \
))
# vim: set noet sw=4 ts=4:

36
libcdr/libcdr-0.0.11-encoding.patch
View File

@ -1,36 +0,0 @@
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -2415,7 +2415,8 @@ void libcdr::CDRParser::readStlt(WPXInputStream *input, unsigned length)
}
unsigned numFonts = readU32(input);
CDR_DEBUG_MSG(("CDRParser::readStlt numFonts 0x%x\n", numFonts));
- std::map<unsigned,unsigned> fontIds;
+ std::map<unsigned,unsigned short> fontIds;
+ std::map<unsigned,unsigned short> fontEncodings;
std::map<unsigned,double> fontSizes;
for (i=0; i<numFonts; ++i)
{
@@ -2424,7 +2425,8 @@ void libcdr::CDRParser::readStlt(WPXInputStream *input, unsigned length)
input->seek(12, WPX_SEEK_CUR);
else
input->seek(20, WPX_SEEK_CUR);
- fontIds[fontStyleId] = readU32(input);
+ fontIds[fontStyleId] = readU16(input);
+ fontEncodings[fontStyleId] = readU16(input);
input->seek(8, WPX_SEEK_CUR);
fontSizes[fontStyleId] = readCoordinate(input);
if (m_version < 1000)
@@ -2578,9 +2580,12 @@ void libcdr::CDRParser::readStlt(WPXInputStream *input, unsigned length)
}
if (!fontRecordId)
continue;
- std::map<unsigned, unsigned>::const_iterator iterFontId = fontIds.find(fontRecordId);
+ std::map<unsigned, unsigned short>::const_iterator iterFontId = fontIds.find(fontRecordId);
if (iterFontId != fontIds.end())
tmpCharStyle.m_fontId = iterFontId->second;
+ std::map<unsigned, unsigned short>::const_iterator iterCharSet = fontEncodings.find(fontRecordId);
+ if (iterCharSet != fontEncodings.end())
+ tmpCharStyle.m_charSet = iterCharSet->second;
std::map<unsigned, double>::const_iterator iterFontSize = fontSizes.find(fontRecordId);
if (iterFontSize != fontSizes.end())
tmpCharStyle.m_fontSize = iterFontSize->second;