diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-09-09 13:57:37 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-09-09 13:58:53 +0200 |
| commit | 392146b6b34ee3712c91a5cde3313eef2e0455c1 (patch) | |
| tree | c09887cb9c00f41217cabc955f5477dc76e8c387 /libvisio | |
| parent | 67d6de5c27fdb277c6e942b4036d46f887cb5f4d (diff) | |
Uploading libvisio-0.0.7
Diffstat (limited to 'libvisio')
| -rw-r--r-- | libvisio/libvisio-0.0.6-crash.patch | 26 | ||||
| -rw-r--r-- | libvisio/libvisio-0.0.7.patch (renamed from libvisio/libvisio-0.0.6.patch) | 6 | ||||
| -rw-r--r-- | libvisio/makefile.mk | 6 |
3 files changed, 6 insertions, 32 deletions
diff --git a/libvisio/libvisio-0.0.6-crash.patch b/libvisio/libvisio-0.0.6-crash.patch deleted file mode 100644 index c1384cb6e7ff..000000000000 --- a/libvisio/libvisio-0.0.6-crash.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- misc/libvisio-0.0.6/src/lib/VSDXContentCollector.cpp 2011-08-31 11:10:40.000000000 +0200 -+++ misc/build/libvisio-0.0.6/src/lib/VSDXContentCollector.cpp 2011-09-03 00:15:39.134916000 +0200 -@@ -893,7 +893,13 @@ - - // Get stencil geometry so as to find stencil NURBS data ID - VSDXGeometryListElement * element = m_stencilShape->m_geometries[m_currentGeometryCount-1].getElement(id); -- dataID = dynamic_cast<VSDXNURBSTo2*>(element)->m_dataID; -+ VSDXNURBSTo2* tmpElement = dynamic_cast<VSDXNURBSTo2*>(element); -+ if (!tmpElement) -+ { -+ _handleLevelChange(level); -+ return; -+ } -+ dataID = tmpElement->m_dataID; - iter = m_stencilShape->m_nurbsData.find(dataID); - } - else // No stencils involved, directly get dataID and fill in missing parts -@@ -903,7 +909,7 @@ - - if (iter != m_NURBSData.end()) - { -- data = iter->second; -+ data = iter->second;; - data.knots.push_back(knot); - data.knots.push_back(data.lastKnot); - data.knots.insert(data.knots.begin(), knotPrev); diff --git a/libvisio/libvisio-0.0.6.patch b/libvisio/libvisio-0.0.7.patch index 0618b5a33194..ade7019ad428 100644 --- a/libvisio/libvisio-0.0.6.patch +++ b/libvisio/libvisio-0.0.7.patch @@ -1,6 +1,6 @@ ---- misc/libvisio-0.0.6/src/lib/libvisio_utils.h -+++ misc/build/libvisio-0.0.6/src/lib/libvisio_utils.h -@@ -31,17 +31,8 @@ +--- misc/libvisio-0.0.7/src/lib/libvisio_utils.h ++++ misc/build/libvisio-0.0.7/src/lib/libvisio_utils.h +@@ -41,17 +41,8 @@ #else diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk index 29ca54b13c24..ba462536179a 100644 --- a/libvisio/makefile.mk +++ b/libvisio/makefile.mk @@ -54,11 +54,11 @@ INCPRE+=$(LIBWPG_CFLAGS) INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg .ENDIF -TARFILE_NAME=libvisio-0.0.6 -TARFILE_MD5=8c50b6c3e4b323013164f4a6d8d74dc6 +TARFILE_NAME=libvisio-0.0.7 +TARFILE_MD5=cfb4259665fa96874deaa1b233d0b9c2 PATCH_FILES=\ - libvisio-0.0.6.patch libvisio-0.0.6-crash.patch + libvisio-0.0.7.patch BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) |