rpm/libcdr
SHA256
1
0
Fork 0
forked from pool/libcdr
Code Pull Requests Activity

Accepting request 163179 from home:fstrba

Browse Source 
- Update to upstream version 0.0.12
  * rewrite of ellitical arc transforms, fixes a fdo#62538
  * multiple fixes for text encondings
  * added cdr2text and cmx2text tools in order to make string
    encoding debugging easier
- Removed upstreamed patch

OBS-URL: https://build.opensuse.org/request/show/163179
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libcdr?expand=0&rev=9
This commit is contained in:
Tomáš Chvátal 2013-04-08 15:11:29 +00:00 committed by Git OBS Bridge
parent dd9de09622
commit 86bb883e3e
5 changed files with 14 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
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;

3
libcdr-0.0.11.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b238320359f6a919e409b8cbd3faafd9822bbd09863f89aa6af0403ef3f9a2af
size 561868

3
libcdr-0.0.12.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c8699c00ff5c4eddd506c21767463f1c13577ca8c65f69560d488e8df4a7225d
size 565412

10
libcdr.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Apr 8 16:51:21 CEST 2013 - fridrich.strba@suse.com
- Update to upstream version 0.0.12
* rewrite of ellitical arc transforms, fixes a fdo#62538
* multiple fixes for text encondings
* added cdr2text and cmx2text tools in order to make string
encoding debugging easier
- Removed upstreamed patch
-------------------------------------------------------------------
Fri Mar 1 14:24:12 CET 2013 - fridrich.strba@suse.com

4
libcdr.spec
View File

@ -35,11 +35,10 @@ BuildRequires: zlib-devel
Summary: Library for parsing the Corel Draw file format structure
License: LGPL-2.0+ or GPL-2.0+ or MPL-1.1
Group: Productivity/Publishing/Word
Version: 0.0.11
Version: 0.0.12
Release: 0
Url: http://www.freedesktop.org/wiki/Software/libcdr
Source: http://dev-www.libreoffice.org/src/libcdr-%{version}.tar.xz
Patch0: libcdr-0.0.11-encoding.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -92,7 +91,6 @@ Tools to work with documents in Corel Draw file-format.
%prep
%setup -q
%patch0 -p1
%build
%configure --disable-static --docdir=%_docdir/%name