Kaydet (Commit) 3f723b36 authored tarafından Fridrich Štrba's avatar Fridrich Štrba

Uploading the libvisio 0.0.17 release

Change-Id: Ib517cec1709e331f60aca4f0d6968da41d14b228
üst 6a491cbe
--- misc/build/libvisio-0.0.16/src/lib/VSDXContentCollector.cpp 2012-04-14 17:29:03.000000000 +0200
+++ misc/libvisio-0.0.16/src/lib/VSDXContentCollector.cpp 2012-05-23 22:30:44.542099908 +0200
@@ -1470,7 +1470,8 @@
/* NURBS with incomplete data */
void libvisio::VSDXContentCollector::collectNURBSTo(unsigned id, unsigned level, double x2, double y2, double knot, double knotPrev, double weight, double weightPrev, unsigned dataID)
{
- std::map<unsigned, NURBSData>::const_iterator iter;
+ std::map<unsigned, NURBSData>::const_iterator iter;
+ std::map<unsigned, NURBSData>::const_iterator iterEnd;
NURBSData data;
if (dataID == 0xFFFFFFFE) // Use stencil NURBS data
{
@@ -1490,13 +1491,15 @@
}
dataID = tmpElement->m_dataID;
iter = m_stencilShape->m_nurbsData.find(dataID);
+ iterEnd = m_stencilShape->m_nurbsData.end();
}
else // No stencils involved, directly get dataID and fill in missing parts
{
iter = m_NURBSData.find(dataID);
+ iterEnd = m_NURBSData.end();
}
- if (iter != m_NURBSData.end())
+ if (iter != iterEnd)
{
data = iter->second;
data.knots.push_back(knot);
--- misc/libvisio-0.0.16/src/lib/VisioDocument.cpp 2012-04-13 10:54:19.000000000 +0200
+++ misc/build/libvisio-0.0.16/src/lib/VisioDocument.cpp 2012-05-16 15:16:08.974375389 +0200
@@ -45,10 +45,13 @@
*/
bool libvisio::VisioDocument::isSupported(WPXInputStream *input)
{
+ WPXInputStream *tmpDocStream = 0;
+ try
+ {
input->seek(0, WPX_SEEK_SET);
if (!input->isOLEStream())
return false;
- WPXInputStream *tmpDocStream = input->getDocumentOLEStream("VisioDocument");
+ tmpDocStream = input->getDocumentOLEStream("VisioDocument");
if (!tmpDocStream)
return false;
@@ -64,6 +67,13 @@
{
return true;
}
+ }
+ catch (...)
+ {
+ if (tmpDocStream)
+ delete tmpDocStream;
+ return false;
+ }
return false;
}
--- misc/libvisio-0.0.16/src/lib/libvisio_utils.h
+++ misc/build/libvisio-0.0.16/src/lib/libvisio_utils.h
@@ -42,17 +42,8 @@
#else
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_STDINT_H
#include <stdint.h>
-#endif
-
-#ifdef HAVE_INTTYPES_H
#include <inttypes.h>
-#endif
#endif
......@@ -54,13 +54,8 @@ INCPRE+=$(WPG_CFLAGS)
INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg
.ENDIF
TARFILE_NAME=libvisio-0.0.16
TARFILE_MD5=2fa6028324347860e684e75310818d43
PATCH_FILES=\
$(TARFILE_NAME)-nothrow.patch \
$(TARFILE_NAME)-fdo50178.patch \
$(TARFILE_NAME).patch
TARFILE_NAME=libvisio-0.0.17
TARFILE_MD5=90010e213dd25648e70f0cc12f8fed55
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
......
......@@ -87,7 +87,7 @@ d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2
f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz
2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2
90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2
e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
c216ded0275129ccfef44fbc236ac16a-libcdr-0.0.7.tar.bz2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment