[Libreoffice-commits] libvisio.git: 2 commits - configure.ac src/lib

[Fridrich Å trba]

 configure.ac          |    2 +-
 src/lib/VSDParser.cpp |    6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 77c46cef14432470474286bb78c59293920371a7
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Jun 5 09:55:43 2013 +0200

    Bump version to 0.0.28

diff --git a/configure.ac b/configure.ac
index e099c31..4cf1ac2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ([2.65])
 # ====================
 m4_define([libvisio_version_major],[0])
 m4_define([libvisio_version_minor],[0])
-m4_define([libvisio_version_micro],[27])
+m4_define([libvisio_version_micro],[28])
 m4_define([libvisio_version],[libvisio_version_major.libvisio_version_minor.libvisio_version_micro])
 
 # =============
commit f1a708859df39367d296a81495e0d4c6f64c1ddb
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Jun 5 09:54:27 2013 +0200

    Revert "avoid access to uninit. memory"
    
    This caused no geometry to be ever inserted to a shape.
    
    This reverts commit 62a1abdadcba61f9a0d0daf38c442f0cd86c8718.

diff --git a/src/lib/VSDParser.cpp b/src/lib/VSDParser.cpp
index 1b65ac8..9fdb8be 100644
--- a/src/lib/VSDParser.cpp
+++ b/src/lib/VSDParser.cpp
@@ -845,12 +845,8 @@ void libvisio::VSDParser::readTextBlock(WPXInputStream *input)
 void libvisio::VSDParser::readGeomList(WPXInputStream *input)
 {
   if (!m_shape.m_geometries.empty() && m_currentGeometryList->empty())
-  {
     m_shape.m_geometries.erase(--m_currentGeomListCount);
-    m_currentGeometryList = 0;
-  }
-  if (!m_shape.m_geometries.empty()) // broken file?
-    m_currentGeometryList = &m_shape.m_geometries[m_currentGeomListCount++];
+  m_currentGeometryList = &m_shape.m_geometries[m_currentGeomListCount++];
 
   if (m_header.trailer)
   {