libwpd/UnpackedTarball_wpd.mk | 1 +
libwpd/libwpd-0.9.4-msvc-warning.patch | 24 ++++++++++++++++++++++++
2 files changed, 25 insertions(+)
New commits:
commit fcf415df476c56a7ed4e5fb30e731a263da61e52
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Sep 10 15:24:37 2012 +0200
libwpd: MSVC warning C4310: cast truncates constant value
Change-Id: Ibd6c7299b612d05d4c00ddfe47b51f45e3ae07d8
diff --git a/libwpd/UnpackedTarball_wpd.mk b/libwpd/UnpackedTarball_wpd.mk
index fd5269a..1f42531 100644
--- a/libwpd/UnpackedTarball_wpd.mk
+++ b/libwpd/UnpackedTarball_wpd.mk
@@ -14,6 +14,7 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,wpd,$(WPD_TARBALL)))
$(eval $(call gb_UnpackedTarball_add_patches,wpd,\
libwpd/libwpd-0.9.4.patch \
libwpd/libwpd-0.9.4-warning.patch \
+ libwpd/libwpd-0.9.4-msvc-warning.patch \
))
# libwpd/libwpd-0.9.4-warning.patch: -Werror,-Wunused-private-field
diff --git a/libwpd/libwpd-0.9.4-msvc-warning.patch
b/libwpd/libwpd-0.9.4-msvc-warning.patch
new file mode 100644
index 0000000..ebe29c7
--- /dev/null
+++ b/libwpd/libwpd-0.9.4-msvc-warning.patch
@@ -0,0 +1,24 @@
+MSVC warning C4310: cast truncates constant value
+
+diff -ru foo/UnpackedTarball/wpd/src/lib/WP3PageFormatGroup.cpp
wpd_fix/src/lib/WP3PageFormatGroup.cpp
+--- foo/UnpackedTarball/wpd/src/lib/WP3PageFormatGroup.cpp 2011-10-28
15:37:47.000000000 +0200
++++ foo/UnpackedTarball/wpd_fix/src/lib/WP3PageFormatGroup.cpp 2012-09-10
15:09:06.222400000 +0200
+@@ -56,6 +56,7 @@
+ {
+ // this group can contain different kinds of data, thus we need to read
+ // the contents accordingly
++ uint8_t tmpTmp = 0xff;
+ int8_t tmpTabType = 0;
+ double tmpTabPosition = 0.0;
+ WPXTabStop tmpTabStop = WPXTabStop();
+@@ -93,8 +94,9 @@
+
+ m_isRelative = (readU8(input, encryption) & 0x01);
+
+- while ((tmpTabType = (int8_t)readU8(input, encryption)) !=
(int8_t)0xff)
++ while ((tmpTmp = readU8(input, encryption)) != 0xff)
+ {
++ tmpTabType = (int8_t) tmpTmp;
+ if (input->atEOS())
+ throw FileException();
+ tmpTabPosition = fixedPointToDouble(readU32(input,
encryption, true)) / 72.0;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
