summaryrefslogtreecommitdiff
path: root/libwps
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2011-05-03 15:04:24 +0200
committerFridrich Štrba <fridrich.strba@bluewin.ch>2011-05-03 15:05:55 +0200
commit892ce4dc42a967e945b554c3b9e0fc2afe429406 (patch)
treeb990d6ef0cc663441189d6a95706f517cf958bf1 /libwps
parent1457ace0d08188ab9151152902ae65627793a2c4 (diff)
Fix Windows build and silence some warnings
Diffstat (limited to 'libwps')
-rw-r--r--libwps/libwps-0.2.1-warnings.patch60
-rw-r--r--libwps/libwps-0.2.1.patch28
-rw-r--r--libwps/makefile.mk2
3 files changed, 90 insertions, 0 deletions
diff --git a/libwps/libwps-0.2.1-warnings.patch b/libwps/libwps-0.2.1-warnings.patch
new file mode 100644
index 000000000000..fffffd52ee80
--- /dev/null
+++ b/libwps/libwps-0.2.1-warnings.patch
@@ -0,0 +1,60 @@
+--- misc/libwps-0.2.1/src/lib/WPS8.cpp 2011-04-05 11:25:15.000000000 +0200
++++ misc/build/libwps-0.2.1/src/lib/WPS8.cpp 2011-05-03 15:02:21.107349347 +0200
+@@ -136,7 +136,7 @@
+ input->seek(pos->second.offset, WPX_SEEK_SET);
+ n_streams = readU32(input);
+
+- if (n_streams > 100) WPS_DEBUG_MSG(("Probably garbled STRS: count = %u\n",n_streams));
++ if (n_streams > 100) { WPS_DEBUG_MSG(("Probably garbled STRS: count = %u\n",n_streams)); }
+
+ /* skip mysterious header*/
+ input->seek(8, WPX_SEEK_CUR);
+@@ -155,7 +155,7 @@
+ last_pos += offset;
+ }
+ offset = readU32(input);
+- if (offset) WPS_DEBUG_MSG(("Offset table is not 0-terminated!\n"));
++ if (offset) { WPS_DEBUG_MSG(("Offset table is not 0-terminated!\n")); }
+
+ for (unsigned i=0; i < n_streams; i++) {
+ uint16_t len;
+@@ -325,7 +325,7 @@
+ *
+ */
+
+-void WPS8Parser::readText(WPXInputStream * input, WPS8ContentListener *listener)
++void WPS8Parser::readText(WPXInputStream * /* input */, WPS8ContentListener * /* listener */)
+ {
+ #if (0)
+ WPS_DEBUG_MSG(("WPS8Parser::readText()\n"));
+@@ -1356,7 +1356,7 @@
+ id += 4;
+ t_rem -= 4;
+
+- if (t_count < 0 && t_count > 20) break; /* obviously wrong */
++ if (t_count > 20) break; /* obviously wrong */
+ } else break; /* wrong format */
+ }
+
+--- misc/libwps-0.2.1/src/lib/WPSContentListener.cpp 2011-04-04 21:56:29.000000000 +0200
++++ misc/build/libwps-0.2.1/src/lib/WPSContentListener.cpp 2011-05-03 15:02:21.837414573 +0200
+@@ -621,7 +621,7 @@
+ _closeParagraph();
+ }
+
+-const uint16_t WPSContentListener::getSpec() const
++uint16_t WPSContentListener::getSpec() const
+ {
+ return m_ps->m_spec;
+ }
+--- misc/libwps-0.2.1/src/lib/WPSContentListener.h 2011-04-04 21:30:56.000000000 +0200
++++ misc/build/libwps-0.2.1/src/lib/WPSContentListener.h 2011-05-03 15:02:23.334548336 +0200
+@@ -154,7 +154,7 @@
+
+ void insertEOL();
+
+- const uint16_t getSpec() const;
++ uint16_t getSpec() const;
+ protected:
+ WPSContentListener(std::list<WPSPageSpan> &pageList, WPXDocumentInterface *documentInterface);
+ virtual ~WPSContentListener();
diff --git a/libwps/libwps-0.2.1.patch b/libwps/libwps-0.2.1.patch
new file mode 100644
index 000000000000..a70812dd568a
--- /dev/null
+++ b/libwps/libwps-0.2.1.patch
@@ -0,0 +1,28 @@
+--- misc/libwps-0.2.1/src/lib/libwps_internal.cpp 2011-04-04 21:53:42.000000000 +0200
++++ misc/build/libwps-0.2.1/src/lib/libwps_internal.cpp 2011-05-03 14:50:56.146147538 +0200
+@@ -79,18 +79,15 @@
+ {0x419,"ru-RU"}
+ };
+
+-static int _ltcomp(const void *k1, const void *k2)
+-{
+- int r = (int)((ssize_t)k1) - ((_lange*)k2)->id;
+- return r;
+-}
+-
+ std::string getLangFromLCID(uint32_t lcid)
+ {
+- _lange *c = (_lange*) bsearch((const void*)lcid,s_lang_table,
+- sizeof(s_lang_table)/sizeof(_lange),
+- sizeof(_lange),_ltcomp);
+- if (c) return c->name;
++ unsigned i = 0;
++
++ for (i=0; i < sizeof(s_lang_table)/sizeof(s_lang_table[0]); i++)
++ {
++ if (s_lang_table[i].id == lcid)
++ return s_lang_table[i].name;
++ }
+ return "-none-";
+ }
+
diff --git a/libwps/makefile.mk b/libwps/makefile.mk
index 7d0ec2db727c..edb36cd08f5b 100644
--- a/libwps/makefile.mk
+++ b/libwps/makefile.mk
@@ -54,6 +54,8 @@ TARFILE_MD5=83d4029aebf290c0a9a8fee9c99638d3
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src/lib
+PATCH_FILES=libwps-0.2.1.patch libwps-0.2.1-warnings.patch
+
# --- Targets ------------------------------------------------------
.INCLUDE : set_ext.mk