diff --git a/LICENSE b/LICENSE deleted file mode 100644 index d64569567..000000000 --- a/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/cv_bridge/include/cv_bridge/cv_bridge.h b/cv_bridge/include/cv_bridge/cv_bridge.h index 1fec20082..199bcf455 100644 --- a/cv_bridge/include/cv_bridge/cv_bridge.h +++ b/cv_bridge/include/cv_bridge/cv_bridge.h @@ -3,6 +3,7 @@ * * Copyright (c) 2011, Willow Garage, Inc, * Copyright (c) 2015, Tal Regev. +* Copyright (c) 2018 Intel Corporation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -33,21 +34,6 @@ * POSSIBILITY OF SUCH DAMAGE. *********************************************************************/ -// Copyright (c) 2018 Intel Corporation. -// All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - #ifndef CV_BRIDGE__CV_BRIDGE_H_ #define CV_BRIDGE__CV_BRIDGE_H_ diff --git a/cv_bridge/include/cv_bridge/rgb_colors.h b/cv_bridge/include/cv_bridge/rgb_colors.h index a64fb2b1f..cb739ae97 100644 --- a/cv_bridge/include/cv_bridge/rgb_colors.h +++ b/cv_bridge/include/cv_bridge/rgb_colors.h @@ -3,6 +3,7 @@ * following license disclaimer: * * Copyright (C) 2011, the scikit-image team + * Copyright (c) 2018 Intel Corporation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -32,21 +33,6 @@ * POSSIBILITY OF SUCH DAMAGE. *********************************************************************/ -// Copyright (c) 2018 Intel Corporation. -// All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - #ifndef CV_BRIDGE__RGB_COLORS_H_ #define CV_BRIDGE__RGB_COLORS_H_ diff --git a/cv_bridge/package.xml b/cv_bridge/package.xml index 3a4ce70c6..c83078da1 100644 --- a/cv_bridge/package.xml +++ b/cv_bridge/package.xml @@ -8,7 +8,7 @@ Patrick Mihelich James Bowman Ethan Gao - Apache License 2.0 + BSD http://www.ros.org/wiki/cv_bridge https://github.com/ros-perception/vision_opencv/tree/ros2 https://github.com/ros-perception/vision_opencv/issues diff --git a/cv_bridge/python/cv_bridge/__init__.py b/cv_bridge/python/cv_bridge/__init__.py index ba68fb5f1..e887f6be9 100644 --- a/cv_bridge/python/cv_bridge/__init__.py +++ b/cv_bridge/python/cv_bridge/__init__.py @@ -1,17 +1,3 @@ -# Copyright (c) 2018 Intel Corporation. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - from .core import CvBridge, CvBridgeError # python bindings diff --git a/cv_bridge/python/cv_bridge/core.py b/cv_bridge/python/cv_bridge/core.py index abb0f9d53..bce5c6a34 100644 --- a/cv_bridge/python/cv_bridge/core.py +++ b/cv_bridge/python/cv_bridge/core.py @@ -2,6 +2,7 @@ # # Copyright (c) 2011, Willow Garage, Inc. # Copyright (c) 2016, Tal Regev. +# Copyright (c) 2018 Intel Corporation. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -30,21 +31,7 @@ # 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. - #################################################################### -# Copyright (c) 2018 Intel Corporation. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. import sys diff --git a/cv_bridge/src/cv_bridge.cpp b/cv_bridge/src/cv_bridge.cpp index c20d8a9cd..539a54019 100644 --- a/cv_bridge/src/cv_bridge.cpp +++ b/cv_bridge/src/cv_bridge.cpp @@ -3,6 +3,7 @@ * * Copyright (c) 2011, Willow Garage, Inc. * Copyright (c) 2015, Tal Regev. +* Copyright (c) 2018 Intel Corporation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -33,21 +34,6 @@ * POSSIBILITY OF SUCH DAMAGE. *********************************************************************/ -// Copyright (c) 2018 Intel Corporation. -// All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - #include #include #include diff --git a/cv_bridge/src/module.cpp b/cv_bridge/src/module.cpp index 2c9523bce..3fb8891f7 100644 --- a/cv_bridge/src/module.cpp +++ b/cv_bridge/src/module.cpp @@ -2,6 +2,7 @@ * Software License Agreement (BSD License) * * Copyright (c) 2012, Willow Garage, Inc. +* Copyright (c) 2018 Intel Corporation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -32,21 +33,6 @@ * POSSIBILITY OF SUCH DAMAGE. *********************************************************************/ -// Copyright (c) 2018 Intel Corporation. -// All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - #include "module.hpp" #include diff --git a/cv_bridge/src/module.hpp b/cv_bridge/src/module.hpp index 76cf7b05f..913c7e81e 100644 --- a/cv_bridge/src/module.hpp +++ b/cv_bridge/src/module.hpp @@ -1,6 +1,4 @@ -// // Copyright 2014 Open Source Robotics Foundation, Inc. -// Copyright (c) 2018 Intel Corporation. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/cv_bridge/src/module_opencv2.cpp b/cv_bridge/src/module_opencv2.cpp index c41b7c7cc..9a77be39e 100644 --- a/cv_bridge/src/module_opencv2.cpp +++ b/cv_bridge/src/module_opencv2.cpp @@ -2,6 +2,7 @@ * Software License Agreement (BSD License) * * Copyright (c) 2012, Willow Garage, Inc. +* Copyright (c) 2018 Intel Corporation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -32,21 +33,6 @@ * POSSIBILITY OF SUCH DAMAGE. *********************************************************************/ -// Copyright (c) 2018 Intel Corporation. -// All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - #include #include "module.hpp" diff --git a/cv_bridge/src/module_opencv3.cpp b/cv_bridge/src/module_opencv3.cpp index db59d5a3a..2fb03dc00 100644 --- a/cv_bridge/src/module_opencv3.cpp +++ b/cv_bridge/src/module_opencv3.cpp @@ -1,18 +1,3 @@ -// Copyright (c) 2018 Intel Corporation. -// All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - /* Taken from opencv/modules/python/src2/cv2.cpp */ #include "module.hpp" diff --git a/cv_bridge/src/pycompat.hpp b/cv_bridge/src/pycompat.hpp index e71c1ee95..576d93008 100644 --- a/cv_bridge/src/pycompat.hpp +++ b/cv_bridge/src/pycompat.hpp @@ -12,6 +12,7 @@ // // Copyright (C) 2000-2008, Intel Corporation, all rights reserved. // Copyright (C) 2009-2011, Willow Garage Inc., all rights reserved. +// Copyright (c) 2018 Intel Corporation. // Third party copyrights are property of their respective owners. // // Redistribution and use in source and binary forms, with or without modification, @@ -40,22 +41,6 @@ // //M*/ -// Copyright (c) 2018 Intel Corporation. -// All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - - // Defines for Python 2/3 compatibility. #ifndef PYCOMPAT_HPP_ #define PYCOMPAT_HPP_ diff --git a/cv_bridge/src/rgb_colors.cpp b/cv_bridge/src/rgb_colors.cpp index 780b2e520..c0e74e0f9 100644 --- a/cv_bridge/src/rgb_colors.cpp +++ b/cv_bridge/src/rgb_colors.cpp @@ -3,6 +3,7 @@ * following license disclaimer: * * Copyright (C) 2011, the scikit-image team + * Copyright (c) 2018 Intel Corporation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -32,21 +33,6 @@ * POSSIBILITY OF SUCH DAMAGE. *********************************************************************/ -// Copyright (c) 2018 Intel Corporation. -// All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - #include "cv_bridge/rgb_colors.h" #include diff --git a/cv_bridge/test/conversions.py b/cv_bridge/test/conversions.py index 4ca0b388a..984ad8730 100644 --- a/cv_bridge/test/conversions.py +++ b/cv_bridge/test/conversions.py @@ -1,16 +1,3 @@ -# Copyright (c) 2018 Intel Corporation. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - import unittest from cv_bridge import CvBridge, CvBridgeError diff --git a/cv_bridge/test/enumerants.py b/cv_bridge/test/enumerants.py index 059eb4f88..7b0c4f8bc 100644 --- a/cv_bridge/test/enumerants.py +++ b/cv_bridge/test/enumerants.py @@ -1,17 +1,3 @@ -# Copyright (c) 2018 Intel Corporation. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - import unittest import cv2 diff --git a/cv_bridge/test/python_bindings.py b/cv_bridge/test/python_bindings.py index ec849c183..c7ec0a085 100644 --- a/cv_bridge/test/python_bindings.py +++ b/cv_bridge/test/python_bindings.py @@ -1,16 +1,3 @@ -# Copyright (c) 2018 Intel Corporation. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - import cv_bridge from nose.tools import assert_equal import numpy as np diff --git a/cv_bridge/test/test_compression.cpp b/cv_bridge/test/test_compression.cpp index 3fc013d35..962f9fd46 100644 --- a/cv_bridge/test/test_compression.cpp +++ b/cv_bridge/test/test_compression.cpp @@ -1,18 +1,3 @@ -// Copyright (c) 2018 Intel Corporation. -// All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - #include #include #include diff --git a/cv_bridge/test/test_endian.cpp b/cv_bridge/test/test_endian.cpp index 69eddc63b..270105413 100644 --- a/cv_bridge/test/test_endian.cpp +++ b/cv_bridge/test/test_endian.cpp @@ -1,18 +1,3 @@ -// Copyright (c) 2018 Intel Corporation. -// All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - #include #include #include diff --git a/cv_bridge/test/test_rgb_colors.cpp b/cv_bridge/test/test_rgb_colors.cpp index e9f393682..aa7bdfbe4 100644 --- a/cv_bridge/test/test_rgb_colors.cpp +++ b/cv_bridge/test/test_rgb_colors.cpp @@ -1,18 +1,3 @@ -// Copyright (c) 2018 Intel Corporation. -// All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - #include #include diff --git a/cv_bridge/test/utest.cpp b/cv_bridge/test/utest.cpp index 0663b871b..0b640a56f 100644 --- a/cv_bridge/test/utest.cpp +++ b/cv_bridge/test/utest.cpp @@ -1,18 +1,3 @@ -// Copyright (c) 2018 Intel Corporation. -// All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - #include #include diff --git a/cv_bridge/test/utest2.cpp b/cv_bridge/test/utest2.cpp index f862de474..b2743ceb0 100644 --- a/cv_bridge/test/utest2.cpp +++ b/cv_bridge/test/utest2.cpp @@ -2,6 +2,7 @@ * Software License Agreement (BSD License) * * Copyright (c) 2009, Willow Garage, Inc. +* Copyright (c) 2018 Intel Corporation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -32,21 +33,6 @@ * POSSIBILITY OF SUCH DAMAGE. *********************************************************************/ -// Copyright (c) 2018 Intel Corporation. -// All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - #include #include #include diff --git a/opencv_tests/launch/view_img.py b/opencv_tests/launch/view_img.py index a55eaa7a7..b651bb45f 100644 --- a/opencv_tests/launch/view_img.py +++ b/opencv_tests/launch/view_img.py @@ -1,18 +1,3 @@ -# Copyright 2018 Open Source Robotics Foundation, Inc. -# Copyright (c) 2018 Intel Corporation. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - from launch.exit_handler import default_exit_handler, restart_exit_handler from ros2run.api import get_executable_path diff --git a/opencv_tests/nodes/broadcast.py b/opencv_tests/nodes/broadcast.py index d04096594..3bb718e78 100755 --- a/opencv_tests/nodes/broadcast.py +++ b/opencv_tests/nodes/broadcast.py @@ -2,6 +2,7 @@ # # Copyright (c) 2008, Willow Garage, Inc. # Copyright (c) 2016, Tal Regev. +# Copyright (c) 2018 Intel Corporation. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -30,23 +31,8 @@ # 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. - ##################################################################### -# Copyright (c) 2018 Intel Corporation. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - import sys import time import math diff --git a/opencv_tests/nodes/rosfacedetect.py b/opencv_tests/nodes/rosfacedetect.py index bfad49f99..ee0e30f0f 100755 --- a/opencv_tests/nodes/rosfacedetect.py +++ b/opencv_tests/nodes/rosfacedetect.py @@ -1,17 +1,3 @@ -# Copyright (c) 2018 Intel Corporation. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - """ This program is demonstration for face and object detection using haar-like features. The program finds faces in a camera image or video stream and displays a red box around them. diff --git a/opencv_tests/nodes/source.py b/opencv_tests/nodes/source.py index 69ca59526..ec90f8152 100755 --- a/opencv_tests/nodes/source.py +++ b/opencv_tests/nodes/source.py @@ -2,6 +2,7 @@ # # Copyright (c) 2008, Willow Garage, Inc. # Copyright (c) 2016, Tal Regev. +# Copyright (c) 2018 Intel Corporation. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -30,21 +31,7 @@ # 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. - ###################################################################### -# Copyright (c) 2018 Intel Corporation. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. import sys import time