commit aebf3b9eb25da027870544d8d936bb8575e9b6dc
parent d90d34a46c9af91683d6e6edec4cfcd5ad6981be
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Wed, 2 Dec 2020 12:54:31 +0100
Merge branch 'release_0.3.2'
Diffstat:
20 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/README.md b/README.md
@@ -15,6 +15,10 @@ the install directories of its dependencies.
## Release notes
+### Version 0.3.2
+
+- Make the `s3dut.h` header compatible with C++.
+
### Version 0.3.1
- Update the version of the RSys dependency to 0.6: replace the deprecated
@@ -46,8 +50,8 @@ the install directories of its dependencies.
## License
-Star-3DUtilityToolkit is Copyright (C) |Meso|Star> 2016-2017
-(<contact@meso-star.com>). It is a free software released under the
+Copyright (C) 2016, 2017, 2020 |Meso|Star> (<contact@meso-star.com>).
+Star-3DUtilityToolkit is free software released under the
[OSI](http://opensource.org)-approved GPL v3+ license. You are welcome to
redistribute it under certain conditions; refer to the COPYING file for
details.
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -38,7 +38,7 @@ include(rcmake_runtime)
################################################################################
set(VERSION_MAJOR 0)
set(VERSION_MINOR 3)
-set(VERSION_PATCH 1)
+set(VERSION_PATCH 2)
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
set(S3DUT_FILES_SRC
diff --git a/src/s3dut.h b/src/s3dut.h
@@ -1,4 +1,4 @@
-/* Copyright (C) |Meso|Star> 2016-2017 (contact@meso-star.com)
+/* Copyright (C) 2016, 2017, 2020 |Meso|Star> (contact@meso-star.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -64,6 +64,8 @@ enum s3dut_cap_flag {
S3DUT_CAP_POS_Z = BIT(1)
};
+BEGIN_DECLS
+
/*******************************************************************************
* Stard-3DUT API
******************************************************************************/
@@ -247,4 +249,6 @@ s3dut_create_thick_truncated_super_shape
const int cap_mask, /* Combination of s3dut_cap_flag. Ignored if no clamp */
struct s3dut_mesh** super_shape);
+END_DECLS
+
#endif /* S3DUT_H */
diff --git a/src/s3dut_cuboid.c b/src/s3dut_cuboid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) |Meso|Star> 2016-2017 (contact@meso-star.com)
+/* Copyright (C) 2016, 2017, 2020 |Meso|Star> (contact@meso-star.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/s3dut_cylinder.c b/src/s3dut_cylinder.c
@@ -1,4 +1,4 @@
-/* Copyright (C) |Meso|Star> 2016-2017 (contact@meso-star.com)
+/* Copyright (C) 2016, 2017, 2020 |Meso|Star> (contact@meso-star.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/s3dut_mesh.c b/src/s3dut_mesh.c
@@ -1,4 +1,4 @@
-/* Copyright (C) |Meso|Star> 2016-2017 (contact@meso-star.com)
+/* Copyright (C) 2016, 2017, 2020 |Meso|Star> (contact@meso-star.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/s3dut_mesh.h b/src/s3dut_mesh.h
@@ -1,4 +1,4 @@
-/* Copyright (C) |Meso|Star> 2016-2017 (contact@meso-star.com)
+/* Copyright (C) 2016, 2017, 2020 |Meso|Star> (contact@meso-star.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/s3dut_sphere.c b/src/s3dut_sphere.c
@@ -1,4 +1,4 @@
-/* Copyright (C) |Meso|Star> 2016-2017 (contact@meso-star.com)
+/* Copyright (C) 2016, 2017, 2020 |Meso|Star> (contact@meso-star.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/s3dut_super_shape.c b/src/s3dut_super_shape.c
@@ -1,4 +1,4 @@
-/* Copyright (C) |Meso|Star> 2016-2017 (contact@meso-star.com)
+/* Copyright (C) 2016, 2017, 2020 |Meso|Star> (contact@meso-star.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/test_s3dut_cuboid.c b/src/test_s3dut_cuboid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) |Meso|Star> 2016-2017 (contact@meso-star.com)
+/* Copyright (C) 2016, 2017, 2020 |Meso|Star> (contact@meso-star.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/test_s3dut_cylinder.c b/src/test_s3dut_cylinder.c
@@ -1,4 +1,4 @@
-/* Copyright (C) |Meso|Star> 2016-2017 (contact@meso-star.com)
+/* Copyright (C) 2016, 2017, 2020 |Meso|Star> (contact@meso-star.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/test_s3dut_hemisphere.c b/src/test_s3dut_hemisphere.c
@@ -1,4 +1,4 @@
-/* Copyright (C) |Meso|Star> 2016-2017 (contact@meso-star.com)
+/* Copyright (C) 2016, 2017, 2020 |Meso|Star> (contact@meso-star.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/test_s3dut_sphere.c b/src/test_s3dut_sphere.c
@@ -1,4 +1,4 @@
-/* Copyright (C) |Meso|Star> 2016-2017 (contact@meso-star.com)
+/* Copyright (C) 2016, 2017, 2020 |Meso|Star> (contact@meso-star.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/test_s3dut_super_shape.c b/src/test_s3dut_super_shape.c
@@ -1,4 +1,4 @@
-/* Copyright (C) |Meso|Star> 2016-2017 (contact@meso-star.com)
+/* Copyright (C) 2016, 2017, 2020 |Meso|Star> (contact@meso-star.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/test_s3dut_thick_cylinder.c b/src/test_s3dut_thick_cylinder.c
@@ -1,4 +1,4 @@
-/* Copyright (C) |Meso|Star> 2016-2017 (contact@meso-star.com)
+/* Copyright (C) 2016, 2017, 2020 |Meso|Star> (contact@meso-star.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/test_s3dut_thick_truncated_sphere.c b/src/test_s3dut_thick_truncated_sphere.c
@@ -1,4 +1,4 @@
-/* Copyright (C) |Meso|Star> 2016-2017 (contact@meso-star.com)
+/* Copyright (C) 2016, 2017, 2020 |Meso|Star> (contact@meso-star.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/test_s3dut_thick_truncated_super_shape.c b/src/test_s3dut_thick_truncated_super_shape.c
@@ -1,4 +1,4 @@
-/* Copyright (C) |Meso|Star> 2016-2017 (contact@meso-star.com)
+/* Copyright (C) 2016, 2017, 2020 |Meso|Star> (contact@meso-star.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/test_s3dut_thin_cylinder.c b/src/test_s3dut_thin_cylinder.c
@@ -1,4 +1,4 @@
-/* Copyright (C) |Meso|Star> 2016-2017 (contact@meso-star.com)
+/* Copyright (C) 2016, 2017, 2020 |Meso|Star> (contact@meso-star.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/test_s3dut_truncated_sphere.c b/src/test_s3dut_truncated_sphere.c
@@ -1,4 +1,4 @@
-/* Copyright (C) |Meso|Star> 2016-2017 (contact@meso-star.com)
+/* Copyright (C) 2016, 2017, 2020 |Meso|Star> (contact@meso-star.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/test_s3dut_utils.h b/src/test_s3dut_utils.h
@@ -1,4 +1,4 @@
-/* Copyright (C) |Meso|Star> 2016-2017 (contact@meso-star.com)
+/* Copyright (C) 2016, 2017, 2020 |Meso|Star> (contact@meso-star.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
