diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt deleted file mode 100644 index 85d2b68b..00000000 --- a/COPYRIGHT.txt +++ /dev/null @@ -1,33 +0,0 @@ -This project includes source code derived from openni2_camera project by Willow Garage. -The original license for openni2_camera project is included below: - -/* - * Copyright (c) 2013, Willow Garage, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the Willow Garage, Inc. nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 OWNER 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. - * - * Author: Julius Kammerl (jkammerl@willowgarage.com) - */ diff --git a/include/astra_camera/astra_convert.h b/include/astra_camera/astra_convert.h index 3a259a83..fde16cb0 100644 --- a/include/astra_camera/astra_convert.h +++ b/include/astra_camera/astra_convert.h @@ -1,4 +1,5 @@ /* + * Copyright (c) 2013, Willow Garage, Inc. * Copyright (c) 2016, Orbbec Ltd. * All rights reserved. * @@ -10,7 +11,7 @@ * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * Neither the name of the Orbbec Ltd. nor the names of its + * * Neither the name of the Willow Garage, Inc. nor the names of its * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * diff --git a/include/astra_camera/astra_device.h b/include/astra_camera/astra_device.h index bb16bfb1..1a245de7 100644 --- a/include/astra_camera/astra_device.h +++ b/include/astra_camera/astra_device.h @@ -1,4 +1,5 @@ /* + * Copyright (c) 2013, Willow Garage, Inc. * Copyright (c) 2016, Orbbec Ltd. * All rights reserved. * @@ -10,7 +11,7 @@ * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * Neither the name of the Orbbec Ltd. nor the names of its + * * Neither the name of the Willow Garage, Inc. nor the names of its * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * diff --git a/include/astra_camera/astra_device_info.h b/include/astra_camera/astra_device_info.h index 3fd0e795..a63a1b51 100644 --- a/include/astra_camera/astra_device_info.h +++ b/include/astra_camera/astra_device_info.h @@ -1,4 +1,5 @@ /* + * Copyright (c) 2013, Willow Garage, Inc. * Copyright (c) 2016, Orbbec Ltd. * All rights reserved. * @@ -10,7 +11,7 @@ * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * Neither the name of the Orbbec Ltd. nor the names of its + * * Neither the name of the Willow Garage, Inc. nor the names of its * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * diff --git a/include/astra_camera/astra_device_manager.h b/include/astra_camera/astra_device_manager.h index 6143c85d..75bc6581 100644 --- a/include/astra_camera/astra_device_manager.h +++ b/include/astra_camera/astra_device_manager.h @@ -1,4 +1,5 @@ /* + * Copyright (c) 2013, Willow Garage, Inc. * Copyright (c) 2016, Orbbec Ltd. * All rights reserved. * @@ -10,7 +11,7 @@ * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * Neither the name of the Orbbec Ltd. nor the names of its + * * Neither the name of the Willow Garage, Inc. nor the names of its * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * diff --git a/include/astra_camera/astra_driver.h b/include/astra_camera/astra_driver.h index c47957a8..bc10ab7b 100644 --- a/include/astra_camera/astra_driver.h +++ b/include/astra_camera/astra_driver.h @@ -1,4 +1,5 @@ /* + * Copyright (c) 2013, Willow Garage, Inc. * Copyright (c) 2016, Orbbec Ltd. * All rights reserved. * @@ -10,7 +11,7 @@ * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * Neither the name of the Orbbec Ltd. nor the names of its + * * Neither the name of the Willow Garage, Inc. nor the names of its * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * diff --git a/include/astra_camera/astra_exception.h b/include/astra_camera/astra_exception.h index d45f1217..0135a5ed 100644 --- a/include/astra_camera/astra_exception.h +++ b/include/astra_camera/astra_exception.h @@ -1,6 +1,7 @@ /* * Software License Agreement (BSD License) * + * Copyright (c) 2013, Willow Garage, Inc. * Copyright (c) 2016, Orbbec Ltd. * Tim Liu * @@ -16,7 +17,7 @@ * copyright notice, this list of conditions and the following * disclaimer in the documentation and/or other materials provided * with the distribution. - * * Neither the name of Orbbec Ltd. nor the names of its + * * Neither the name of Willow Garage, Inc. nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * diff --git a/include/astra_camera/astra_frame_listener.h b/include/astra_camera/astra_frame_listener.h index 91f5af88..7a1cb55e 100644 --- a/include/astra_camera/astra_frame_listener.h +++ b/include/astra_camera/astra_frame_listener.h @@ -1,4 +1,5 @@ /* + * Copyright (c) 2013, Willow Garage, Inc. * Copyright (c) 2016, Orbbec Ltd. * All rights reserved. * @@ -10,7 +11,7 @@ * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * Neither the name of the Orbbec Ltd. nor the names of its + * * Neither the name of the Willow Garage, Inc. nor the names of its * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * diff --git a/include/astra_camera/astra_timer_filter.h b/include/astra_camera/astra_timer_filter.h index e5fba484..d3b4cb7f 100644 --- a/include/astra_camera/astra_timer_filter.h +++ b/include/astra_camera/astra_timer_filter.h @@ -1,4 +1,5 @@ /* + * Copyright (c) 2013, Willow Garage, Inc. * Copyright (c) 2016, Orbbec Ltd. * All rights reserved. * @@ -10,7 +11,7 @@ * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * Neither the name of the Orbbec Ltd. nor the names of its + * * Neither the name of the Willow Garage, Inc. nor the names of its * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * diff --git a/include/astra_camera/astra_video_mode.h b/include/astra_camera/astra_video_mode.h index 75621a4a..21998aa9 100644 --- a/include/astra_camera/astra_video_mode.h +++ b/include/astra_camera/astra_video_mode.h @@ -1,4 +1,5 @@ /* + * Copyright (c) 2013, Willow Garage, Inc. * Copyright (c) 2016, Orbbec Ltd. * All rights reserved. * @@ -10,7 +11,7 @@ * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * Neither the name of the Orbbec Ltd. nor the names of its + * * Neither the name of the Willow Garage, Inc. nor the names of its * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * diff --git a/ros/astra_camera_node.cpp b/ros/astra_camera_node.cpp index 19b9daea..ec89e644 100644 --- a/ros/astra_camera_node.cpp +++ b/ros/astra_camera_node.cpp @@ -1,4 +1,5 @@ /* + * Copyright (c) 2013, Willow Garage, Inc. * Copyright (c) 2016, Orbbec Ltd. * All rights reserved. * @@ -10,7 +11,7 @@ * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * Neither the name of the Orbbec Ltd. nor the names of its + * * Neither the name of the Willow Garage, Inc. nor the names of its * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * diff --git a/ros/astra_camera_nodelet.cpp b/ros/astra_camera_nodelet.cpp index 0ff34e97..4ed2b2e1 100644 --- a/ros/astra_camera_nodelet.cpp +++ b/ros/astra_camera_nodelet.cpp @@ -1,4 +1,5 @@ /* + * Copyright (c) 2013, Willow Garage, Inc. * Copyright (c) 2016, Orbbec Ltd. * All rights reserved. * @@ -10,7 +11,7 @@ * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * Neither the name of the Orbbec Ltd. nor the names of its + * * Neither the name of the Willow Garage, Inc. nor the names of its * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * diff --git a/src/astra_convert.cpp b/src/astra_convert.cpp index 63474f63..2802cfc5 100644 --- a/src/astra_convert.cpp +++ b/src/astra_convert.cpp @@ -1,5 +1,6 @@ /* - * Copyright (c) 2016, Orbbec Ltd + * Copyright (c) 2013, Willow Garage, Inc. + * Copyright (c) 2016, Orbbec Ltd. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -10,7 +11,7 @@ * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * Neither the name of the Orbbec Ltd. nor the names of its + * * Neither the name of the Willow Garage, Inc. nor the names of its * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * diff --git a/src/astra_device.cpp b/src/astra_device.cpp index 007fce06..b504f6f3 100644 --- a/src/astra_device.cpp +++ b/src/astra_device.cpp @@ -1,4 +1,5 @@ /* + * Copyright (c) 2013, Willow Garage, Inc. * Copyright (c) 2016, Orbbec Ltd. * All rights reserved. * @@ -10,7 +11,7 @@ * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * Neither the name of the Orbbec Ltd. nor the names of its + * * Neither the name of the Willow Garage, Inc. nor the names of its * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * diff --git a/src/astra_device_info.cpp b/src/astra_device_info.cpp index 8b55148f..38fd117b 100644 --- a/src/astra_device_info.cpp +++ b/src/astra_device_info.cpp @@ -1,4 +1,5 @@ /* + * Copyright (c) 2013, Willow Garage, Inc. * Copyright (c) 2016, Orbbec Ltd. * All rights reserved. * @@ -10,7 +11,7 @@ * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * Neither the name of the Orbbec Ltd. nor the names of its + * * Neither the name of the Willow Garage, Inc. nor the names of its * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * diff --git a/src/astra_device_manager.cpp b/src/astra_device_manager.cpp index 98e4c14d..6ca6551d 100644 --- a/src/astra_device_manager.cpp +++ b/src/astra_device_manager.cpp @@ -1,4 +1,5 @@ /* + * Copyright (c) 2013, Willow Garage, Inc. * Copyright (c) 2016, Orbbec Ltd. * All rights reserved. * @@ -10,7 +11,7 @@ * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * Neither the name of the Orbbec Ltd. nor the names of its + * * Neither the name of the Willow Garage, Inc. nor the names of its * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * diff --git a/src/astra_driver.cpp b/src/astra_driver.cpp index 7bb65aa5..70f6ee8c 100644 --- a/src/astra_driver.cpp +++ b/src/astra_driver.cpp @@ -1,4 +1,5 @@ /* + * Copyright (c) 2013, Willow Garage, Inc. * Copyright (c) 2016, Orbbec Ltd. * All rights reserved. * @@ -10,7 +11,7 @@ * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * Neither the name of the Orbbec Ltd. nor the names of its + * * Neither the name of the Willow Garage, Inc. nor the names of its * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * diff --git a/src/astra_exception.cpp b/src/astra_exception.cpp index dc1874e8..754e5e75 100644 --- a/src/astra_exception.cpp +++ b/src/astra_exception.cpp @@ -1,6 +1,7 @@ /* * Software License Agreement (BSD License) * + * Copyright (c) 2013, Willow Garage, Inc. * Copyright (c) 2016, Orbbec Ltd. * Tim Liu * @@ -16,7 +17,7 @@ * copyright notice, this list of conditions and the following * disclaimer in the documentation and/or other materials provided * with the distribution. - * * Neither the name of Orbbec Ltd. nor the names of its + * * Neither the name of Willow Garage, Inc. nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * diff --git a/src/astra_frame_listener.cpp b/src/astra_frame_listener.cpp index 3c8d3b84..67bb4c70 100644 --- a/src/astra_frame_listener.cpp +++ b/src/astra_frame_listener.cpp @@ -1,4 +1,5 @@ /* + * Copyright (c) 2013, Willow Garage, Inc. * Copyright (c) 2016, Orbbec Ltd. * All rights reserved. * @@ -10,7 +11,7 @@ * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * Neither the name of the Orbbec Ltd. nor the names of its + * * Neither the name of the Willow Garage, Inc. nor the names of its * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * diff --git a/src/astra_timer_filter.cpp b/src/astra_timer_filter.cpp index 5c8e387f..2bb4c6cf 100644 --- a/src/astra_timer_filter.cpp +++ b/src/astra_timer_filter.cpp @@ -1,4 +1,5 @@ /* + * Copyright (c) 2013, Willow Garage, Inc. * Copyright (c) 2016, Orbbec Ltd. * All rights reserved. * @@ -10,7 +11,7 @@ * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * Neither the name of the Orbbec Ltd. nor the names of its + * * Neither the name of the Willow Garage, Inc. nor the names of its * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * diff --git a/src/astra_video_mode.cpp b/src/astra_video_mode.cpp index 0d5467e5..9ef5c842 100644 --- a/src/astra_video_mode.cpp +++ b/src/astra_video_mode.cpp @@ -1,4 +1,5 @@ /* + * Copyright (c) 2013, Willow Garage, Inc. * Copyright (c) 2016, Orbbec Ltd. * All rights reserved. * @@ -10,7 +11,7 @@ * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * Neither the name of the Orbbec Ltd. nor the names of its + * * Neither the name of the Willow Garage, Inc. nor the names of its * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * diff --git a/src/list_devices.cpp b/src/list_devices.cpp index 40b85640..706579ba 100644 --- a/src/list_devices.cpp +++ b/src/list_devices.cpp @@ -1,4 +1,5 @@ /* + * Copyright (c) 2013, Willow Garage, Inc. * Copyright (c) 2016, Orbbec Ltd. * All rights reserved. * @@ -10,7 +11,7 @@ * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * Neither the name of the Orbbec Ltd. nor the names of its + * * Neither the name of the Willow Garage, Inc. nor the names of its * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * diff --git a/src/usb_reset.c b/src/usb_reset.c index 00b72219..2de0aac8 100644 --- a/src/usb_reset.c +++ b/src/usb_reset.c @@ -1,6 +1,7 @@ /* usbreset -- send a USB port reset to a USB device */ /* + * Copyright (c) 2013, Willow Garage, Inc. * Copyright (c) 2016, Orbbec Ltd. * All rights reserved. * @@ -12,7 +13,7 @@ * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * Neither the name of the Orbbec Ltd. nor the names of its + * * Neither the name of the Willow Garage, Inc. nor the names of its * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * diff --git a/test/test_wrapper.cpp b/test/test_wrapper.cpp index bed7ff60..c7dae1d1 100644 --- a/test/test_wrapper.cpp +++ b/test/test_wrapper.cpp @@ -1,4 +1,5 @@ /* + * Copyright (c) 2013, Willow Garage, Inc. * Copyright (c) 2016, Orbbec Ltd. * All rights reserved. * @@ -10,7 +11,7 @@ * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * Neither the name of the Orbbec Ltd. nor the names of its + * * Neither the name of the Willow Garage, Inc. nor the names of its * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. *