[Libreoffice-commits] .: libcdr/libcdr-0.0.3.patch libcdr/libcdr-0.0.3-warning.patch libcdr/makefile.mk

[Fridrich Strba]

 libcdr/libcdr-0.0.3-warning.patch |   31 +++++++++++++++++++++++++++++++
 libcdr/libcdr-0.0.3.patch         |    4 ++--
 libcdr/makefile.mk                |    3 ++-
 3 files changed, 35 insertions(+), 3 deletions(-)

New commits:
commit 2fefaa2852da33e4d4cf33628b76bbe302ecbfdf
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Feb 23 13:51:54 2012 +0100

    And silence warnings in libcdr too

diff --git a/libcdr/libcdr-0.0.3-warning.patch b/libcdr/libcdr-0.0.3-warning.patch
new file mode 100644
index 0000000..b98459c
--- /dev/null
+++ b/libcdr/libcdr-0.0.3-warning.patch
@@ -0,0 +1,31 @@
+--- misc/libcdr-0.0.3/src/lib/CDRParser.cpp	2012-02-23 07:42:39.000000000 +0100
++++ misc/build/libcdr-0.0.3/src/lib/CDRParser.cpp	2012-02-23 13:44:27.970033236 +0100
+@@ -215,7 +215,7 @@
+   else if (fourCC == "mcfg")
+     readMcfg(input);
+   else if (fourCC == "bmp ")
+-    readBmp(input, length);
++    readBmp(input);
+   input->seek(recordStart + length, WPX_SEEK_CUR);
+ }
+ 
+@@ -770,7 +770,7 @@
+   m_collector->collectPolygonTransform(numAngles, nextPoint, rx, ry, cx, cy);
+ }
+ 
+-void libcdr::CDRParser::readBmp(WPXInputStream *input, unsigned length)
++void libcdr::CDRParser::readBmp(WPXInputStream *input)
+ {
+   unsigned imageId = readU32(input);
+   input->seek(50, WPX_SEEK_CUR);
+--- misc/libcdr-0.0.3/src/lib/CDRParser.h	2012-02-09 08:36:51.000000000 +0100
++++ misc/build/libcdr-0.0.3/src/lib/CDRParser.h	2012-02-23 13:45:50.667974573 +0100
+@@ -70,7 +70,7 @@
+   void readPath(WPXInputStream *input);
+   void readPolygonCoords(WPXInputStream *input);
+   void readPolygonTransform(WPXInputStream *input);
+-  void readBmp(WPXInputStream *input, unsigned length);
++  void readBmp(WPXInputStream *input);
+ 
+   WPXInputStream *m_input;
+   CDRCollector *m_collector;
diff --git a/libcdr/libcdr-0.0.3.patch b/libcdr/libcdr-0.0.3.patch
index 3eda64b..53bc613 100644
--- a/libcdr/libcdr-0.0.3.patch
+++ b/libcdr/libcdr-0.0.3.patch
@@ -29,6 +29,6 @@
 +.ENDIF
 +
  SLOFILES= \
-         $(SLO)$/CDRDocument.obj \
- 		$(SLO)$/CDRInternalStream.obj \
+     $(SLO)$/CDRCollector.obj \
+     $(SLO)$/CDRDocument.obj \
 
diff --git a/libcdr/makefile.mk b/libcdr/makefile.mk
index 74a9f8d..18e73ed 100644
--- a/libcdr/makefile.mk
+++ b/libcdr/makefile.mk
@@ -58,7 +58,8 @@ TARFILE_NAME=libcdr-0.0.3
 TARFILE_MD5=e5f1ef00a113d2edfd88af616934f293
 
 PATCH_FILES=\
-    libcdr-0.0.3.patch
+    $(TARFILE_NAME).patch \
+    $(TARFILE_NAME)-warning.patch
 
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 BUILD_DIR=src$/lib