From 3a678a9fb1702783d652cf8e2041350bad0543d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Mon, 11 Jun 2012 14:29:00 +0200 Subject: [PATCH] Uploading a new version of libcdr with initial text support Change-Id: I616d284bb300c803d29786e50bb019fa3f2dff19 --- libcdr/libcdr-0.0.7-clang.patch | 112 -------------------------------- libcdr/libcdr-0.0.7.patch | 20 ------ libcdr/makefile.mk | 8 +-- ooo.lst.in | 2 +- 4 files changed, 3 insertions(+), 139 deletions(-) delete mode 100644 libcdr/libcdr-0.0.7-clang.patch delete mode 100644 libcdr/libcdr-0.0.7.patch diff --git a/libcdr/libcdr-0.0.7-clang.patch b/libcdr/libcdr-0.0.7-clang.patch deleted file mode 100644 index fd5e163cd549..000000000000 --- a/libcdr/libcdr-0.0.7-clang.patch +++ /dev/null @@ -1,112 +0,0 @@ ---- misc/libcdr-0.0.7/src/lib/CDRCollector.cpp 2012-04-24 13:25:22.000000000 +0200 -+++ misc/build/libcdr-0.0.7/src/lib/CDRCollector.cpp 2012-04-24 16:54:16.083829620 +0200 -@@ -30,6 +30,7 @@ - #include - #include - #include "CDRCollector.h" -+#include "libcdr_utils.h" - - libcdr::CDRParserState::CDRParserState() - : m_fillStyles(), m_lineStyles(), m_bmps(), m_patterns(), m_vects(), m_pages(), ---- misc/libcdr-0.0.7/src/lib/CDRCollector.h 2012-04-24 13:12:28.000000000 +0200 -+++ misc/build/libcdr-0.0.7/src/lib/CDRCollector.h 2012-04-24 16:54:16.084829635 +0200 -@@ -42,32 +42,7 @@ - - namespace - { --int cdr_round(double d) --{ -- return (d>0) ? int(d+0.5) : int(d-0.5); --} -- --void writeU16(WPXBinaryData &buffer, const int value) --{ -- buffer.append((unsigned char)(value & 0xFF)); -- buffer.append((unsigned char)((value >> 8) & 0xFF)); --} -- --void writeU32(WPXBinaryData &buffer, const int value) --{ -- buffer.append((unsigned char)(value & 0xFF)); -- buffer.append((unsigned char)((value >> 8) & 0xFF)); -- buffer.append((unsigned char)((value >> 16) & 0xFF)); -- buffer.append((unsigned char)((value >> 24) & 0xFF)); --} -- --void writeU8(WPXBinaryData &buffer, const int value) --{ -- buffer.append((unsigned char)(value & 0xFF)); --} -- - #include "CDRColorProfiles.h" -- - } - - namespace libcdr ---- misc/libcdr-0.0.7/src/lib/CDRParser.cpp 2012-04-24 15:40:42.000000000 +0200 -+++ misc/build/libcdr-0.0.7/src/lib/CDRParser.cpp 2012-04-24 16:54:16.084829635 +0200 -@@ -466,7 +466,7 @@ - m_collector->collectObject(level); - else if (listType == FOURCC_grp) - m_collector->collectGroup(level); -- else if ((listType & 0xffffff) == FOURCC_CDR || (listType && 0xffffff) == FOURCC_cdr) -+ else if ((listType & 0xffffff) == FOURCC_CDR || (listType & 0xffffff) == FOURCC_cdr) - m_version = getCDRVersion((listType & 0xff000000) >> 24); - else if (listType == FOURCC_vect) - m_collector->collectVect(level); ---- misc/libcdr-0.0.7/src/lib/libcdr_utils.cpp 2012-04-24 13:11:13.000000000 +0200 -+++ misc/build/libcdr-0.0.7/src/lib/libcdr_utils.cpp 2012-04-24 16:54:16.085829649 +0200 -@@ -139,6 +139,30 @@ - return ((double)fixedPointNumberIntegerPart + fixedPointNumberFractionalPart); - } - -+int libcdr::cdr_round(double d) -+{ -+ return (d>0) ? int(d+0.5) : int(d-0.5); -+} -+ -+void libcdr::writeU16(WPXBinaryData &buffer, const int value) -+{ -+ buffer.append((unsigned char)(value & 0xFF)); -+ buffer.append((unsigned char)((value >> 8) & 0xFF)); -+} -+ -+void libcdr::writeU32(WPXBinaryData &buffer, const int value) -+{ -+ buffer.append((unsigned char)(value & 0xFF)); -+ buffer.append((unsigned char)((value >> 8) & 0xFF)); -+ buffer.append((unsigned char)((value >> 16) & 0xFF)); -+ buffer.append((unsigned char)((value >> 24) & 0xFF)); -+} -+ -+void libcdr::writeU8(WPXBinaryData &buffer, const int value) -+{ -+ buffer.append((unsigned char)(value & 0xFF)); -+} -+ - #ifdef DEBUG - const char *libcdr::toFourCC(unsigned value, bool bigEndian) - { ---- misc/libcdr-0.0.7/src/lib/libcdr_utils.h 2012-04-24 16:54:56.803806935 +0200 -+++ misc/build/libcdr-0.0.7/src/lib/libcdr_utils.h 2012-04-24 16:54:16.085829649 +0200 -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - - #ifndef M_PI - #define M_PI 3.14159265358979323846 -@@ -90,6 +91,12 @@ - - double readFixedPoint(WPXInputStream *input, bool bigEndian=false); - -+int cdr_round(double d); -+ -+void writeU8(WPXBinaryData &buffer, const int value); -+void writeU16(WPXBinaryData &buffer, const int value); -+void writeU32(WPXBinaryData &buffer, const int value); -+ - #ifdef DEBUG - const char *toFourCC(unsigned value, bool bigEndian=false); - #endif diff --git a/libcdr/libcdr-0.0.7.patch b/libcdr/libcdr-0.0.7.patch deleted file mode 100644 index 40d021aec34a..000000000000 --- a/libcdr/libcdr-0.0.7.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- misc/libcdr-0.0.7/src/lib/libcdr_utils.h 2012-03-07 13:51:21.000000000 +0100 -+++ misc/build/libcdr-0.0.7/src/lib/libcdr_utils.h 2012-03-08 12:46:38.194534604 +0100 -@@ -54,17 +54,8 @@ - - #else - --#ifdef HAVE_CONFIG_H --#include --#endif -- --#ifdef HAVE_STDINT_H - #include --#endif -- --#ifdef HAVE_INTTYPES_H - #include --#endif - - #endif - diff --git a/libcdr/makefile.mk b/libcdr/makefile.mk index 62eeb70144f4..c4636d0ddbab 100644 --- a/libcdr/makefile.mk +++ b/libcdr/makefile.mk @@ -59,12 +59,8 @@ INCPRE+=$(LCMS2_CFLAGS) INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/lcms2 .ENDIF -TARFILE_NAME=libcdr-0.0.7 -TARFILE_MD5=c216ded0275129ccfef44fbc236ac16a - -PATCH_FILES=\ - $(TARFILE_NAME).patch \ - $(TARFILE_NAME)-clang.patch +TARFILE_NAME=libcdr-0.0.8 +TARFILE_MD5=ce5a1def34578b75959ac31210f031f6 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) BUILD_DIR=src$/lib diff --git a/ooo.lst.in b/ooo.lst.in index 0a852486d7fe..0e72b8d7489d 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -89,7 +89,7 @@ f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2 e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip ce31ac7b92cb5e66459f67213bbb6168-libcmis-0.2.2.tar.gz -c216ded0275129ccfef44fbc236ac16a-libcdr-0.0.7.tar.bz2 +ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2 327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz fb1f3777d6562b7ba8c09ac1cfc329e6-libmspub-0.0.0.tar.bz2 fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2