diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-02-23 13:51:54 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-02-23 13:52:21 +0100 |
| commit | 2fefaa2852da33e4d4cf33628b76bbe302ecbfdf (patch) | |
| tree | a665c52a18a5a7d42b53230e1c707ea94d928baf /libcdr | |
| parent | 235db83d4c4a18eaa0b183f6ef891e7d2dc12e26 (diff) | |
And silence warnings in libcdr too
Diffstat (limited to 'libcdr')
| -rw-r--r-- | libcdr/libcdr-0.0.3-warning.patch | 31 | ||||
| -rw-r--r-- | libcdr/libcdr-0.0.3.patch | 4 | ||||
| -rw-r--r-- | libcdr/makefile.mk | 3 |
3 files changed, 35 insertions, 3 deletions
diff --git a/libcdr/libcdr-0.0.3-warning.patch b/libcdr/libcdr-0.0.3-warning.patch new file mode 100644 index 000000000000..b98459c2fe9c --- /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 3eda64b4f43b..53bc613f2ff6 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 74a9f8d0a13f..18e73ed1de7d 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 |