Revert the license to keep its original

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_
 

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_
 

cv_bridge/package.xml

@@ -8,7 +8,7 @@
   <author>Patrick Mihelich</author>
   <author>James Bowman</author>
   <maintainer email="ethan.gao@linux.intel.com">Ethan Gao</maintainer>
-  <license>Apache License 2.0</license>
+  <license>BSD</license>
   <url type="website">http://www.ros.org/wiki/cv_bridge</url>
   <url type="repository">https://github.com/ros-perception/vision_opencv/tree/ros2</url>
   <url type="bugtracker">https://github.com/ros-perception/vision_opencv/issues</url>

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

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
 

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 <cv_bridge/cv_bridge.h>
 #include <cv_bridge/rgb_colors.h>
 #include <boost/endian/conversion.hpp>

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 <string>
 

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.