Kaydet (Commit) 737e2061 authored tarafından David Tardon's avatar David Tardon

upload libwps 0.4.1

Change-Id: I53dc6d358952a046a4c1f03246441742dfa3d685
üst dea1d492
...@@ -151,8 +151,8 @@ export WPD_MD5SUM := 0773d79a1f240ef9f4f20242b13c5bb7 ...@@ -151,8 +151,8 @@ export WPD_MD5SUM := 0773d79a1f240ef9f4f20242b13c5bb7
export WPD_TARBALL := libwpd-0.10.0.tar.bz2 export WPD_TARBALL := libwpd-0.10.0.tar.bz2
export WPG_MD5SUM := 17da9770cb8b317b7633f9807b32b71a export WPG_MD5SUM := 17da9770cb8b317b7633f9807b32b71a
export WPG_TARBALL := libwpg-0.3.0.tar.bz2 export WPG_TARBALL := libwpg-0.3.0.tar.bz2
export WPS_MD5SUM := e9162d2566421d9d71b3ad2377a68fd5 export WPS_MD5SUM := b510da17dabf97864f821a71f1fe9025
export WPS_VERSION_MICRO := 0 export WPS_VERSION_MICRO := 1
export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.bz2 export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.bz2
export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
export ZLIB_MD5SUM := 44d667c142d7cda120332623eab69f40 export ZLIB_MD5SUM := 44d667c142d7cda120332623eab69f40
......
From 45a3dd5393e07340d5a63d8a8735789d73a61b17 Mon Sep 17 00:00:00 2001
From: osnola <alonso@loria.fr>
Date: Mon, 18 May 2015 08:27:59 +0200
Subject: [PATCH] QuattroPro parser: correct a mistake when reading negative
cell's position
---
src/lib/QuattroSpreadsheet.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/QuattroSpreadsheet.cpp b/src/lib/QuattroSpreadsheet.cpp
index cb0f4f5..ce5e20a 100644
--- a/src/lib/QuattroSpreadsheet.cpp
+++ b/src/lib/QuattroSpreadsheet.cpp
@@ -1668,7 +1668,7 @@ bool QuattroSpreadsheet::readCell
else
{
val &= 0x3FFF;
- if (val & 0x2000) val = val - 0x4000;
+ if (val>0x1000) val = val - 0x2000;
}
if (dim==2)
val += sheetId;
--
2.3.2 (Apple Git-55)
From 94af34d42129bad72fd7ce50dc6901287509703e Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Mon, 18 May 2015 18:50:25 +0200
Subject: [PATCH] error C2065: M_PI : undeclared identifier
---
src/lib/libwps_internal.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/lib/libwps_internal.h b/src/lib/libwps_internal.h
index fb9016d..02a87bc 100644
--- a/src/lib/libwps_internal.h
+++ b/src/lib/libwps_internal.h
@@ -28,6 +28,7 @@
#include <stdio.h>
#endif
+#include <cmath>
#include <iostream>
#include <map>
#include <string>
@@ -36,6 +37,10 @@
#include <librevenge-stream/librevenge-stream.h>
#include <librevenge/librevenge.h>
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
#if defined(_MSC_VER) || defined(__DJGPP__)
typedef signed char int8_t;
typedef unsigned char uint8_t;
--
2.4.0
...@@ -14,8 +14,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libwps,$(WPS_TARBALL))) ...@@ -14,8 +14,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libwps,$(WPS_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,libwps,1)) $(eval $(call gb_UnpackedTarball_set_patchlevel,libwps,1))
$(eval $(call gb_UnpackedTarball_add_patches,libwps,\ $(eval $(call gb_UnpackedTarball_add_patches,libwps,\
external/libwps/0001-QuattroPro-parser-correct-a-mistake-when-reading-neg.patch \
external/libwps/0001-error-C2065-M_PI-undeclared-identifier.patch \
$(if $(SYSTEM_REVENGE),,external/libwps/rpath.patch.0) \ $(if $(SYSTEM_REVENGE),,external/libwps/rpath.patch.0) \
)) ))
......
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