[Libreoffice-commits] libcdr.git: configure.ac

[Libreoffice Gerrit user]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1ef7c4c1ba476ffe1ac9ee748b3b83c2a25c69af
Author: Fridrich Štrba 
AuthorDate: Fri Mar 26 15:04:07 2021 +0100
Commit: Fridrich Štrba 
CommitDate: Fri Mar 26 15:04:07 2021 +0100

Start release cycle 0.1.8 by bumping the version

Change-Id: I058962c08a0b1f7feb57771bcd4e0336971bef40

diff --git a/configure.ac b/configure.ac
index 96249e9..4e316de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ([2.65])
 # 
 m4_define([libcdr_version_major],[0])
 m4_define([libcdr_version_minor],[1])
-m4_define([libcdr_version_micro],[7])
+m4_define([libcdr_version_micro],[8])
 
m4_define([libcdr_version],[libcdr_version_major.libcdr_version_minor.libcdr_version_micro])
 
 # =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libcdr.git: configure.ac

[Libreoffice Gerrit user]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 01cc8560c9ab838f66ac7bbff43f18c537fb7503
Author: Fridrich Štrba 
AuthorDate: Mon Feb 3 13:02:44 2020 +0100
Commit: Fridrich Štrba 
CommitDate: Mon Feb 3 13:02:44 2020 +0100

bump version

Change-Id: Ib9861375302237d2d96c32fea5604064c395f68d

diff --git a/configure.ac b/configure.ac
index d29c154..96249e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ([2.65])
 # 
 m4_define([libcdr_version_major],[0])
 m4_define([libcdr_version_minor],[1])
-m4_define([libcdr_version_micro],[6])
+m4_define([libcdr_version_micro],[7])
 
m4_define([libcdr_version],[libcdr_version_major.libcdr_version_minor.libcdr_version_micro])
 
 # =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libcdr.git: configure.ac

[Libreoffice Gerrit user]

 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 10211e95bb95d05c2261819c88b7f48d9db20b32
Author: David Tardon 
AuthorDate: Sat Dec 29 16:16:00 2018 +0100
Commit: David Tardon 
CommitDate: Sat Dec 29 16:16:00 2018 +0100

fix conditional

Change-Id: I29bad8c1e96f17bf8304729baff8305584371a33

diff --git a/configure.ac b/configure.ac
index 61d62ef..d29c154 100644
--- a/configure.ac
+++ b/configure.ac
@@ -189,10 +189,10 @@ AS_IF([test $platform_win32 = yes],
 AC_MSG_RESULT([$have_visibility])
 CXXFLAGS="$saved_CXXFLAGS"
 AX_GCC_FUNC_ATTRIBUTE([visibility])
-AM_CONDITIONAL([HAVE_VISIBILITY], [
-test "$have_visibility" = "yes" && test 
"$ax_cv_have_func_attribute_visibility" = "yes"])
 ]
 )
+AM_CONDITIONAL([HAVE_VISIBILITY], [
+test x"$have_visibility" = xyes && test 
x"$ax_cv_have_func_attribute_visibility" = xyes])
 
 # 
 # Check for cflags
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libcdr.git: configure.ac

[Libreoffice Gerrit user]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cd9549b81880c35c5d6d56eeab143c3284cbbc5c
Author: David Tardon 
AuthorDate: Sat Dec 29 14:49:18 2018 +0100
Commit: David Tardon 
CommitDate: Sat Dec 29 14:49:18 2018 +0100

bump micro version

Change-Id: I1e013489374d6f36d2b299c78464a3ebaf8eadbe

diff --git a/configure.ac b/configure.ac
index 7760a0a..61d62ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ([2.65])
 # 
 m4_define([libcdr_version_major],[0])
 m4_define([libcdr_version_minor],[1])
-m4_define([libcdr_version_micro],[5])
+m4_define([libcdr_version_micro],[6])
 
m4_define([libcdr_version],[libcdr_version_major.libcdr_version_minor.libcdr_version_micro])
 
 # =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libcdr.git: configure.ac src/lib

[Libreoffice Gerrit user]

 configure.ac|   16 ++--
 src/lib/Makefile.am |6 ++
 2 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit f0f24b6ef07e50d09a4f71180b132f5e6234e2fe
Author: David Tardon 
AuthorDate: Thu Dec 27 19:15:24 2018 +0100
Commit: David Tardon 
CommitDate: Thu Dec 27 19:15:24 2018 +0100

check for __attribute__((visibility)) too

Change-Id: Icf5f2a52cc046cf42d0feb7e5bcb993f426b83e1

diff --git a/configure.ac b/configure.ac
index 3927e5e..0ef99cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -185,16 +185,12 @@ AS_IF([test $platform_win32 = yes],
 AC_MSG_CHECKING([for -fvisibility=hidden compiler flag])
 saved_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-AC_TRY_COMPILE([], [],
-[
-AC_MSG_RESULT([yes])
-CXXFLAGS="$CXXFLAGS -DLIBCDR_VISIBILITY"
-],
-[
-AC_MSG_RESULT([no])
-CXXFLAGS="$saved_CXXFLAGS"
-]
-)
+AC_TRY_COMPILE([], [], [have_visibility=yes], [have_visibility=no])
+AC_MSG_RESULT([$have_visibility])
+CXXFLAGS="$saved_CXXFLAGS"
+AX_GCC_FUNC_ATTRIBUTE([visibility])
+AM_CONDITIONAL([HAVE_VISIBILITY], [
+test "$have_visibility" = "yes" && test 
"$ax_cv_gcc_func_attribute_visibility" = "yes"])
 ]
 )
 
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 2a44977..77af17d 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -17,6 +17,12 @@ AM_CXXFLAGS = -I$(top_srcdir)/inc \
-DBOOST_ERROR_CODE_HEADER_ONLY \
-DBOOST_SYSTEM_NO_DEPRECATED
 
+if HAVE_VISIBILITY
+AM_CXXFLAGS += \
+   -DLIBCDR_VISIBILITY \
+   -fvisibility=hidden
+endif
+
 libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_LIBADD  = libcdr-internal.la 
$(REVENGE_LIBS) $(LCMS2_LIBS) $(ZLIB_LIBS) $(ICU_LIBS) @LIBCDR_WIN32_RESOURCE@
 libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_DEPENDENCIES = 
libcdr-internal.la @LIBCDR_WIN32_RESOURCE@
 libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_LDFLAGS = $(version_info) 
-export-dynamic -no-undefined
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libcdr.git: configure.ac

[David Tardon]

 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 93f8e7405e4a852a2908c011456719dc8e3033e6
Author: David Tardon 
Date:   Sat May 5 13:44:41 2018 +0200

disable werror by default

Change-Id: I56bc2296c8705ac0c9c475aa1cf76baa5dddac83

diff --git a/configure.ac b/configure.ac
index e41be19..3927e5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -202,9 +202,9 @@ AS_IF([test $platform_win32 = yes],
 # Check for cflags
 # 
 AC_ARG_ENABLE([werror],
-   [AS_HELP_STRING([--disable-werror], [Treat all warnings as errors, 
useful for development])],
+   [AS_HELP_STRING([--enable-werror], [Treat all warnings as errors, 
useful for development])],
[enable_werror="$enableval"],
-   [enable_werror=yes]
+   [enable_werror=no]
 )
 AS_IF([test x"$enable_werror" != "xno"], [
CFLAGS="$CFLAGS -Werror"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libcdr.git: configure.ac

[David Tardon]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 26a3e117cab82f3c7bd9d3cedf6ad8d99a6b481d
Author: David Tardon 
Date:   Fri Sep 15 21:41:55 2017 +0200

bump release

Change-Id: I151034df3bf10f7dd3aa714939c7f6a287a2d422

diff --git a/configure.ac b/configure.ac
index 16ae7a3..e383b3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ([2.65])
 # 
 m4_define([libcdr_version_major],[0])
 m4_define([libcdr_version_minor],[1])
-m4_define([libcdr_version_micro],[4])
+m4_define([libcdr_version_micro],[5])
 
m4_define([libcdr_version],[libcdr_version_major.libcdr_version_minor.libcdr_version_micro])
 
 # =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libcdr.git: configure.ac NEWS

[David Tardon]

 NEWS |6 ++
 configure.ac |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 2a505f7aee97b9d93db13f11bd378b4656ecc7f5
Author: David Tardon 
Date:   Thu Sep 14 19:03:53 2017 +0200

prepare for release

Change-Id: Iad271352b4ad95bce253a7401c8efc55ae581525

diff --git a/NEWS b/NEWS
index 3b93a17..6c5bb70 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+libcdr 0.1.4
+
+* Fix several issues found by oss-fuzz.
+* Require C++11 for build.
+* Various code cleanups.
+
 libcdr 0.1.3
 
 * Improvements for CMX parsers
diff --git a/configure.ac b/configure.ac
index 0286ae1..16ae7a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ([2.65])
 # 
 m4_define([libcdr_version_major],[0])
 m4_define([libcdr_version_minor],[1])
-m4_define([libcdr_version_micro],[3])
+m4_define([libcdr_version_micro],[4])
 
m4_define([libcdr_version],[libcdr_version_major.libcdr_version_minor.libcdr_version_micro])
 
 # =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libcdr.git: configure.ac m4/dlp_fallthrough.m4 src/lib

[David Tardon]

 configure.ac   |1 
 m4/dlp_fallthrough.m4  |   65 +
 src/lib/CMXParser.cpp  |2 -
 src/lib/libcdr_utils.h |8 ++
 4 files changed, 75 insertions(+), 1 deletion(-)

New commits:
commit 0e23de6ce871a646f9e1f33b8b5ea90e30eb9e95
Author: David Tardon 
Date:   Sat Jul 29 17:02:25 2017 +0200

suppress GCC 7 fallthrough warning

Change-Id: I6a1da60f75130e897191f20910aab9a3a46b5b57

diff --git a/configure.ac b/configure.ac
index 78b34f4..39770dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,7 @@ AC_CANONICAL_HOST
 
 AX_CXX_COMPILE_STDCXX_11
 AX_GCC_FUNC_ATTRIBUTE([format])
+DLP_FALLTHROUGH
 
 PKG_PROG_PKG_CONFIG([0.20])
 
diff --git a/m4/dlp_fallthrough.m4 b/m4/dlp_fallthrough.m4
new file mode 100644
index 000..99e6be5
--- /dev/null
+++ b/m4/dlp_fallthrough.m4
@@ -0,0 +1,65 @@
+#
+# SYNOPSIS
+#
+#   DLP_FALLTHROUGH
+#
+# DESCRIPTION
+#
+#   This macro checks if the compiler supports a fallthrough warning
+#   suppression attribute in GCC or CLANG style.
+#
+#   If a fallthrough warning suppression attribute is supported define
+#   

[Libreoffice-commits] libcdr.git: configure.ac

[dennisroczek]

 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2f69b5b8357bd30a76f9ff07acb2889e12feab82
Author: dennisroczek 
Date:   Thu Mar 9 09:52:08 2017 +

fix typo: usefull --> useful

Change-Id: Ib6b8be0502a905b4ca7c6f8f2d4213f3a85c4c4f
Reviewed-on: https://gerrit.libreoffice.org/34997
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/configure.ac b/configure.ac
index ff8eaef..eb45681 100644
--- a/configure.ac
+++ b/configure.ac
@@ -207,7 +207,7 @@ AS_IF([test $platform_win32 = yes],
 # Check for cflags
 # 
 AC_ARG_ENABLE([werror],
-   [AS_HELP_STRING([--disable-werror], [Treat all warnings as errors, 
usefull for development])],
+   [AS_HELP_STRING([--disable-werror], [Treat all warnings as errors, 
useful for development])],
[enable_werror="$enableval"],
[enable_werror=yes]
 )
@@ -216,7 +216,7 @@ AS_IF([test x"$enable_werror" != "xno"], [
CXXFLAGS="$CXXFLAGS -Werror"
 ])
 AC_ARG_ENABLE([weffc],
-   [AS_HELP_STRING([--disable-weffc], [ Disable -Weffc++ warnings, usefull 
when using an old version of gcc or of boost])],
+   [AS_HELP_STRING([--disable-weffc], [ Disable -Weffc++ warnings, useful 
when using an old version of gcc or of boost])],
[enable_weffc="$enableval"],
[enable_weffc=yes]
 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libcdr.git: configure.ac NEWS

[Fridrich Štrba]

 NEWS |   13 +
 configure.ac |2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 8d3311cf94f79e97373732d764d65502ef8a941b
Author: Fridrich Å trba 
Date:   Thu Jul 21 08:41:13 2016 +0200

Prepare for 0.1.3

Change-Id: Iebd1617a94ff46d976f8042b4be4b2b12c65fd96

diff --git a/NEWS b/NEWS
index 1f327d7..3b93a17 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+libcdr 0.1.3
+
+* Improvements for CMX parsers
+  - More robust parsing using the pointers from CMX header
+  - Implement almost all fills
+  - Implement outline properties
+  - Implement embedded raster images
+  - Implement transparency lens for fills
+* Some fixes for CDR parsers
+  - Consider fill/outline styles
+* Tools
+  - Make cmx2* and cdr2* tools handle both CDR and CMX
+
 libcdr 0.1.2
 
 * Fix various crashes and hangs when reading broken files found with the
diff --git a/configure.ac b/configure.ac
index 0d57fe2..ff8eaef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ([2.65])
 # 
 m4_define([libcdr_version_major],[0])
 m4_define([libcdr_version_minor],[1])
-m4_define([libcdr_version_micro],[2])
+m4_define([libcdr_version_micro],[3])
 
m4_define([libcdr_version],[libcdr_version_major.libcdr_version_minor.libcdr_version_micro])
 
 # =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libcdr.git: configure.ac

[David Tardon]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 80c7842c7a79c0e3b66962d5c54ef89ff759723d
Author: David Tardon dtar...@redhat.com
Date:   Mon Feb 2 13:48:53 2015 +0100

remove bashism

Change-Id: I795bf489517e6cadb5efa0e6a80072d1063ff50b

diff --git a/configure.ac b/configure.ac
index e5f51aa..2bbf072 100644
--- a/configure.ac
+++ b/configure.ac
@@ -184,7 +184,7 @@ AS_CASE([$host],
 AC_MSG_RESULT([$platform_win32])
 AM_CONDITIONAL([PLATFORM_WIN32], [test x$platform_win32 = xyes])
 
-AS_IF([test $platform_win32 == yes],
+AS_IF([test $platform_win32 = yes],
 [],
 [
 AC_MSG_CHECKING([for -fvisibility=hidden compiler flag])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libcdr.git: configure.ac src/conv src/lib

[Fridrich Štrba]

 configure.ac|   10 +-
 src/conv/svg/Makefile.am|2 +-
 src/conv/text/Makefile.am   |2 +-
 src/lib/CDRContentCollector.cpp |2 +-
 src/lib/Makefile.am |2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 007dd6502fc8b007251bc477399407dd93220389
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Tue Nov 5 18:40:00 2013 +0100

SVG generator must be a core functionality

Change-Id: I02e28aeeae34769760875020837d861d4b706fdc

diff --git a/configure.ac b/configure.ac
index 550fddc..ec7cd3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,11 +44,6 @@ PKG_CHECK_MODULES([REVENGE],[
 AC_SUBST([REVENGE_CFLAGS])
 AC_SUBST([REVENGE_LIBS])
 
-PKG_CHECK_MODULES([REVENGE_GENERATORS],[
-   librevenge-generators-0.0
-])
-AC_SUBST([REVENGE_GENERATORS_CFLAGS])
-AC_SUBST([REVENGE_GENERATORS_LIBS])
 
 # =
 # Tools
@@ -62,9 +57,14 @@ AS_IF([test x$enable_tools = xyes], [
PKG_CHECK_MODULES([REVENGE_STREAM],[
librevenge-stream-0.0
])
+   PKG_CHECK_MODULES([REVENGE_GENERATORS],[
+   librevenge-generators-0.0
+   ])
 ])
 AC_SUBST([REVENGE_STREAM_CFLAGS])
 AC_SUBST([REVENGE_STREAM_LIBS])
+AC_SUBST([REVENGE_GENERATORS_CFLAGS])
+AC_SUBST([REVENGE_GENERATORS_LIBS])
 AM_CONDITIONAL(BUILD_TOOLS, [test x$enable_tools = xyes])
 
 # ==
diff --git a/src/conv/svg/Makefile.am b/src/conv/svg/Makefile.am
index 97196b0..6de9b6d 100644
--- a/src/conv/svg/Makefile.am
+++ b/src/conv/svg/Makefile.am
@@ -25,8 +25,8 @@ cmx2xhtml_DEPENDENCIES = @CMX2XHTML_WIN32_RESOURCE@
 
 cmx2xhtml_LDADD = \
../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la \
-   $(REVENGE_LIBS) \
$(REVENGE_GENERATORS_LIBS) \
+   $(REVENGE_LIBS) \
$(REVENGE_STREAM_LIBS) \
@CMX2XHTML_WIN32_RESOURCE@ 
 
diff --git a/src/conv/text/Makefile.am b/src/conv/text/Makefile.am
index 7085f67..f52e6bb 100644
--- a/src/conv/text/Makefile.am
+++ b/src/conv/text/Makefile.am
@@ -25,8 +25,8 @@ cmx2text_DEPENDENCIES = @CMX2TEXT_WIN32_RESOURCE@
 
 cmx2text_LDADD = \
../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la \
-   $(REVENGE_LIBS) \
$(REVENGE_GENERATORS_LIBS) \
+   $(REVENGE_LIBS) \
$(REVENGE_STREAM_LIBS) \
@CMX2TEXT_WIN32_RESOURCE@ 
 
diff --git a/src/lib/CDRContentCollector.cpp b/src/lib/CDRContentCollector.cpp
index 0df3ca3..b83cffa 100644
--- a/src/lib/CDRContentCollector.cpp
+++ b/src/lib/CDRContentCollector.cpp
@@ -29,7 +29,7 @@
 
 #include math.h
 #include string.h
-#include librevenge-generators/librevenge-generators.h
+#include librevenge/librevenge.h
 #include libcdr/libcdr.h
 #include CDRContentCollector.h
 #include CDRInternalStream.h
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index eb39d35..13a94c0 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -13,7 +13,7 @@ 
libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_include_HEADERS = \
 
 AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(LCMS2_CFLAGS) 
$(ZLIB_CFLAGS) $(ICU_CFLAGS) $(DEBUG_CXXFLAGS)
 
-libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_LIBADD  = $(REVENGE_LIBS) 
$(REVENGE_GENERATORS_LIBS) $(LCMS2_LIBS) $(ZLIB_LIBS) $(ICU_LIBS) 
@LIBCDR_WIN32_RESOURCE@
+libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_LIBADD  = $(REVENGE_LIBS) 
$(LCMS2_LIBS) $(ZLIB_LIBS) $(ICU_LIBS) @LIBCDR_WIN32_RESOURCE@
 libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_DEPENDENCIES = 
@LIBCDR_WIN32_RESOURCE@
 libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_LDFLAGS = $(version_info) 
-export-dynamic -no-undefined
 libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_SOURCES = \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libcdr.git: configure.ac src/lib

[Fridrich Štrba]

 configure.ac |4 ++--
 src/lib/CDRZipStream.cpp |4 
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 7a9f8be1d17e8e74d2d0e60da36152a300a4de6c
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Jul 25 16:06:59 2013 +0200

Hard depend on libwpd 0.9.5

diff --git a/configure.ac b/configure.ac
index c963784..689e44d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,8 +39,8 @@ PKG_PROG_PKG_CONFIG([0.20])
 # Find additional apps
 # 
 PKG_CHECK_MODULES([WPD],[
-   libwpd-0.9
-   libwpd-stream-0.9
+   libwpd-0.9 = 0.9.5
+   libwpd-stream-0.9 = 0.9.5
 ])
 AC_SUBST(WPD_CFLAGS)
 AC_SUBST(WPD_LIBS)
diff --git a/src/lib/CDRZipStream.cpp b/src/lib/CDRZipStream.cpp
index d904057..eacd342 100644
--- a/src/lib/CDRZipStream.cpp
+++ b/src/lib/CDRZipStream.cpp
@@ -160,11 +160,7 @@ WPXInputStream 
*libcdr::CDRZipStream::getDocumentOLEStream(const char *name)
 
 bool libcdr::CDRZipStreamImpl::findCentralDirectoryEnd()
 {
-#if defined(LIBWPD_STREAM_VERSION_MAJOR)  
defined(LIBWPD_STREAM_VERSION_MINOR)  defined(LIBWPD_STREAM_VERSION_REVISION) 
\
-   (LIBWPD_STREAM_VERSION_MAJOR  0 || (LIBWPD_STREAM_VERSION_MAJOR == 0  
(LIBWPD_STREAM_VERSION_MINOR  9 \
-  || (LIBWPD_STREAM_VERSION_MINOR == 9  LIBWPD_STREAM_VERSION_REVISION = 
5
   if (m_cdir_offset || m_input-seek(-1024, WPX_SEEK_END))
-#endif
 m_input-seek(m_cdir_offset, WPX_SEEK_SET);
   try
   {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libcdr.git: configure.ac src/lib

[David Tardon]

 configure.ac|1 +
 src/lib/CDRDocument.cpp |7 ---
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit df155ad555c5e4eb9c991d7e08b5a7816e399257
Author: David Tardon dtar...@redhat.com
Date:   Sat Jul 6 12:25:08 2013 +0200

coverity: avoid memory leak on exception

diff --git a/configure.ac b/configure.ac
index 84f2db1..c963784 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,6 +98,7 @@ AC_SUBST(ICU_LIBS)
 AC_CHECK_HEADERS(
boost/optional.hpp \
boost/property_tree/ptree.hpp \
+   boost/scoped_ptr.hpp \
boost/spirit/include/classic.hpp \
boost/property_tree/json_parser.hpp,
[],
diff --git a/src/lib/CDRDocument.cpp b/src/lib/CDRDocument.cpp
index eeadfaf..6ab7d4d 100644
--- a/src/lib/CDRDocument.cpp
+++ b/src/lib/CDRDocument.cpp
@@ -29,6 +29,7 @@
 
 #include string
 #include string.h
+#include boost/scoped_ptr.hpp
 #include libcdr/libcdr.h
 #include CDRParser.h
 #include CDRSVGGenerator.h
@@ -179,13 +180,13 @@ bool libcdr::CDRDocument::parse(::WPXInputStream *input, 
libwpg::WPGPaintInterfa
 input = zinput.getDocumentOLEStream(content/root.dat);
 if (input)
 {
-  WPXInputStream *tmpStream = 
zinput.getDocumentOLEStream(content/dataFileList.dat);
-  if (tmpStream)
+  boost::scoped_ptrWPXInputStream 
tmpStream(zinput.getDocumentOLEStream(content/dataFileList.dat));
+  if (bool(tmpStream))
   {
 std::string dataFileName;
 while (!tmpStream-atEOS())
 {
-  unsigned char character = readU8(tmpStream);
+  unsigned char character = readU8(tmpStream.get());
   if (character == 0x0a)
   {
 dataFiles.push_back(dataFileName);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libcdr.git: configure.ac

[Fridrich Štrba]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 87f6727d616d4819101f51b21c92f32232dc7e31
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Fri May 17 14:14:23 2013 +0200

Bump version

diff --git a/configure.ac b/configure.ac
index 40c6da0..84f2db1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ([2.65])
 # 
 m4_define([libcdr_version_major],[0])
 m4_define([libcdr_version_minor],[0])
-m4_define([libcdr_version_micro],[13])
+m4_define([libcdr_version_micro],[14])
 
m4_define([libcdr_version],[libcdr_version_major.libcdr_version_minor.libcdr_version_micro])
 
 # =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libcdr.git: configure.ac

[Fridrich Štrba]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 530725355fd76ae2a0d2adb4c9d6e6920d5f3933
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Apr 22 11:50:16 2013 +0200

Bump to our lucky version

diff --git a/configure.ac b/configure.ac
index 858118d..5a41e47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ([2.65])
 # 
 m4_define([libcdr_version_major],[0])
 m4_define([libcdr_version_minor],[0])
-m4_define([libcdr_version_micro],[12])
+m4_define([libcdr_version_micro],[13])
 
m4_define([libcdr_version],[libcdr_version_major.libcdr_version_minor.libcdr_version_micro])
 
 # =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libcdr.git: configure.ac

[Fridrich Štrba]

 configure.ac |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 8d5113bde40c05b722a14d257ae633fb30efd960
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Sat Apr 13 13:16:03 2013 +0200

Check for more boost headers in prevision of spirit-based colour parser

diff --git a/configure.ac b/configure.ac
index 90e4bc1..892c265 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,7 +95,11 @@ AC_SUBST(ICU_LIBS)
 # ===
 
 AC_CHECK_HEADERS(
-   [boost/property_tree/ptree.hpp boost/property_tree/json_parser.hpp],
+   boost/algorithm/string.hpp \
+   boost/optional.hpp \
+   boost/property_tree/ptree.hpp \
+   boost/spirit/include/classic.hpp \
+   boost/property_tree/json_parser.hpp,
[],
[AC_MSG_ERROR(Required boost headers not found. Install boost = 
1.41.0)],
[]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libcdr.git: configure.ac

[Fridrich Štrba]

 configure.ac |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 9bfe5c0a570ca0a00110ca47553c0db21ae820d5
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Sat Apr 13 15:41:42 2013 +0200

No need to check for a header that is not included

diff --git a/configure.ac b/configure.ac
index 892c265..858118d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,7 +95,6 @@ AC_SUBST(ICU_LIBS)
 # ===
 
 AC_CHECK_HEADERS(
-   boost/algorithm/string.hpp \
boost/optional.hpp \
boost/property_tree/ptree.hpp \
boost/spirit/include/classic.hpp \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libcdr.git: configure.ac

[Fridrich Štrba]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f69bf77ebaf68cd4ab907a2f25793b5c423b752a
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Sun Apr 7 21:37:01 2013 +0200

Bump version

diff --git a/configure.ac b/configure.ac
index 715ed61..f839f57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ([2.65])
 # 
 m4_define([libcdr_version_major],[0])
 m4_define([libcdr_version_minor],[0])
-m4_define([libcdr_version_micro],[11])
+m4_define([libcdr_version_micro],[12])
 
m4_define([libcdr_version],[libcdr_version_major.libcdr_version_minor.libcdr_version_micro])
 
 # =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libcdr.git: configure.ac

[Fridrich Štrba]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4c9a34b15ba348da33e5107514ec4e3eb34fea24
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Fri Mar 1 09:46:20 2013 +0100

Bump version for a point release

diff --git a/configure.ac b/configure.ac
index 0c98560..de4bbbf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ([2.65])
 # 
 m4_define([libcdr_version_major],[0])
 m4_define([libcdr_version_minor],[0])
-m4_define([libcdr_version_micro],[10])
+m4_define([libcdr_version_micro],[11])
 
m4_define([libcdr_version],[libcdr_version_major.libcdr_version_minor.libcdr_version_micro])
 
 # =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits