[hamradio-commits] [gnss-sdr] 03/80: adding zlib license text

Carles Fernandez carles_fernandez-guest at moszumanska.debian.org
Sun May 15 20:11:51 UTC 2016


This is an automated email from the git hooks/post-receive script.

carles_fernandez-guest pushed a commit to branch upstream
in repository gnss-sdr.

commit c6eec90849b245ef970c0657a04384f6bd40d5de
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Fri Apr 29 08:03:20 2016 +0200

    adding zlib license text
---
 .../volk_gnsssdr/volk_gnsssdr_32f_sincos_32fc.h    | 40 +++++++++++-----------
 .../volk_gnsssdr/volk_gnsssdr_s32f_sincos_32fc.h   | 36 +++++++++----------
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_sincos_32fc.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_sincos_32fc.h
index f43e99f..5e89da9 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_sincos_32fc.h
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_sincos_32fc.h
@@ -2,6 +2,7 @@
  * \file volk_gnsssdr_32f_sincos_32fc.h
  * \brief VOLK_GNSSSDR kernel: Computes the sine and cosine of a vector of floats.
  * \authors <ul>
+ *          <li> Julien Pommier, 2007
  *          <li> Carles Fernandez-Prades, 2016. cfernandez(at)cttc.es
  *          </ul>
  *
@@ -9,27 +10,25 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2015  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2007  Julien Pommier
  *
- * GNSS-SDR is a software defined Global Navigation
- *          Satellite Systems receiver
+ *  This software is provided 'as-is', without any express or implied
+ *  warranty.  In no event will the authors be held liable for any damages
+ *  arising from the use of this software.
  *
- * This file is part of GNSS-SDR.
+ *  Permission is granted to anyone to use this software for any purpose,
+ *  including commercial applications, and to alter it and redistribute it
+ *  freely, subject to the following restrictions:
  *
- * GNSS-SDR is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ *  1. The origin of this software must not be misrepresented; you must not
+ *     claim that you wrote the original software. If you use this software
+ *     in a product, an acknowledgment in the product documentation would be
+ *     appreciated but is not required.
+ *  2. Altered source versions must be plainly marked as such, and must not be
+ *     misrepresented as being the original software.
+ *  3. This notice may not be removed or altered from any source distribution.
  *
- * GNSS-SDR is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
- *
- * -------------------------------------------------------------------------
+ *  (this is the zlib license)
  */
 
 /*!
@@ -38,7 +37,8 @@
  * \b Overview
  *
  * VOLK_GNSSSDR kernel that computes the sine and cosine of a vector
- * of floats, providing the output in a complex vector (cosine, sine)
+ * of floats, providing the output in a complex vector (cosine, sine).
+ * WARNING: it is not IEEE compliant, but the max absolute error on sines is 2^-24 on the range [-8192, 8192].
  *
  * <b>Dispatcher Prototype</b>
  * \code
@@ -63,7 +63,7 @@
 
 #ifdef LV_HAVE_SSE4_1
 #include <smmintrin.h>
-/* Adapted from the original VOLK.
+/* Adapted from the original VOLK for comparison purposes.
  *  In turn based on algorithms from:
  *   Naoki Shibata, "Efficient Evaluation Methods of Elementary Functions Suitable for SIMD Computation,"
  *   Computer Science Research and Development, May 2010, Volume 25, Issue 1, pp 25-32. DOI 10.1007/s00450-010-0108-2  */
@@ -157,7 +157,7 @@ static inline void volk_gnsssdr_32f_sincos_32fc_u_sse4_1(lv_32fc_t* out, const f
 
 #ifdef LV_HAVE_SSE4_1
 #include <smmintrin.h>
-/* Adapted from the original VOLK.
+/* Adapted from the original VOLK for comparison purposes.
  *  In turn based on algorithms from:
  *   Naoki Shibata, "Efficient Evaluation Methods of Elementary Functions Suitable for SIMD Computation,"
  *   Computer Science Research and Development, May 2010, Volume 25, Issue 1, pp 25-32. DOI 10.1007/s00450-010-0108-2  */
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_s32f_sincos_32fc.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_s32f_sincos_32fc.h
index b0f8702..a5ef7ef 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_s32f_sincos_32fc.h
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_s32f_sincos_32fc.h
@@ -2,6 +2,7 @@
  * \file volk_gnsssdr_s32f_sincos_32fc.h
  * \brief VOLK_GNSSSDR kernel: Computes the sine and cosine of a vector of floats.
  * \authors <ul>
+ *          <li> Julien Pommier, 2007
  *          <li> Carles Fernandez-Prades, 2016. cfernandez(at)cttc.es
  *          </ul>
  *
@@ -9,29 +10,28 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2015  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2007  Julien Pommier
  *
- * GNSS-SDR is a software defined Global Navigation
- *          Satellite Systems receiver
+ *  This software is provided 'as-is', without any express or implied
+ *  warranty.  In no event will the authors be held liable for any damages
+ *  arising from the use of this software.
  *
- * This file is part of GNSS-SDR.
+ *  Permission is granted to anyone to use this software for any purpose,
+ *  including commercial applications, and to alter it and redistribute it
+ *  freely, subject to the following restrictions:
  *
- * GNSS-SDR is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ *  1. The origin of this software must not be misrepresented; you must not
+ *     claim that you wrote the original software. If you use this software
+ *     in a product, an acknowledgment in the product documentation would be
+ *     appreciated but is not required.
+ *  2. Altered source versions must be plainly marked as such, and must not be
+ *     misrepresented as being the original software.
+ *  3. This notice may not be removed or altered from any source distribution.
  *
- * GNSS-SDR is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
- *
- * -------------------------------------------------------------------------
+ *  (this is the zlib license)
  */
 
+
 /*!
  * \page volk_gnsssdr_s32f_sincos_32fc
  *
@@ -40,7 +40,7 @@
  * VOLK_GNSSSDR kernel that computes the sine and cosine with a fixed
  * phase increment \p phase_inc per sample, providing the output in a complex vector (cosine, sine).
  * WARNING: it is not IEEE compliant, but the max absolute error on sines is 2^-24 on the range [-8192, 8192].
- *          As a rule of thumb, keep initial phase + phase_inc * num_points within that range.
+ *          To be safe, keep initial phase + phase_inc * num_points within that range.
  *
  * <b>Dispatcher Prototype</b>
  * \code

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git



More information about the pkg-hamradio-commits mailing list