[Libreoffice-commits] libcdr.git: src/lib

[Fridrich Å trba]

 src/lib/CDRParser.cpp |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 3b826892311d703af9eef827e908d8c4e3694b12
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Apr 11 18:21:13 2013 +0200

    Fix version 6 txsm

diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index a7b1108..bb99833 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -2921,11 +2921,15 @@ void libcdr::CDRParser::readTxsm16(WPXInputStream *input)
 
 void libcdr::CDRParser::readTxsm6(WPXInputStream *input)
 {
-  input->seek(0x24, WPX_SEEK_CUR);
+  unsigned fflag1 = readU32(input);
+  input->seek(0x20, WPX_SEEK_CUR);
   unsigned textId = readU32(input);
   input->seek(48, WPX_SEEK_CUR);
   input->seek(4, WPX_SEEK_CUR);
+  if (!fflag1)
+    input->seek(8, WPX_SEEK_CUR);
   unsigned stlId = readU32(input);
+  printf("Fridrich %x\n", stlId);
   unsigned numSt = readU32(input);
   unsigned i = 0;
   std::map<unsigned, CDRCharacterStyle> charStyles;