strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

And silence warnings in libcdr too

Browse source
This commit is contained in:
Fridrich Štrba 2012-02-23 13:51:54 +01:00
parent 235db83d4c
commit 2fefaa2852
3 changed files with 35 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
libcdr/libcdr-0.0.3-warning.patch Normal file
View file

@ -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;

2
libcdr/libcdr-0.0.3.patch
View file

@ -29,6 +29,6 @@
+.ENDIF
+
SLOFILES= \
$(SLO)$/CDRCollector.obj \
$(SLO)$/CDRDocument.obj \
$(SLO)$/CDRInternalStream.obj \

3
libcdr/makefile.mk
View file

@ -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