Skip to content

Commit

Permalink
update copyright
Browse files Browse the repository at this point in the history
  • Loading branch information
Len Zhong committed May 14, 2016
1 parent 361819f commit 6e2903d
Show file tree
Hide file tree
Showing 24 changed files with 47 additions and 57 deletions.
33 changes: 0 additions & 33 deletions COPYRIGHT.txt

This file was deleted.

3 changes: 2 additions & 1 deletion include/astra_camera/astra_convert.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2013, Willow Garage, Inc.
* Copyright (c) 2016, Orbbec Ltd.
* All rights reserved.
*
Expand All @@ -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.
*
Expand Down
3 changes: 2 additions & 1 deletion include/astra_camera/astra_device.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2013, Willow Garage, Inc.
* Copyright (c) 2016, Orbbec Ltd.
* All rights reserved.
*
Expand All @@ -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.
*
Expand Down
3 changes: 2 additions & 1 deletion include/astra_camera/astra_device_info.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2013, Willow Garage, Inc.
* Copyright (c) 2016, Orbbec Ltd.
* All rights reserved.
*
Expand All @@ -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.
*
Expand Down
3 changes: 2 additions & 1 deletion include/astra_camera/astra_device_manager.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2013, Willow Garage, Inc.
* Copyright (c) 2016, Orbbec Ltd.
* All rights reserved.
*
Expand All @@ -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.
*
Expand Down
3 changes: 2 additions & 1 deletion include/astra_camera/astra_driver.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2013, Willow Garage, Inc.
* Copyright (c) 2016, Orbbec Ltd.
* All rights reserved.
*
Expand All @@ -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.
*
Expand Down
3 changes: 2 additions & 1 deletion include/astra_camera/astra_exception.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* Software License Agreement (BSD License)
*
* Copyright (c) 2013, Willow Garage, Inc.
* Copyright (c) 2016, Orbbec Ltd.
* Tim Liu <liuhua@orbbec.com>
*
Expand All @@ -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.
*
Expand Down
3 changes: 2 additions & 1 deletion include/astra_camera/astra_frame_listener.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2013, Willow Garage, Inc.
* Copyright (c) 2016, Orbbec Ltd.
* All rights reserved.
*
Expand All @@ -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.
*
Expand Down
3 changes: 2 additions & 1 deletion include/astra_camera/astra_timer_filter.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2013, Willow Garage, Inc.
* Copyright (c) 2016, Orbbec Ltd.
* All rights reserved.
*
Expand All @@ -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.
*
Expand Down
3 changes: 2 additions & 1 deletion include/astra_camera/astra_video_mode.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2013, Willow Garage, Inc.
* Copyright (c) 2016, Orbbec Ltd.
* All rights reserved.
*
Expand All @@ -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.
*
Expand Down
3 changes: 2 additions & 1 deletion ros/astra_camera_node.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2013, Willow Garage, Inc.
* Copyright (c) 2016, Orbbec Ltd.
* All rights reserved.
*
Expand All @@ -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.
*
Expand Down
3 changes: 2 additions & 1 deletion ros/astra_camera_nodelet.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2013, Willow Garage, Inc.
* Copyright (c) 2016, Orbbec Ltd.
* All rights reserved.
*
Expand All @@ -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.
*
Expand Down
5 changes: 3 additions & 2 deletions src/astra_convert.cpp
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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.
*
Expand Down
3 changes: 2 additions & 1 deletion src/astra_device.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2013, Willow Garage, Inc.
* Copyright (c) 2016, Orbbec Ltd.
* All rights reserved.
*
Expand All @@ -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.
*
Expand Down
3 changes: 2 additions & 1 deletion src/astra_device_info.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2013, Willow Garage, Inc.
* Copyright (c) 2016, Orbbec Ltd.
* All rights reserved.
*
Expand All @@ -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.
*
Expand Down
3 changes: 2 additions & 1 deletion src/astra_device_manager.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2013, Willow Garage, Inc.
* Copyright (c) 2016, Orbbec Ltd.
* All rights reserved.
*
Expand All @@ -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.
*
Expand Down
3 changes: 2 additions & 1 deletion src/astra_driver.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2013, Willow Garage, Inc.
* Copyright (c) 2016, Orbbec Ltd.
* All rights reserved.
*
Expand All @@ -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.
*
Expand Down
3 changes: 2 additions & 1 deletion src/astra_exception.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* Software License Agreement (BSD License)
*
* Copyright (c) 2013, Willow Garage, Inc.
* Copyright (c) 2016, Orbbec Ltd.
* Tim Liu <liuhua@orbbec.com>
*
Expand All @@ -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.
*
Expand Down
3 changes: 2 additions & 1 deletion src/astra_frame_listener.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2013, Willow Garage, Inc.
* Copyright (c) 2016, Orbbec Ltd.
* All rights reserved.
*
Expand All @@ -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.
*
Expand Down
3 changes: 2 additions & 1 deletion src/astra_timer_filter.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2013, Willow Garage, Inc.
* Copyright (c) 2016, Orbbec Ltd.
* All rights reserved.
*
Expand All @@ -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.
*
Expand Down
3 changes: 2 additions & 1 deletion src/astra_video_mode.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2013, Willow Garage, Inc.
* Copyright (c) 2016, Orbbec Ltd.
* All rights reserved.
*
Expand All @@ -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.
*
Expand Down
3 changes: 2 additions & 1 deletion src/list_devices.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2013, Willow Garage, Inc.
* Copyright (c) 2016, Orbbec Ltd.
* All rights reserved.
*
Expand All @@ -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.
*
Expand Down
3 changes: 2 additions & 1 deletion src/usb_reset.c
Original file line number Diff line number Diff line change
@@ -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.
*
Expand All @@ -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.
*
Expand Down
3 changes: 2 additions & 1 deletion test/test_wrapper.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2013, Willow Garage, Inc.
* Copyright (c) 2016, Orbbec Ltd.
* All rights reserved.
*
Expand All @@ -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.
*
Expand Down

0 comments on commit 6e2903d

Please sign in to comment.