Makefile.am | 6 ++--
build/win32/libvisio.dsp | 22 ++++++++------
build/win32/libvisio.vcproj | 22 +++++++-------
build/win32/libvisio.vcxproj | 10 +++---
build/win32/vsd2raw.vcproj | 4 +-
build/win32/vsd2raw.vcxproj | 4 +-
build/win32/vsd2xhtml.vcproj | 4 +-
build/win32/vsd2xhtml.vcxproj | 4 +-
configure.ac | 4 ++
inc/Makefile.am | 1
inc/libvisio/Makefile.am | 4 ++
inc/libvisio/VSDStringVector.h | 61 +++++++++++++++++++++++++++++++++++++++++
inc/libvisio/VisioDocument.h | 61 +++++++++++++++++++++++++++++++++++++++++
inc/libvisio/libvisio.h | 39 ++++++++++++++++++++++++++
libvisio-0.0.pc.in | 11 -------
libvisio.pc.in | 11 +++++++
src/conv/raw/Makefile.am | 2 -
src/conv/raw/vsd2raw.cpp | 2 -
src/conv/raw/vss2raw.cpp | 2 -
src/conv/svg/Makefile.am | 2 -
src/conv/svg/vsd2xhtml.cpp | 2 -
src/conv/svg/vss2xhtml.cpp | 2 -
src/conv/text/Makefile.am | 2 -
src/conv/text/vsd2text.cpp | 2 -
src/conv/text/vss2text.cpp | 2 -
src/lib/Makefile.am | 8 ++---
src/lib/VSDSVGGenerator.h | 2 -
src/lib/VSDStringVector.cpp | 2 -
src/lib/VSDStringVector.h | 61 -----------------------------------------
src/lib/VisioDocument.cpp | 4 +-
src/lib/VisioDocument.h | 61 -----------------------------------------
src/lib/libvisio.h | 39 --------------------------
32 files changed, 237 insertions(+), 226 deletions(-)
New commits:
commit fee98e43bf7cceac47000197d279692c23e4c73e
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Fri May 10 18:46:47 2013 +0200
Making Michael Stahl happy (libvisio part)
diff --git a/Makefile.am b/Makefile.am
index ed65ae4..7e1cc85 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ pkgconfdir = $(libdir)/pkgconfig
pkgconf_DATA = libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@.pc
-SUBDIRS = src build docs
+SUBDIRS = build inc src docs
EXTRA_DIST = \
AUTHORS \
@@ -14,13 +14,13 @@ EXTRA_DIST = \
NEWS \
README \
autogen.sh \
- libvisio-@VSD_MAJOR_VERSION@.@vsd_minor_vers...@.pc.in \
+ libvisio.pc.in \
libvisio-zip.in \
libvisio.spec \
libvisio.spec.in
distclean-local:
- rm -rf *.cache *~
+ rm -rf *.cache *~ *.out *.pc
rpm: dist
rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
diff --git a/build/win32/libvisio.dsp b/build/win32/libvisio.dsp
index 27db35f..b7d3330 100644
--- a/build/win32/libvisio.dsp
+++ b/build/win32/libvisio.dsp
@@ -40,8 +40,8 @@ RSC=rc.exe
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /I "libwpd-0.9" /I "libwpg-0.2" /D "WIN32"
/D "NDEBUG" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "libwpd-0.9" /I "libwpg-0.2" /D
"NDEBUG" /D "WIN32" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /FD /c
+# ADD BASE CPP /nologo /W3 /GX /O2 /I "..\..\inc" /I "libwpd-0.9" /I
"libwpg-0.2" /D "WIN32" /D "NDEBUG" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /YX
/FD /c
+# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\inc" /I "libwpd-0.9" /I
"libwpg-0.2" /D "NDEBUG" /D "WIN32" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /FD
/c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -64,8 +64,8 @@ LIB32=link.exe -lib
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "libwpd-0.9" /I "libwpg-0.2" /D
"WIN32" /D "_DEBUG" /D "DEBUG" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /YX /FD
/GZ /c
-# ADD CPP /nologo /MTd /W3 /GR /GX /ZI /Od /I "libwpd-0.9" /I "libwpg-0.2" /D
"_DEBUG" /D "DEBUG" /D "WIN32" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\inc" /I "libwpd-0.9" /I
"libwpg-0.2" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_LIB" /D
"_CRT_SECURE_NO_WARNINGS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /GR /GX /ZI /Od /I "..\..\inc" /I "libwpd-0.9" /I
"libwpg-0.2" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_LIB" /D
"_CRT_SECURE_NO_WARNINGS" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -191,7 +191,15 @@ SOURCE=..\..\src\lib\VSDZipStream.cpp
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
-SOURCE=..\..\src\lib\libvisio.h
+SOURCE=..\..\inc\libvisio\libvisio.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\inc\libvisio\VisioDocument.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\inc\libvisio\VSDStringVector.h
# End Source File
# Begin Source File
@@ -211,10 +219,6 @@ SOURCE=..\..\src\lib\VDXParser.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\lib\VisioDocument.h
-# End Source File
-# Begin Source File
-
SOURCE=..\..\src\lib\VSD5Parser.h
# End Source File
# Begin Source File
diff --git a/build/win32/libvisio.vcproj b/build/win32/libvisio.vcproj
index 4401712..f2d6b01 100644
--- a/build/win32/libvisio.vcproj
+++ b/build/win32/libvisio.vcproj
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(BOOST_INCLUDE_DIR),$(LIBXML_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(ICU_INCLUDE_DIR)"
+
AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(BOOST_INCLUDE_DIR),$(LIBXML_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(ICU_INCLUDE_DIR)"
PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -116,7 +116,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
-
AdditionalIncludeDirectories="$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(BOOST_INCLUDE_DIR),$(LIBXML_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(ICU_INCLUDE_DIR)"
+
AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(BOOST_INCLUDE_DIR),$(LIBXML_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(ICU_INCLUDE_DIR)"
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="2"
@@ -728,7 +728,15 @@
Filter="h;hpp;hxx;hm;inl"
>
<File
- RelativePath="..\..\src\lib\libvisio.h"
+ RelativePath="..\..\inc\libvisio\libvisio.h"
+ >
+ </File>
+ <File
+
RelativePath="..\..\inc\libvisio\VisioDocument.h"
+ >
+ </File>
+ <File
+
RelativePath="..\..\inc\libvisio\VSDStringVector.h"
>
</File>
<File
@@ -748,10 +756,6 @@
>
</File>
<File
- RelativePath="..\..\src\lib\VisioDocument.h"
- >
- </File>
- <File
RelativePath="..\..\src\lib\VSD5Parser.h"
>
</File>
@@ -812,10 +816,6 @@
>
</File>
<File
- RelativePath="..\..\src\lib\VSDStringVector.h"
- >
- </File>
- <File
RelativePath="..\..\src\lib\VSDStyles.h"
>
</File>
diff --git a/build/win32/libvisio.vcxproj b/build/win32/libvisio.vcxproj
index 803e91a..665e890 100644
--- a/build/win32/libvisio.vcxproj
+++ b/build/win32/libvisio.vcxproj
@@ -43,7 +43,7 @@
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);$(LIBXML_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);$(LIBXML_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -74,7 +74,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-
<AdditionalIncludeDirectories>$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);$(LIBXML_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);$(LIBXML_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -254,12 +254,13 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\..\src\lib\libvisio.h" />
+ <ClInclude Include="..\..\inc\libvisio\libvisio.h" />
+ <ClInclude Include="..\..\inc\libvisio\VisioDocument.h" />
+ <ClInclude Include="..\..\inc\libvisio\VSDStringVector.h" />
<ClInclude Include="..\..\src\lib\libvisio_utils.h" />
<ClInclude Include="..\..\src\lib\tokenhash.h" />
<ClInclude Include="..\..\src\lib\tokens.h" />
<ClInclude Include="..\..\src\lib\VDXParser.h" />
- <ClInclude Include="..\..\src\lib\VisioDocument.h" />
<ClInclude Include="..\..\src\lib\VSD5Parser.h" />
<ClInclude Include="..\..\src\lib\VSD6Parser.h" />
<ClInclude Include="..\..\src\lib\VSDCharacterList.h" />
@@ -275,7 +276,6 @@
<ClInclude Include="..\..\src\lib\VSDParser.h" />
<ClInclude Include="..\..\src\lib\VSDShapeList.h" />
<ClInclude Include="..\..\src\lib\VSDStencils.h" />
- <ClInclude Include="..\..\src\lib\VSDStringVector.h" />
<ClInclude Include="..\..\src\lib\VSDStyles.h" />
<ClInclude Include="..\..\src\lib\VSDStylesCollector.h" />
<ClInclude Include="..\..\src\lib\VSDSVGGenerator.h" />
diff --git a/build/win32/vsd2raw.vcproj b/build/win32/vsd2raw.vcproj
index d6b9058..bdfbb7a 100644
--- a/build/win32/vsd2raw.vcproj
+++ b/build/win32/vsd2raw.vcproj
@@ -45,7 +45,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="..\..\src\lib,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
+
AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -136,7 +136,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="4"
-
AdditionalIncludeDirectories="..\..\src\lib,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
+
AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
RuntimeLibrary="2"
TreatWChar_tAsBuiltInType="false"
diff --git a/build/win32/vsd2raw.vcxproj b/build/win32/vsd2raw.vcxproj
index c774295..25a454c 100644
--- a/build/win32/vsd2raw.vcxproj
+++ b/build/win32/vsd2raw.vcxproj
@@ -52,7 +52,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\src\lib;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -96,7 +96,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\src\lib;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(ICU_LIB_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(ICU_LIB_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
diff --git a/build/win32/vsd2xhtml.vcproj b/build/win32/vsd2xhtml.vcproj
index 37934c6..6d235fb 100644
--- a/build/win32/vsd2xhtml.vcproj
+++ b/build/win32/vsd2xhtml.vcproj
@@ -45,7 +45,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="4"
-
AdditionalIncludeDirectories="..\..\src\lib,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
+
AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
RuntimeLibrary="2"
TreatWChar_tAsBuiltInType="false"
@@ -133,7 +133,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="...\..\src\lib,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
+
AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
diff --git a/build/win32/vsd2xhtml.vcxproj b/build/win32/vsd2xhtml.vcxproj
index f00761e..c6f32cc 100644
--- a/build/win32/vsd2xhtml.vcxproj
+++ b/build/win32/vsd2xhtml.vcxproj
@@ -52,7 +52,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\src\lib;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
@@ -93,7 +93,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>...\..\src\lib;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
diff --git a/configure.ac b/configure.ac
index 447b2ce..af92ee6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -318,11 +318,13 @@ src/conv/text/vsd2text.rc
src/conv/text/vss2text.rc
src/lib/Makefile
src/lib/libvisio.rc
+inc/Makefile
+inc/libvisio/Makefile
build/Makefile
build/win32/Makefile
docs/Makefile
docs/doxygen/Makefile
-libvisio-0.0.pc
+libvisio-$VSD_MAJOR_VERSION.$VSD_MINOR_VERSION.pc:libvisio.pc.in
libvisio.spec
libvisio-zip
])
diff --git a/inc/Makefile.am b/inc/Makefile.am
new file mode 100644
index 0000000..cc668ef
--- /dev/null
+++ b/inc/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = libvisio
diff --git a/inc/libvisio/Makefile.am b/inc/libvisio/Makefile.am
new file mode 100644
index 0000000..e4c3d6a
--- /dev/null
+++ b/inc/libvisio/Makefile.am
@@ -0,0 +1,4 @@
+EXTRA_DIST = \
+ libvisio.h \
+ VSDStringVector.h \
+ VisioDocument.h
diff --git a/inc/libvisio/VSDStringVector.h b/inc/libvisio/VSDStringVector.h
new file mode 100644
index 0000000..50c929f
--- /dev/null
+++ b/inc/libvisio/VSDStringVector.h
@@ -0,0 +1,61 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* libvisio
+ * Version: MPL 1.1 / GPLv2+ / LGPLv2+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2012 Fridrich Strba <fridrich.st...@bluewin.ch>
+ *
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPLv2+"), or
+ * the GNU Lesser General Public License Version 2 or later (the "LGPLv2+"),
+ * in which case the provisions of the GPLv2+ or the LGPLv2+ are applicable
+ * instead of those above.
+ */
+
+#ifndef __VSDSTRINGVECTOR_H__
+#define __VSDSTRINGVECTOR_H__
+
+#include <libwpd/libwpd.h>
+
+namespace libvisio
+{
+class VSDStringVectorImpl;
+
+class VSDStringVector
+{
+public:
+ VSDStringVector();
+ VSDStringVector(const VSDStringVector &vec);
+ ~VSDStringVector();
+
+ VSDStringVector &operator=(const VSDStringVector &vec);
+
+ unsigned size() const;
+ bool empty() const;
+ const WPXString &operator[](unsigned idx) const;
+ void append(const WPXString &str);
+ void clear();
+
+private:
+ VSDStringVectorImpl *m_pImpl;
+};
+
+} // namespace libvisio
+
+#endif /* __VSDSTRINGVECTOR_H__ */
+/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/inc/libvisio/VisioDocument.h b/inc/libvisio/VisioDocument.h
new file mode 100644
index 0000000..75ed5ab
--- /dev/null
+++ b/inc/libvisio/VisioDocument.h
@@ -0,0 +1,61 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* libvisio
+ * Version: MPL 1.1 / GPLv2+ / LGPLv2+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2011 Fridrich Strba <fridrich.st...@bluewin.ch>
+ * Copyright (C) 2011 Eilidh McAdam <tibbylic...@gmail.com>
+ *
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPLv2+"), or
+ * the GNU Lesser General Public License Version 2 or later (the "LGPLv2+"),
+ * in which case the provisions of the GPLv2+ or the LGPLv2+ are applicable
+ * instead of those above.
+ */
+
+#ifndef __VISIODOCUMENT_H__
+#define __VISIODOCUMENT_H__
+
+#include <libwpd/libwpd.h>
+#include <libwpg/libwpg.h>
+#include "VSDStringVector.h"
+
+class WPXInputStream;
+
+namespace libvisio
+{
+
+class VisioDocument
+{
+public:
+
+ static bool isSupported(WPXInputStream *input);
+
+ static bool parse(WPXInputStream *input, libwpg::WPGPaintInterface *painter);
+
+ static bool parseStencils(WPXInputStream *input, libwpg::WPGPaintInterface
*painter);
+
+ static bool generateSVG(WPXInputStream *input, VSDStringVector &output);
+
+ static bool generateSVGStencils(WPXInputStream *input, VSDStringVector
&output);
+};
+
+} // namespace libvisio
+
+#endif // __VISIODOCUMENT_H__
+/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/inc/libvisio/libvisio.h b/inc/libvisio/libvisio.h
new file mode 100644
index 0000000..ff454a9
--- /dev/null
+++ b/inc/libvisio/libvisio.h
@@ -0,0 +1,39 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* libvisio
+ * Version: MPL 1.1 / GPLv2+ / LGPLv2+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2011 Fridrich Strba <fridrich.st...@bluewin.ch>
+ * Copyright (C) 2011 Eilidh McAdam <tibbylic...@gmail.com>
+ *
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPLv2+"), or
+ * the GNU Lesser General Public License Version 2 or later (the "LGPLv2+"),
+ * in which case the provisions of the GPLv2+ or the LGPLv2+ are applicable
+ * instead of those above.
+ */
+
+#ifndef __LIBVISIO_H__
+#define __LIBVISIO_H__
+
+#include <libwpd/libwpd.h>
+#include <libwpg/libwpg.h>
+#include "VisioDocument.h"
+
+#endif
+/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/libvisio-0.0.pc.in b/libvisio-0.0.pc.in
deleted file mode 100644
index 8bd5cc6..0000000
--- a/libvisio-0.0.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@
-Description: Library for parsing the visio file format structure
-Version: @VERSION@
-Requires: libwpd-0.9 libwpd-stream-0.9 libwpg-0.2
-Libs: -L${libdir} -lvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@
-Cflags: -I${includedir}/libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@
diff --git a/libvisio.pc.in b/libvisio.pc.in
new file mode 100644
index 0000000..8bd5cc6
--- /dev/null
+++ b/libvisio.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@
+Description: Library for parsing the visio file format structure
+Version: @VERSION@
+Requires: libwpd-0.9 libwpd-stream-0.9 libwpg-0.2
+Libs: -L${libdir} -lvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@
+Cflags: -I${includedir}/libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@
diff --git a/src/conv/raw/Makefile.am b/src/conv/raw/Makefile.am
index 47a08be..52a7859 100644
--- a/src/conv/raw/Makefile.am
+++ b/src/conv/raw/Makefile.am
@@ -1,6 +1,6 @@
bin_PROGRAMS = vsd2raw vss2raw
-AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
$(LIBVISIO_CXXFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/inc $(LIBVISIO_CXXFLAGS) $(DEBUG_CXXFLAGS)
vsd2raw_DEPENDENCIES = @VSD2RAW_WIN32_RESOURCE@
diff --git a/src/conv/raw/vsd2raw.cpp b/src/conv/raw/vsd2raw.cpp
index dbc2ccc..f65ace5 100644
--- a/src/conv/raw/vsd2raw.cpp
+++ b/src/conv/raw/vsd2raw.cpp
@@ -33,9 +33,9 @@
#include <string.h>
#include <stack>
-#include "libvisio.h"
#include <libwpd-stream/libwpd-stream.h>
#include <libwpd/libwpd.h>
+#include <libvisio/libvisio.h>
enum PainterCallback
{
diff --git a/src/conv/raw/vss2raw.cpp b/src/conv/raw/vss2raw.cpp
index 58a7597..d04d376 100644
--- a/src/conv/raw/vss2raw.cpp
+++ b/src/conv/raw/vss2raw.cpp
@@ -33,9 +33,9 @@
#include <string.h>
#include <stack>
-#include "libvisio.h"
#include <libwpd-stream/libwpd-stream.h>
#include <libwpd/libwpd.h>
+#include <libvisio/libvisio.h>
enum PainterCallback
{
diff --git a/src/conv/svg/Makefile.am b/src/conv/svg/Makefile.am
index 27e3e48..bb0d208 100644
--- a/src/conv/svg/Makefile.am
+++ b/src/conv/svg/Makefile.am
@@ -1,6 +1,6 @@
bin_PROGRAMS = vsd2xhtml vss2xhtml
-AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
$(LIBVISIO_CXXFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/inc $(LIBVISIO_CXXFLAGS) $(DEBUG_CXXFLAGS)
vsd2xhtml_DEPENDENCIES = @VSD2XHTML_WIN32_RESOURCE@
diff --git a/src/conv/svg/vsd2xhtml.cpp b/src/conv/svg/vsd2xhtml.cpp
index ccabfc8..4865005 100644
--- a/src/conv/svg/vsd2xhtml.cpp
+++ b/src/conv/svg/vsd2xhtml.cpp
@@ -32,9 +32,9 @@
#include <sstream>
#include <stdio.h>
#include <string.h>
-#include "libvisio.h"
#include <libwpd-stream/libwpd-stream.h>
#include <libwpd/libwpd.h>
+#include <libvisio/libvisio.h>
namespace
{
diff --git a/src/conv/svg/vss2xhtml.cpp b/src/conv/svg/vss2xhtml.cpp
index 02525c8..531d12c 100644
--- a/src/conv/svg/vss2xhtml.cpp
+++ b/src/conv/svg/vss2xhtml.cpp
@@ -32,9 +32,9 @@
#include <sstream>
#include <stdio.h>
#include <string.h>
-#include "libvisio.h"
#include <libwpd-stream/libwpd-stream.h>
#include <libwpd/libwpd.h>
+#include <libvisio/libvisio.h>
namespace
{
diff --git a/src/conv/text/Makefile.am b/src/conv/text/Makefile.am
index 0d4d1a1..991d514 100644
--- a/src/conv/text/Makefile.am
+++ b/src/conv/text/Makefile.am
@@ -1,6 +1,6 @@
bin_PROGRAMS = vsd2text vss2text
-AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
$(LIBVISIO_CXXFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/inc $(LIBVISIO_CXXFLAGS) $(DEBUG_CXXFLAGS)
vsd2text_DEPENDENCIES = @VSD2TEXT_WIN32_RESOURCE@
diff --git a/src/conv/text/vsd2text.cpp b/src/conv/text/vsd2text.cpp
index f0e17f9..6f33172 100644
--- a/src/conv/text/vsd2text.cpp
+++ b/src/conv/text/vsd2text.cpp
@@ -31,9 +31,9 @@
#include <stdio.h>
#include <string.h>
-#include "libvisio.h"
#include <libwpd-stream/libwpd-stream.h>
#include <libwpd/libwpd.h>
+#include <libvisio/libvisio.h>
class TextPainter : public libwpg::WPGPaintInterface
{
diff --git a/src/conv/text/vss2text.cpp b/src/conv/text/vss2text.cpp
index e656077..e6e8c6f 100644
--- a/src/conv/text/vss2text.cpp
+++ b/src/conv/text/vss2text.cpp
@@ -31,9 +31,9 @@
#include <stdio.h>
#include <string.h>
-#include "libvisio.h"
#include <libwpd-stream/libwpd-stream.h>
#include <libwpd/libwpd.h>
+#include <libvisio/libvisio.h>
class TextPainter : public libwpg::WPGPaintInterface
{
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index c689ce8..869beec 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -8,11 +8,11 @@ lib_LTLIBRARIES =
libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@.la
noinst_LTLIBRARIES = libtokenmap.la
libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_includedir =
$(includedir)/libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@/libvisio
libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_include_HEADERS = \
- libvisio.h \
- VSDStringVector.h \
- VisioDocument.h
+ $(top_srcdir)/inc/libvisio/libvisio.h \
+ $(top_srcdir)/inc/libvisio/VSDStringVector.h \
+ $(top_srcdir)/inc/libvisio/VisioDocument.h
-AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
$(LIBVISIO_CXXFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/inc -I$(top_srcdir)/src/lib
-I$(top_builddir)/src/lib $(LIBVISIO_CXXFLAGS) $(DEBUG_CXXFLAGS)
generated_files = \
$(top_builddir)/src/lib/tokens.h \
diff --git a/src/lib/VSDSVGGenerator.h b/src/lib/VSDSVGGenerator.h
index 30fa404..1f35e4e 100644
--- a/src/lib/VSDSVGGenerator.h
+++ b/src/lib/VSDSVGGenerator.h
@@ -36,7 +36,7 @@
#include <sstream>
#include <libwpd/libwpd.h>
#include <libwpg/libwpg.h>
-#include "VSDStringVector.h"
+#include <libvisio/libvisio.h>
namespace libvisio
{
diff --git a/src/lib/VSDStringVector.cpp b/src/lib/VSDStringVector.cpp
index b577896..6956007 100644
--- a/src/lib/VSDStringVector.cpp
+++ b/src/lib/VSDStringVector.cpp
@@ -28,7 +28,7 @@
*/
#include <vector>
-#include "VSDStringVector.h"
+#include <libvisio/libvisio.h>
namespace libvisio
{
diff --git a/src/lib/VSDStringVector.h b/src/lib/VSDStringVector.h
deleted file mode 100644
index 50c929f..0000000
--- a/src/lib/VSDStringVector.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* libvisio
- * Version: MPL 1.1 / GPLv2+ / LGPLv2+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- * Copyright (C) 2012 Fridrich Strba <fridrich.st...@bluewin.ch>
- *
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPLv2+"), or
- * the GNU Lesser General Public License Version 2 or later (the "LGPLv2+"),
- * in which case the provisions of the GPLv2+ or the LGPLv2+ are applicable
- * instead of those above.
- */
-
-#ifndef __VSDSTRINGVECTOR_H__
-#define __VSDSTRINGVECTOR_H__
-
-#include <libwpd/libwpd.h>
-
-namespace libvisio
-{
-class VSDStringVectorImpl;
-
-class VSDStringVector
-{
-public:
- VSDStringVector();
- VSDStringVector(const VSDStringVector &vec);
- ~VSDStringVector();
-
- VSDStringVector &operator=(const VSDStringVector &vec);
-
- unsigned size() const;
- bool empty() const;
- const WPXString &operator[](unsigned idx) const;
- void append(const WPXString &str);
- void clear();
-
-private:
- VSDStringVectorImpl *m_pImpl;
-};
-
-} // namespace libvisio
-
-#endif /* __VSDSTRINGVECTOR_H__ */
-/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/VisioDocument.cpp b/src/lib/VisioDocument.cpp
index bbfe53f..15f6f75 100644
--- a/src/lib/VisioDocument.cpp
+++ b/src/lib/VisioDocument.cpp
@@ -28,9 +28,9 @@
* instead of those above.
*/
-#include <libwpd-stream/libwpd-stream.h>
#include <string>
-#include "libvisio.h"
+#include <libwpd-stream/libwpd-stream.h>
+#include <libvisio/libvisio.h>
#include "libvisio_utils.h"
#include "VDXParser.h"
#include "VSDSVGGenerator.h"
diff --git a/src/lib/VisioDocument.h b/src/lib/VisioDocument.h
deleted file mode 100644
index 75ed5ab..0000000
--- a/src/lib/VisioDocument.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* libvisio
- * Version: MPL 1.1 / GPLv2+ / LGPLv2+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- * Copyright (C) 2011 Fridrich Strba <fridrich.st...@bluewin.ch>
- * Copyright (C) 2011 Eilidh McAdam <tibbylic...@gmail.com>
- *
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPLv2+"), or
- * the GNU Lesser General Public License Version 2 or later (the "LGPLv2+"),
- * in which case the provisions of the GPLv2+ or the LGPLv2+ are applicable
- * instead of those above.
- */
-
-#ifndef __VISIODOCUMENT_H__
-#define __VISIODOCUMENT_H__
-
-#include <libwpd/libwpd.h>
-#include <libwpg/libwpg.h>
-#include "VSDStringVector.h"
-
-class WPXInputStream;
-
-namespace libvisio
-{
-
-class VisioDocument
-{
-public:
-
- static bool isSupported(WPXInputStream *input);
-
- static bool parse(WPXInputStream *input, libwpg::WPGPaintInterface *painter);
-
- static bool parseStencils(WPXInputStream *input, libwpg::WPGPaintInterface
*painter);
-
- static bool generateSVG(WPXInputStream *input, VSDStringVector &output);
-
- static bool generateSVGStencils(WPXInputStream *input, VSDStringVector
&output);
-};
-
-} // namespace libvisio
-
-#endif // __VISIODOCUMENT_H__
-/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/libvisio.h b/src/lib/libvisio.h
deleted file mode 100644
index ff454a9..0000000
--- a/src/lib/libvisio.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* libvisio
- * Version: MPL 1.1 / GPLv2+ / LGPLv2+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- * Copyright (C) 2011 Fridrich Strba <fridrich.st...@bluewin.ch>
- * Copyright (C) 2011 Eilidh McAdam <tibbylic...@gmail.com>
- *
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPLv2+"), or
- * the GNU Lesser General Public License Version 2 or later (the "LGPLv2+"),
- * in which case the provisions of the GPLv2+ or the LGPLv2+ are applicable
- * instead of those above.
- */
-
-#ifndef __LIBVISIO_H__
-#define __LIBVISIO_H__
-
-#include <libwpd/libwpd.h>
-#include <libwpg/libwpg.h>
-#include "VisioDocument.h"
-
-#endif
-/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
