[Libreoffice-commits] libcdr.git: Branch 'libcdr-0.0' - 5 commits - astyle.options AUTHORS HACKING src/lib
Fridrich Å trba
fridrich.strba at bluewin.ch
Thu Apr 10 03:27:04 PDT 2014
AUTHORS | 4 ++++
HACKING | 8 ++++++++
astyle.options | 11 +++++++++++
src/lib/CDRContentCollector.cpp | 4 ++--
src/lib/CDRParser.cpp | 8 ++++----
src/lib/CDRSVGGenerator.cpp | 31 +++++--------------------------
src/lib/CDRSVGGenerator.h | 30 +++++-------------------------
src/lib/CDRStringVector.cpp | 30 +++++-------------------------
src/lib/CDRStylesCollector.cpp | 2 +-
src/lib/CDRZipStream.cpp | 32 +++++---------------------------
src/lib/CDRZipStream.h | 30 +++++-------------------------
11 files changed, 55 insertions(+), 135 deletions(-)
New commits:
commit b8ed81a2770a7ccf745b7cc014a54180039b2f85
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Apr 10 12:26:40 2014 +0200
Re-astyle
Change-Id: I542cb83920ef928fdb89c9398c1457f1933fe5e2
diff --git a/src/lib/CDRContentCollector.cpp b/src/lib/CDRContentCollector.cpp
index 770093d..d14bb86 100644
--- a/src/lib/CDRContentCollector.cpp
+++ b/src/lib/CDRContentCollector.cpp
@@ -554,8 +554,8 @@ void libcdr::CDRContentCollector::collectFillStyle(unsigned short fillType, cons
}
void libcdr::CDRContentCollector::collectLineStyle(unsigned short lineType, unsigned short capsType, unsigned short joinType, double lineWidth,
- double stretch, double angle, const CDRColor &color, const std::vector<unsigned> &dashArray,
- const CDRPath &startMarker, const CDRPath &endMarker)
+ double stretch, double angle, const CDRColor &color, const std::vector<unsigned> &dashArray,
+ const CDRPath &startMarker, const CDRPath &endMarker)
{
m_currentLineStyle = CDRLineStyle(lineType, capsType, joinType, lineWidth, stretch, angle, color, dashArray, startMarker, endMarker);
}
diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index 9b8cb7a..f5f324c 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -285,9 +285,9 @@ bool libcdr::CDRParser::parseWaldo(WPXInputStream *input)
}
bool libcdr::CDRParser::gatherWaldoInformation(WPXInputStream *input, std::vector<WaldoRecordInfo> &records, std::map<unsigned, WaldoRecordInfo> &records2,
- std::map<unsigned, WaldoRecordInfo> &records3, std::map<unsigned, WaldoRecordInfo> &records4,
- std::map<unsigned, WaldoRecordInfo> &records6, std::map<unsigned, WaldoRecordInfo> &records7,
- std::map<unsigned, WaldoRecordInfo> &records8, std::map<unsigned, WaldoRecordInfo> recordsOther)
+ std::map<unsigned, WaldoRecordInfo> &records3, std::map<unsigned, WaldoRecordInfo> &records4,
+ std::map<unsigned, WaldoRecordInfo> &records6, std::map<unsigned, WaldoRecordInfo> &records7,
+ std::map<unsigned, WaldoRecordInfo> &records8, std::map<unsigned, WaldoRecordInfo> recordsOther)
{
try
{
@@ -336,7 +336,7 @@ bool libcdr::CDRParser::gatherWaldoInformation(WPXInputStream *input, std::vecto
bool libcdr::CDRParser::parseWaldoStructure(WPXInputStream *input, std::stack<WaldoRecordType1> &waldoStack,
- const std::map<unsigned, WaldoRecordType1> &records1, std::map<unsigned, WaldoRecordInfo> &records2)
+ const std::map<unsigned, WaldoRecordType1> &records1, std::map<unsigned, WaldoRecordInfo> &records2)
{
while (!waldoStack.empty())
{
diff --git a/src/lib/CDRStylesCollector.cpp b/src/lib/CDRStylesCollector.cpp
index 1fdb166..acfb92b 100644
--- a/src/lib/CDRStylesCollector.cpp
+++ b/src/lib/CDRStylesCollector.cpp
@@ -209,7 +209,7 @@ void libcdr::CDRStylesCollector::collectPaletteEntry(unsigned colorId, unsigned
}
void libcdr::CDRStylesCollector::collectText(unsigned textId, unsigned styleId, const std::vector<unsigned char> &data,
- const std::vector<unsigned char> &charDescriptions, const std::map<unsigned, CDRCharacterStyle> &styleOverrides)
+ const std::vector<unsigned char> &charDescriptions, const std::map<unsigned, CDRCharacterStyle> &styleOverrides)
{
if (data.empty() || charDescriptions.empty())
return;
commit eb7f80fb5763c726ab6f9856f296e47b703a527c
Author: David Tardon <dtardon at redhat.com>
Date: Thu Nov 28 19:00:30 2013 +0100
add options file for astyle
Change-Id: Ifa12207d6d3bde25af615b293ca1f18c839a3a2f
(cherry picked from commit 70a49adcac0c7fa201ba75cae4784f68914cf778)
diff --git a/HACKING b/HACKING
index d1423ce..4f02df4 100644
--- a/HACKING
+++ b/HACKING
@@ -3,6 +3,6 @@
This project uses mostly the same file naming and coding style like
libwpd and the rest of Fridrich's libraries. Please run
- astyle -A1 -HU -k3 -y -n -s2 -r \*.cpp \*.h
+ astyle --options=astyle.options \*.cpp \*.h
before committing.
diff --git a/astyle.options b/astyle.options
new file mode 100644
index 0000000..9d46215
--- /dev/null
+++ b/astyle.options
@@ -0,0 +1,11 @@
+# formatting options
+style=allman
+indent=spaces=2
+align-pointer=name
+break-closing-brackets
+pad-header
+unpad-paren
+
+# processing options
+recursive
+suffix=none
commit c0d9878a04595fe67951d54cbd9f6b1b32090b89
Author: David Tardon <dtardon at redhat.com>
Date: Thu Nov 28 15:45:51 2013 +0100
add myself to AUTHORS
Change-Id: I40930bd9771a813c5aa4a9f4811aaacc6e552e2a
(cherry picked from commit 69f9ef62dca5158f84c00c24c66afca2df50b522)
diff --git a/AUTHORS b/AUTHORS
index 29f8bc7..29b4d45 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,3 +3,7 @@ CREDITS
Current maintainers and authors of libcdr
---------------------------------------------
Fridrich Strba (fridrich.strba at bluewin.ch)
+
+Contributors
+---------------------------------------------
+David Tardon (dtardon at redhat.com)
commit 137e0a30a88d7815ddd3e156791fbfa658909fab
Author: David Tardon <dtardon at redhat.com>
Date: Thu Nov 28 15:45:08 2013 +0100
document the current astyle settings
Change-Id: I93696d2ac46fe15b1d94cf07342cc14db34b4c7f
(cherry picked from commit 166993d65df5724829b1b64a27ba5cb96d745574)
diff --git a/HACKING b/HACKING
new file mode 100644
index 0000000..d1423ce
--- /dev/null
+++ b/HACKING
@@ -0,0 +1,8 @@
+= Coding style =
+
+This project uses mostly the same file naming and coding style like
+libwpd and the rest of Fridrich's libraries. Please run
+
+ astyle -A1 -HU -k3 -y -n -s2 -r \*.cpp \*.h
+
+before committing.
commit a557a5873f8356c3a289a74e5aee7a07896013e3
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Apr 10 12:23:29 2014 +0200
Some more license headers
Change-Id: I7f373bb278e8f1ccfba28ae217725f10dc738afb
diff --git a/src/lib/CDRSVGGenerator.cpp b/src/lib/CDRSVGGenerator.cpp
index 336825b..2831bb0 100644
--- a/src/lib/CDRSVGGenerator.cpp
+++ b/src/lib/CDRSVGGenerator.cpp
@@ -1,31 +1,10 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* libcdr
- * Version: MPL 1.1 / GPLv2+ / LGPLv2+
+/*
+ * This file is part of the libcdr project.
*
- * 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.strba at bluewin.ch>
- * Copyright (C) 2011 Eilidh McAdam <tibbylickle at 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.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include "CDRSVGGenerator.h"
diff --git a/src/lib/CDRSVGGenerator.h b/src/lib/CDRSVGGenerator.h
index df39ea6..ca918f7 100644
--- a/src/lib/CDRSVGGenerator.h
+++ b/src/lib/CDRSVGGenerator.h
@@ -1,30 +1,10 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* libcdr
- * Version: MPL 1.1 / GPLv2+ / LGPLv2+
+/*
+ * This file is part of the libcdr project.
*
- * 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.strba at bluewin.ch>
- * Copyright (C) 2011 Eilidh McAdam <tibbylickle at 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.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef __CDRSVGGENERATOR_H__
diff --git a/src/lib/CDRStringVector.cpp b/src/lib/CDRStringVector.cpp
index 8a233b0..2c99422 100644
--- a/src/lib/CDRStringVector.cpp
+++ b/src/lib/CDRStringVector.cpp
@@ -1,30 +1,10 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* libcdr
- * Version: MPL 1.1 / GPLv2+ / LGPLv2+
+/*
+ * This file is part of the libcdr project.
*
- * 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.strba at 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.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <vector>
diff --git a/src/lib/CDRZipStream.cpp b/src/lib/CDRZipStream.cpp
index 2ee7ef3..d9e89e5 100644
--- a/src/lib/CDRZipStream.cpp
+++ b/src/lib/CDRZipStream.cpp
@@ -1,34 +1,12 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* libcdr
- * Version: MPL 1.1 / GPLv2+ / LGPLv2+
+/*
+ * This file is part of the libcdr project.
*
- * 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.strba at bluewin.ch>
- * Copyright (C) 2011 Eilidh McAdam <tibbylickle at 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.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-
#include <string.h>
#include <zlib.h>
#include <map>
diff --git a/src/lib/CDRZipStream.h b/src/lib/CDRZipStream.h
index c9211e3..3d20e84 100644
--- a/src/lib/CDRZipStream.h
+++ b/src/lib/CDRZipStream.h
@@ -1,32 +1,12 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* libcdr
- * Version: MPL 1.1 / GPLv2+ / LGPLv2+
+/*
+ * This file is part of the libcdr project.
*
- * 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.strba at 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.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-
#ifndef __CDRZIPSTREAM_H__
#define __CDRZIPSTREAM_H__
More information about the Libreoffice-commits
mailing list