diff options
author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-04-07 22:15:09 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2013-04-08 08:49:06 +0000 |
commit | 2c20aca4c8554c8b164605d8fb1708d9f87092a2 (patch) | |
tree | 118c67fba957a6e4f98698dbbc0b1f4796e2f06e | |
parent | 8dce96e251f39cf9f18514e90ab48c8b792ca2cf (diff) |
Uploading libcdr-0.0.12: fixing fdo#62538 and fdo#53278
Change-Id: Ia7121c5e77ac86941fc70e08d1c824a93e842aff
(cherry picked from commit 29339357cfba19e80c3687639fe33e847d3e6f93)
Reviewed-on: https://gerrit.libreoffice.org/3269
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
-rw-r--r-- | download.lst | 4 | ||||
-rw-r--r-- | libcdr/UnpackedTarball_cdr.mk | 6 | ||||
-rw-r--r-- | libcdr/libcdr-0.0.11-encoding.patch | 36 |
3 files changed, 2 insertions, 44 deletions
diff --git a/download.lst b/download.lst index 0420af96db11..e0026ddf2b91 100644 --- a/download.lst +++ b/download.lst @@ -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 VISIO_MD5SUM := 92bde158f249b9b27f76f48cc65a0242 diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk index 1c77ebd1ec6b..be1e7d762a87 100644 --- a/libcdr/UnpackedTarball_cdr.mk +++ b/libcdr/UnpackedTarball_cdr.mk @@ -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: diff --git a/libcdr/libcdr-0.0.11-encoding.patch b/libcdr/libcdr-0.0.11-encoding.patch deleted file mode 100644 index 73fa58a1a4c7..000000000000 --- a/libcdr/libcdr-0.0.11-encoding.patch +++ /dev/null @@ -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; |