diff --git a/Frameworks/Accelerate/ErrorHandler.mm b/Frameworks/Accelerate/ErrorHandler.mm index bb0b1c54af..4b8966cdba 100644 --- a/Frameworks/Accelerate/ErrorHandler.mm +++ b/Frameworks/Accelerate/ErrorHandler.mm @@ -1,6 +1,6 @@ //****************************************************************************** // -// Copyright (c) 2016, Intel Corporation +// Copyright (c) 2016 Intel Corporation. All rights reserved. // Copyright (c) 2015 Microsoft Corporation. All rights reserved. // // This code is licensed under the MIT License (MIT). diff --git a/Frameworks/Accelerate/blasCDouble.cpp b/Frameworks/Accelerate/blasCDouble.cpp index 58551670ac..61b51c9f80 100644 --- a/Frameworks/Accelerate/blasCDouble.cpp +++ b/Frameworks/Accelerate/blasCDouble.cpp @@ -1,6 +1,6 @@ //****************************************************************************** // -// Copyright (c) 2016, Intel Corporation +// Copyright (c) 2016 Intel Corporation. All rights reserved. // Copyright (c) 2015 Microsoft Corporation. All rights reserved. // // This code is licensed under the MIT License (MIT). diff --git a/Frameworks/Accelerate/blasCFloat.cpp b/Frameworks/Accelerate/blasCFloat.cpp index a02adaeccc..9cc1c311f4 100644 --- a/Frameworks/Accelerate/blasCFloat.cpp +++ b/Frameworks/Accelerate/blasCFloat.cpp @@ -1,6 +1,6 @@ //****************************************************************************** // -// Copyright (c) 2016, Intel Corporation +// Copyright (c) 2016 Intel Corporation. All rights reserved. // Copyright (c) 2015 Microsoft Corporation. All rights reserved. // // This code is licensed under the MIT License (MIT). diff --git a/Frameworks/Accelerate/blasDouble.cpp b/Frameworks/Accelerate/blasDouble.cpp index da8f9dc0b5..7510a6b06d 100644 --- a/Frameworks/Accelerate/blasDouble.cpp +++ b/Frameworks/Accelerate/blasDouble.cpp @@ -1,6 +1,6 @@ //****************************************************************************** // -// Copyright (c) 2016, Intel Corporation +// Copyright (c) 2016 Intel Corporation. All rights reserved. // Copyright (c) 2015 Microsoft Corporation. All rights reserved. // // This code is licensed under the MIT License (MIT). diff --git a/Frameworks/Accelerate/blasFloat.cpp b/Frameworks/Accelerate/blasFloat.cpp index 25a065cecf..93371a8203 100644 --- a/Frameworks/Accelerate/blasFloat.cpp +++ b/Frameworks/Accelerate/blasFloat.cpp @@ -1,6 +1,6 @@ //****************************************************************************** // -// Copyright (c) 2016, Intel Corporation +// Copyright (c) 2016 Intel Corporation. All rights reserved. // Copyright (c) 2015 Microsoft Corporation. All rights reserved. // // This code is licensed under the MIT License (MIT). diff --git a/Frameworks/Accelerate/cblas_globals.c b/Frameworks/Accelerate/cblas_globals.c index c80e04e40d..d62c0166b3 100644 --- a/Frameworks/Accelerate/cblas_globals.c +++ b/Frameworks/Accelerate/cblas_globals.c @@ -1,6 +1,6 @@ //****************************************************************************** // -// Copyright (c) 2016, Intel Corporation +// Copyright (c) 2016 Intel Corporation. All rights reserved. // Copyright (c) 2015 Microsoft Corporation. All rights reserved. // // This code is licensed under the MIT License (MIT). diff --git a/Frameworks/Accelerate/cblas_xerbla.c b/Frameworks/Accelerate/cblas_xerbla.c index 956e3eb390..67a58ee2c7 100644 --- a/Frameworks/Accelerate/cblas_xerbla.c +++ b/Frameworks/Accelerate/cblas_xerbla.c @@ -1,6 +1,6 @@ //****************************************************************************** // -// Copyright (c) 2016, Intel Corporation +// Copyright (c) 2016 Intel Corporation. All rights reserved. // Copyright (c) 2015 Microsoft Corporation. All rights reserved. // // This code is licensed under the MIT License (MIT). diff --git a/Frameworks/Accelerate/vDSP.cpp b/Frameworks/Accelerate/vDSP.cpp index 6290892951..18136e7964 100644 --- a/Frameworks/Accelerate/vDSP.cpp +++ b/Frameworks/Accelerate/vDSP.cpp @@ -1,6 +1,6 @@ //****************************************************************************** // -// Copyright (c) 2016, Intel Corporation +// Copyright (c) 2016 Intel Corporation. All rights reserved. // Copyright (c) 2015 Microsoft Corporation. All rights reserved. // // This code is licensed under the MIT License (MIT). diff --git a/Frameworks/Accelerate/vImage.cpp b/Frameworks/Accelerate/vImage.cpp index b0b4322db7..1ae8f92fc8 100644 --- a/Frameworks/Accelerate/vImage.cpp +++ b/Frameworks/Accelerate/vImage.cpp @@ -1,6 +1,6 @@ //****************************************************************************** // -// Copyright (c) 2016, Intel Corporation +// Copyright (c) 2016 Intel Corporation. All rights reserved. // Copyright (c) 2015 Microsoft Corporation. All rights reserved. // // This code is licensed under the MIT License (MIT). diff --git a/Frameworks/ImageIO/CGImageSource.mm b/Frameworks/ImageIO/CGImageSource.mm index a6d9678657..3425a5e0f2 100644 --- a/Frameworks/ImageIO/CGImageSource.mm +++ b/Frameworks/ImageIO/CGImageSource.mm @@ -1,6 +1,6 @@ //****************************************************************************** // -// Copyright (c) 2016, Intel Corporation +// Copyright (c) 2016 Intel Corporation. All rights reserved. // Copyright (c) 2016 Microsoft Corporation. All rights reserved. // // This code is licensed under the MIT License (MIT). diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt index 528df07525..c48324f04b 100644 --- a/ThirdPartyNotices.txt +++ b/ThirdPartyNotices.txt @@ -2521,6 +2521,32 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice ----------------------------------------------- END OF THIRD PARTY NOTICE ------------------------------------------ +------------------------------------------- START OF THIRD PARTY NOTICE -------------------------------------------------------- + +This file is based on or incorporates material from the projects listed below (Third Party IP). +The original copyright notice and the license under which Microsoft received such Third Party IP, +are set forth below. Such licenses and notices are provided for informational purposes only. +Microsoft licenses the Third Party IP to you under the licensing terms for the Microsoft product. M +icrosoft reserves all other rights not expressly granted under this agreement, whether by implication, estoppel or otherwise. + +RNBlurModalView + +Copyright (c) 2013 Ryan Nystrom (http://whoisryannystrom.com) + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, +modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software +is furnished to do so, subject to the following conditions: + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR +IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +----------------------------------------------- END OF THIRD PARTY NOTICE --------------------------------------------------------- + + ---------------------------------START OF THIRD PARTY NOTICES---------------------------------------- THIRD-PARTY SOFTWARE NOTICES AND INFORMATION diff --git a/deps/3rdparty/CBLAS/cblas.h b/deps/3rdparty/CBLAS/cblas.h index 1e843b4aeb..fb9dddc687 100644 --- a/deps/3rdparty/CBLAS/cblas.h +++ b/deps/3rdparty/CBLAS/cblas.h @@ -1,6 +1,6 @@ //****************************************************************************** // -// Copyright (c) 2016, Intel Corporation +// Copyright (c) 2016 Intel Corporation. All rights reserved. // Copyright (c) 2015 Microsoft Corporation. All rights reserved. // // This code is licensed under the MIT License (MIT). diff --git a/deps/3rdparty/CBLAS/cblas_f77.h b/deps/3rdparty/CBLAS/cblas_f77.h index 7fa904f9dd..1e17b51494 100644 --- a/deps/3rdparty/CBLAS/cblas_f77.h +++ b/deps/3rdparty/CBLAS/cblas_f77.h @@ -1,6 +1,6 @@ //****************************************************************************** // -// Copyright (c) 2016, Intel Corporation +// Copyright (c) 2016 Intel Corporation. All rights reserved. // Copyright (c) 2015 Microsoft Corporation. All rights reserved. // // This code is licensed under the MIT License (MIT). diff --git a/include/Accelerate/Accelerate.h b/include/Accelerate/Accelerate.h index 0f813ebf8e..9aeb628791 100644 --- a/include/Accelerate/Accelerate.h +++ b/include/Accelerate/Accelerate.h @@ -1,6 +1,6 @@ //****************************************************************************** // -// Copyright (c) 2016, Intel Corporation +// Copyright (c) 2016 Intel Corporation. All rights reserved. // Copyright (c) 2015 Microsoft Corporation. All rights reserved. // // This code is licensed under the MIT License (MIT). diff --git a/include/Accelerate/AccelerateExport.h b/include/Accelerate/AccelerateExport.h index 2c577e9a25..7d28e74c57 100644 --- a/include/Accelerate/AccelerateExport.h +++ b/include/Accelerate/AccelerateExport.h @@ -1,6 +1,6 @@ //****************************************************************************** // -// Copyright (c) 2016, Intel Corporation +// Copyright (c) 2016 Intel Corporation. All rights reserved. // Copyright (c) 2015 Microsoft Corporation. All rights reserved. // // This code is licensed under the MIT License (MIT). diff --git a/include/Accelerate/cblas.h b/include/Accelerate/cblas.h index 7f3d81f4d3..1bf8ece60f 100644 --- a/include/Accelerate/cblas.h +++ b/include/Accelerate/cblas.h @@ -1,6 +1,6 @@ //****************************************************************************** // -// Copyright (c) 2016, Intel Corporation +// Copyright (c) 2016 Intel Corporation. All rights reserved. // Copyright (c) 2015 Microsoft Corporation. All rights reserved. // // This code is licensed under the MIT License (MIT). diff --git a/include/Accelerate/cblas_f77.h b/include/Accelerate/cblas_f77.h index e5fa8cf2d4..a2a3521a94 100644 --- a/include/Accelerate/cblas_f77.h +++ b/include/Accelerate/cblas_f77.h @@ -1,6 +1,6 @@ //****************************************************************************** // -// Copyright (c) 2016, Intel Corporation +// Copyright (c) 2016 Intel Corporation. All rights reserved. // Copyright (c) 2015 Microsoft Corporation. All rights reserved. // // This code is licensed under the MIT License (MIT). diff --git a/include/Accelerate/eigen.h b/include/Accelerate/eigen.h index 69afdc3df3..0a3500af27 100644 --- a/include/Accelerate/eigen.h +++ b/include/Accelerate/eigen.h @@ -1,6 +1,6 @@ //****************************************************************************** // -// Copyright (c) 2016, Intel Corporation +// Copyright (c) 2016 Intel Corporation. All rights reserved. // Copyright (c) 2015 Microsoft Corporation. All rights reserved. // // This code is licensed under the MIT License (MIT). diff --git a/include/Accelerate/vDSP.h b/include/Accelerate/vDSP.h index a5a6f49e6f..bf14b51b25 100644 --- a/include/Accelerate/vDSP.h +++ b/include/Accelerate/vDSP.h @@ -1,6 +1,6 @@ //****************************************************************************** // -// Copyright (c) 2016, Intel Corporation +// Copyright (c) 2016 Intel Corporation. All rights reserved. // Copyright (c) 2015 Microsoft Corporation. All rights reserved. // // This code is licensed under the MIT License (MIT). diff --git a/include/Accelerate/vImage.h b/include/Accelerate/vImage.h index 03bb332843..1603542c15 100644 --- a/include/Accelerate/vImage.h +++ b/include/Accelerate/vImage.h @@ -1,6 +1,6 @@ //****************************************************************************** // -// Copyright (c) 2016, Intel Corporation +// Copyright (c) 2016 Intel Corporation. All rights reserved. // Copyright (c) 2015 Microsoft Corporation. All rights reserved. // // This code is licensed under the MIT License (MIT). diff --git a/include/ImageIO/CGImageSource.h b/include/ImageIO/CGImageSource.h index beaea5a799..3b3619a3eb 100644 --- a/include/ImageIO/CGImageSource.h +++ b/include/ImageIO/CGImageSource.h @@ -1,5 +1,6 @@ //****************************************************************************** // +// Copyright (c) 2016 Intel Corporation. All rights reserved. // Copyright (c) 2016 Microsoft Corporation. All rights reserved. // // This code is licensed under the MIT License (MIT). diff --git a/include/ImageIO/CGImageSourceInternal.h b/include/ImageIO/CGImageSourceInternal.h index 0422d88fd4..4f94365af9 100644 --- a/include/ImageIO/CGImageSourceInternal.h +++ b/include/ImageIO/CGImageSourceInternal.h @@ -1,6 +1,6 @@ //****************************************************************************** // -// Copyright (c) 2016, Intel Corporation +// Copyright (c) 2016 Intel Corporation. All rights reserved. // Copyright (c) 2016 Microsoft Corporation. All rights reserved. // // This code is licensed under the MIT License (MIT). diff --git a/samples/WOCCatalog/WOCCatalog/AccelerateViewController.h b/samples/WOCCatalog/WOCCatalog/AccelerateViewController.h index 9873992a07..a71ea6ec91 100644 --- a/samples/WOCCatalog/WOCCatalog/AccelerateViewController.h +++ b/samples/WOCCatalog/WOCCatalog/AccelerateViewController.h @@ -1,5 +1,6 @@ //****************************************************************************** // +// Copyright (c) 2016 Intel Corporation. All rights reserved. // Copyright (c) 2015 Microsoft Corporation. All rights reserved. // // This code is licensed under the MIT License (MIT). diff --git a/samples/WOCCatalog/WOCCatalog/AccelerateViewController.m b/samples/WOCCatalog/WOCCatalog/AccelerateViewController.m index 85199d7d74..58224cca59 100644 --- a/samples/WOCCatalog/WOCCatalog/AccelerateViewController.m +++ b/samples/WOCCatalog/WOCCatalog/AccelerateViewController.m @@ -1,5 +1,19 @@ //****************************************************************************** // +// Copyright (c) 2016 Intel Corporation. All rights reserved. +// +// Copyright (c) 2013 Ryan Nystrom (http://whoisryannystrom.com) +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// // Copyright (c) 2015 Microsoft Corporation. All rights reserved. // // This code is licensed under the MIT License (MIT). diff --git a/samples/WOCCatalog/WOCCatalog/MainViewController.m b/samples/WOCCatalog/WOCCatalog/MainViewController.m index 2951168196..3204fd8555 100644 --- a/samples/WOCCatalog/WOCCatalog/MainViewController.m +++ b/samples/WOCCatalog/WOCCatalog/MainViewController.m @@ -1,5 +1,6 @@ //****************************************************************************** // +// Copyright (c) 2016 Intel Corporation. All rights reserved. // Copyright (c) 2015 Microsoft Corporation. All rights reserved. // // This code is licensed under the MIT License (MIT). diff --git a/tests/unittests/Accelerate/BLASTest.m b/tests/unittests/Accelerate/BLASTest.m index 3a20e48ec3..13bc20c5ea 100644 --- a/tests/unittests/Accelerate/BLASTest.m +++ b/tests/unittests/Accelerate/BLASTest.m @@ -1,6 +1,6 @@ //****************************************************************************** // -// Copyright (c) 2016, Intel Corporation +// Copyright (c) 2016 Intel Corporation. All rights reserved. // Copyright (c) 2015 Microsoft Corporation. All rights reserved. // // This code is licensed under the MIT License (MIT). diff --git a/tests/unittests/Accelerate/vDSPTest.mm b/tests/unittests/Accelerate/vDSPTest.mm index 95137f8d52..0071a5ad57 100644 --- a/tests/unittests/Accelerate/vDSPTest.mm +++ b/tests/unittests/Accelerate/vDSPTest.mm @@ -1,6 +1,6 @@ //****************************************************************************** // -// Copyright (c) 2016, Intel Corporation +// Copyright (c) 2016 Intel Corporation. All rights reserved. // Copyright (c) 2015 Microsoft Corporation. All rights reserved. // // This code is licensed under the MIT License (MIT). diff --git a/tests/unittests/Accelerate/vImageTest.mm b/tests/unittests/Accelerate/vImageTest.mm index b468099d77..5dbc72083e 100644 --- a/tests/unittests/Accelerate/vImageTest.mm +++ b/tests/unittests/Accelerate/vImageTest.mm @@ -1,6 +1,6 @@ //****************************************************************************** // -// Copyright (c) 2016, Intel Corporation +// Copyright (c) 2016 Intel Corporation. All rights reserved. // Copyright (c) 2015 Microsoft Corporation. All rights reserved. // // This code is licensed under the MIT License (MIT). diff --git a/tests/unittests/ImageIO/ImageIOTest.mm b/tests/unittests/ImageIO/ImageIOTest.mm index bebbc11d76..0023fa28c5 100644 --- a/tests/unittests/ImageIO/ImageIOTest.mm +++ b/tests/unittests/ImageIO/ImageIOTest.mm @@ -1,6 +1,6 @@ //****************************************************************************** // -// Copyright (c) 2016, Intel Corporation +// Copyright (c) 2016 Intel Corporation. All rights reserved. // Copyright (c) 2015 Microsoft Corporation. All rights reserved. // // This code is licensed under the MIT License (MIT).