From 10c53c8df8fff1f04e3bffb093fb349b7d436999 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Tue, 6 Jun 2017 18:53:06 -0400 Subject: [PATCH] Corrections of the copyright. --- .gitignore | 2 ++ Copyright.txt | 17 ++++++++--------- README.md | 12 ++++++++---- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 94adde9..0a0287b 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,5 @@ lib/local/LandmarkDetector/Debug/ matlab_runners/Head Pose Experiments/experiments/biwi_out/ matlab_runners/Head Pose Experiments/experiments/bu_out/ matlab_runners/Head Pose Experiments/experiments/ict_out/ + +OpenFace\.VC\.db diff --git a/Copyright.txt b/Copyright.txt index 503701e..b998097 100644 --- a/Copyright.txt +++ b/Copyright.txt @@ -1,12 +1,11 @@ -/////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2017, Carnegie Mellon University and University of Cambridge, -// all rights reserved. -// -// ACADEMIC OR NON-PROFIT ORGANIZATION NONCOMMERCIAL RESEARCH USE ONLY -// -// BY USING OR DOWNLOADING THE SOFTWARE, YOU ARE AGREEING TO THE TERMS OF THIS LICENSE AGREEMENT. -// IF YOU DO NOT AGREE WITH THESE TERMS, YOU MAY NOT USE OR DOWNLOAD THE SOFTWARE. -// +Copyright (C) 2017, University of Southern California, University of Cambridge, and Carnegie Mellon University, all rights reserved + +ACADEMIC OR NON-PROFIT ORGANIZATION NONCOMMERCIAL RESEARCH USE ONLY + +THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Notwithstanding the license granted herein, Licensee acknowledges that certain components of the Software may be covered by so-called “open source” software licenses (“Open Source Components”), which means any software licenses approved as open source licenses by the Open Source Initiative or any substantially similar licenses, including without limitation any license that, as a condition of distribution of the software licensed under such license, requires that the distributor make the software available in source code format. Carnegie Mellon shall provide a list of Open Source Components for a particular version of the Software upon Licensee’s request. Licensee will comply with the applicable terms of such licenses and to the extent required by the licenses covering Open Source Components, the terms of such licenses will apply in lieu of the terms of this Agreement. To the extent the terms of the licenses applicable to Open Source Components prohibit any of the restrictions in this License Agreement with respect to such Open Source Component, such restrictions will not apply to such Open Source Component. To the extent the terms of the licenses applicable to Open Source Components require Carnegie Mellon to make an offer to provide source code or related information in connection with the Software, such offer is hereby made. Any request for source code or related information should be directed to Tadas Baltrusaitis. Licensee acknowledges receipt of notices for the Open Source Components for the initial delivery of the Software. + // License can be found in OpenFace-license.txt // // * Any publications arising from the use of this software, including but diff --git a/README.md b/README.md index ff15972..9750e6e 100644 --- a/README.md +++ b/README.md @@ -68,13 +68,17 @@ Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson in *Facial Expression Recognition and Analysis Challenge*, *IEEE International Conference on Automatic Face and Gesture Recognition*, 2015 -# Final remarks - -I did my best to make sure that the code runs out of the box but there are always issues and I would be grateful for your understanding that this is research code and not a commercial level product. However, if you encounter any problems/bugs/issues please contact me on github or by emailing me at Tadas.Baltrusaitis@cl.cam.ac.uk for any bug reports/questions/suggestions. - # Copyright Copyright can be found in the Copyright.txt You have to respect boost, TBB, dlib, and OpenCV licenses. +# Commercial license + +For inquiries about the commercial licensing of the OpenFace toolkit please contact innovation@cmu.edu + +# Final remarks + +I did my best to make sure that the code runs out of the box but there are always issues and I would be grateful for your understanding that this is research code and not full fledged product. However, if you encounter any problems/bugs/issues please contact me on github or by emailing me at Tadas.Baltrusaitis@cl.cam.ac.uk for any bug reports/questions/suggestions. +