libcdr/libcdr-0.0.2.patch | 34 ------------------------
libcdr/libcdr-0.0.3.patch | 34 ++++++++++++++++++++++++
libcdr/libcdr-msvc.patch | 64 ----------------------------------------------
libcdr/makefile.mk | 7 ++---
libcdr/prj/d.lst | 1
ooo.lst.in | 2 -
6 files changed, 39 insertions(+), 103 deletions(-)
New commits:
commit ada908ab14b10fd15a0e172809546c5fffc7d952
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Thu Feb 23 13:33:49 2012 +0100
New release of libcdr 0.0.3, the best FOSS CDR converter ever
diff --git a/libcdr/libcdr-0.0.2.patch b/libcdr/libcdr-0.0.2.patch
deleted file mode 100644
index 7760ddf..0000000
--- a/libcdr/libcdr-0.0.2.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- misc/libcdr-0.0.2/src/lib/libcdr_utils.h
-+++ misc/build/libcdr-0.0.2/src/lib/libcdr_utils.h
-@@ -41,17 +41,8 @@
-
- #else
-
--#ifdef HAVE_CONFIG_H
--#include <config.h>
--#endif
--
--#ifdef HAVE_STDINT_H
- #include <stdint.h>
--#endif
--
--#ifdef HAVE_INTTYPES_H
- #include <inttypes.h>
--#endif
-
- #endif
-
---- misc/libcdr-0.0.2/src/lib/makefile.mk
-+++ misc/build/libcdr-0.0.2/src/lib/makefile.mk
-@@ -28,6 +28,10 @@
- INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg
- .ENDIF
-
-+.IF "$(SYSTEM_ZLIB)" != "YES"
-+INCPRE+=-I$(SOLARVER)$/$(INPATH)$/inc$/external/zlib
-+.ENDIF
-+
- SLOFILES= \
- $(SLO)$/CDRDocument.obj \
- $(SLO)$/CDRInternalStream.obj \
-
diff --git a/libcdr/libcdr-0.0.3.patch b/libcdr/libcdr-0.0.3.patch
new file mode 100644
index 0000000..3eda64b
--- /dev/null
+++ b/libcdr/libcdr-0.0.3.patch
@@ -0,0 +1,34 @@
+--- misc/libcdr-0.0.3/src/lib/libcdr_utils.h
++++ misc/build/libcdr-0.0.3/src/lib/libcdr_utils.h
+@@ -41,17 +41,8 @@
+
+ #else
+
+-#ifdef HAVE_CONFIG_H
+-#include <config.h>
+-#endif
+-
+-#ifdef HAVE_STDINT_H
+ #include <stdint.h>
+-#endif
+-
+-#ifdef HAVE_INTTYPES_H
+ #include <inttypes.h>
+-#endif
+
+ #endif
+
+--- misc/libcdr-0.0.3/src/lib/makefile.mk
++++ misc/build/libcdr-0.0.3/src/lib/makefile.mk
+@@ -28,6 +28,10 @@
+ INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg
+ .ENDIF
+
++.IF "$(SYSTEM_ZLIB)" != "YES"
++INCPRE+=-I$(SOLARVER)$/$(INPATH)$/inc$/external/zlib
++.ENDIF
++
+ SLOFILES= \
+ $(SLO)$/CDRDocument.obj \
+ $(SLO)$/CDRInternalStream.obj \
+
diff --git a/libcdr/libcdr-msvc.patch b/libcdr/libcdr-msvc.patch
deleted file mode 100644
index d5419e4..0000000
--- a/libcdr/libcdr-msvc.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- misc/libcdr-0.0.2/src/lib/CDRCollector.cpp 2012-02-10 13:53:41.351040000
+0000
-+++ misc/build/libcdr-0.0.2/src/lib/CDRCollector.cpp 2012-02-10
14:07:38.966966400 +0000
-@@ -35,6 +35,13 @@
- #define M_PI 3.14159265358979323846
- #endif
-
-+//http://msdn.microsoft.com/en-us/library/7wsh95e5%28VS.80%29.aspx
-+//msvc 2005 doesn't have round
-+inline double myround( double d )
-+{
-+ return floor( d + 0.5 );
-+}
-+
- libcdr::CDRCollector::CDRCollector(libwpg::WPGPaintInterface *painter) :
- m_painter(painter),
- m_isPageProperties(false),
-@@ -354,9 +361,9 @@
- satGreen = 0.0;
- satBlue = (double)(360 - hue) / 60.0;
- }
-- red = (unsigned char)round(255*(1 - saturation + saturation * (satRed > 1
? 1 : satRed)) * brightness);
-- green = (unsigned char)round(255*(1 - saturation + saturation * (satGreen
> 1 ? 1 : satGreen)) * brightness);
-- blue = (unsigned char)round(255*(1 - saturation + saturation * (satBlue >
1 ? 1 : satBlue)) * brightness);
-+ red = (unsigned char)myround(255*(1 - saturation + saturation * (satRed >
1 ? 1 : satRed)) * brightness);
-+ green = (unsigned char)myround(255*(1 - saturation + saturation *
(satGreen > 1 ? 1 : satGreen)) * brightness);
-+ blue = (unsigned char)myround(255*(1 - saturation + saturation * (satBlue
> 1 ? 1 : satBlue)) * brightness);
- }
- else if (colorModel == 0x07) // HLS
- {
-@@ -394,15 +401,15 @@
-
- if (lightness < 0.5)
- {
-- red = (unsigned char)round(255.0*lightness*tmpRed);
-- green = (unsigned char)round(255.0*lightness*tmpGreen);
-- blue = (unsigned char)round(255.0*lightness*tmpBlue);
-+ red = (unsigned char)myround(255.0*lightness*tmpRed);
-+ green = (unsigned char)myround(255.0*lightness*tmpGreen);
-+ blue = (unsigned char)myround(255.0*lightness*tmpBlue);
- }
- else
- {
-- red = (unsigned char)round(255*((1 - lightness) * tmpRed + 2 *
lightness - 1));
-- green = (unsigned char)round(255*((1 - lightness) * tmpGreen + 2 *
lightness - 1));
-- blue = (unsigned char)round(255*((1 - lightness) * tmpBlue + 2 *
lightness - 1));
-+ red = (unsigned char)myround(255*((1 - lightness) * tmpRed + 2 *
lightness - 1));
-+ green = (unsigned char)myround(255*((1 - lightness) * tmpGreen + 2 *
lightness - 1));
-+ blue = (unsigned char)myround(255*((1 - lightness) * tmpBlue + 2 *
lightness - 1));
- }
- }
- else if (colorModel == 0x09) // Grayscale
---- misc/libcdr-0.0.2/src/lib/CDRParser.cpp 2012-02-10 13:53:41.411126400
+0000
-+++ misc/build/libcdr-0.0.2/src/lib/CDRParser.cpp 2012-02-10
14:14:04.832200000 +0000
-@@ -547,8 +547,8 @@
- tmpPoints.push_back(points[i]);
- }
- }
-- double scaleX = 72.0*fabs(X1 - X2)/(double)width;
-- double scaleY = 72.0*fabs(Y1 - Y2)/(double)height;
-+ double scaleX = 72.0*fabs(double(X1 - X2))/(double)width;
-+ double scaleY = 72.0*fabs(double(Y1 - Y2))/(double)height;
- m_collector->collectBitmap(imageId, colorMode, colorDepth, width, height,
scaleX, scaleY);
- }
-
diff --git a/libcdr/makefile.mk b/libcdr/makefile.mk
index acbd5a3..74a9f8d 100644
--- a/libcdr/makefile.mk
+++ b/libcdr/makefile.mk
@@ -54,12 +54,11 @@ INCPRE+=$(WPG_CFLAGS)
INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg
.ENDIF
-TARFILE_NAME=libcdr-0.0.2
-TARFILE_MD5=bb94fe29a21444369307f19015d48b82
+TARFILE_NAME=libcdr-0.0.3
+TARFILE_MD5=e5f1ef00a113d2edfd88af616934f293
PATCH_FILES=\
- libcdr-0.0.2.patch \
- libcdr-msvc.patch
+ libcdr-0.0.3.patch
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src$/lib
diff --git a/libcdr/prj/d.lst b/libcdr/prj/d.lst
index 86806ba..f74aa63 100644
--- a/libcdr/prj/d.lst
+++ b/libcdr/prj/d.lst
@@ -1,5 +1,6 @@
mkdir: %_DEST%\inc\libcdr
..\%__SRC%\misc\build\libcdr*\src\lib\libcdr.h %_DEST%\inc\libcdr
..\%__SRC%\misc\build\libcdr*\src\lib\CDRDocument.h %_DEST%\inc\libcdr\
+..\%__SRC%\misc\build\libcdr*\src\lib\CDRStringVector.h %_DEST%\inc\libcdr\
..\%__SRC%\lib\*.a %_DEST%\lib\*.a
..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib
diff --git a/ooo.lst.in b/ooo.lst.in
index 71d6f8f..94dbfa0 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -90,7 +90,7 @@ f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2
e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
-bb94fe29a21444369307f19015d48b82-libcdr-0.0.2.tar.bz2
+e5f1ef00a113d2edfd88af616934f293-libcdr-0.0.3.tar.bz2
@GOOGLE_DOCS_EXTENSION_PACK@
@FREETYPE_TARBALL@
@FONTCONFIG_TARBALL@
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
