Skip to content

Commit

Permalink
Cleanup changes
Browse files Browse the repository at this point in the history
1. Set correct copyright date of 2017:
   find . -name *.cpp -exec sed -i -e 's#(c) 2016#(c) 2017#g' {} \;
   find . -name *.h -exec sed -i -e 's#(c) 2016#(c) 2017#g' {} \;
2. Removed a .swp file somebody checked in by mistake
3. Removed release note file in Person Tracking: should using CHANGELOG.rst in ROS format
4. Fixed compile warning of broken dependency in SLAM CMake file
  • Loading branch information
mattcurfman committed Mar 14, 2017
1 parent d7726f4 commit 8ddfc42
Show file tree
Hide file tree
Showing 50 changed files with 48 additions and 68 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#include <iostream>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion realsense_ros_camera/src/camera_node.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#include <iostream>
#include <functional>
Expand Down
2 changes: 1 addition & 1 deletion realsense_ros_camera/test/camera_core.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#include <gtest/gtest.h>
#include "camera_core.h" // NOLINT(build/include)
Expand Down
2 changes: 1 addition & 1 deletion realsense_ros_camera/test/camera_core.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#pragma once
#ifndef CAMERA_CORE_H // NOLINT(build/header_guard)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved.
// Copyright(c) 2017 Intel Corporation. All Rights Reserved.

#include "ros/ros.h"

Expand Down
2 changes: 1 addition & 1 deletion realsense_ros_object/src/realsense_localization_nodelet.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved.
// Copyright(c) 2017 Intel Corporation. All Rights Reserved.

#pragma once
# ifndef RS_LOCALIZATION_NODELET
Expand Down
2 changes: 1 addition & 1 deletion realsense_ros_object/src/realsense_recognition_nodelet.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved.
// Copyright(c) 2017 Intel Corporation. All Rights Reserved.

#include <sys/types.h>
#include <sys/syscall.h>
Expand Down
2 changes: 1 addition & 1 deletion realsense_ros_object/src/realsense_recognition_nodelet.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved.
// Copyright(c) 2017 Intel Corporation. All Rights Reserved.

#pragma once
# ifndef RS_RECOGNITION_NODELET
Expand Down
2 changes: 1 addition & 1 deletion realsense_ros_object/src/realsense_tracking_nodelet.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved.
// Copyright(c) 2017 Intel Corporation. All Rights Reserved.

#include <ros/ros.h>

Expand Down
2 changes: 1 addition & 1 deletion realsense_ros_object/src/realsense_tracking_nodelet.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved.
// Copyright(c) 2017 Intel Corporation. All Rights Reserved.

#pragma once
# ifndef RS_TRACKING_NODELET
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved.
// Copyright(c) 2017 Intel Corporation. All Rights Reserved.

#include "ros/ros.h"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved.
// Copyright(c) 2017 Intel Corporation. All Rights Reserved.

#pragma once
# ifndef RS_ORMGR_NODELET
Expand Down
2 changes: 1 addition & 1 deletion realsense_ros_object/src/utils.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved.
// Copyright(c) 2017 Intel Corporation. All Rights Reserved.

#include "utils.h"
#include <rs_sdk.h>
Expand Down
2 changes: 1 addition & 1 deletion realsense_ros_object/src/utils.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved.
// Copyright(c) 2017 Intel Corporation. All Rights Reserved.

#pragma once
#include <librealsense/rs.hpp>
Expand Down
2 changes: 1 addition & 1 deletion realsense_ros_object/src/viewer/GUI_utils.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved.
// Copyright(c) 2017 Intel Corporation. All Rights Reserved.

#include "GUI_utils.h"
#include <iomanip>
Expand Down
2 changes: 1 addition & 1 deletion realsense_ros_object/src/viewer/GUI_utils.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved.
// Copyright(c) 2017 Intel Corporation. All Rights Reserved.

#pragma once

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved.
// Copyright(c) 2017 Intel Corporation. All Rights Reserved.

#include "ros/ros.h"
#include "realsense_ros_object/UI.h"
Expand Down
2 changes: 1 addition & 1 deletion realsense_ros_object/src/viewer/realsense_orview_nodelet.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved.
// Copyright(c) 2017 Intel Corporation. All Rights Reserved.

#pragma once
# ifndef RS_ORVIEW_NODELET
Expand Down
20 changes: 0 additions & 20 deletions realsense_ros_person/Release_Note.txt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#pragma once

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#include "PersonTrackingHelper.h"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#pragma once

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#include <ros/ros.h>
#include <rs/core/projection_interface.h>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#pragma once

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#pragma once
#include "ros/ros.h"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#include "PersonTrackingDefaultPublisher.h"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#pragma once

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#include <ros/console.h>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#pragma once

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#include "realsense_ros_person_nodelet.h"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#include <vector>
#include <cstring>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#include "PersonTrackingServer.h"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#pragma once
#include <ros/ros.h>
Expand Down
2 changes: 1 addition & 1 deletion realsense_ros_person/src/sample/PersonTrackingSample.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#include "PersonTrackingSample.h"

Expand Down
2 changes: 1 addition & 1 deletion realsense_ros_person/src/sample/PersonTrackingSample.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#pragma once
#include "ros/ros.h"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#include "PersonTrackingSample.h"

Expand Down
2 changes: 1 addition & 1 deletion realsense_ros_person/src/sample/TrackingRenderer/Colors.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved#pragma once
// Copyright(c) 2017 Intel Corporation. All Rights Reserved#pragma once

#include <opencv2/core/core.hpp>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#pragma once

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#pragma once
#include <opencv2/core/core.hpp>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#include <iomanip>
#include <opencv2/opencv.hpp>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#pragma once
#include "Viewer.h"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#include "Viewer.h"
#include <opencv2/highgui/highgui.hpp>
Expand Down
2 changes: 1 addition & 1 deletion realsense_ros_person/src/sample/TrackingRenderer/Viewer.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#pragma once
#include <opencv2/core/core.hpp>
Expand Down
2 changes: 1 addition & 1 deletion realsense_ros_slam/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ if (CATKIN_ENABLE_TESTING)
${catkin_LIBRARIES}
${GTEST_LIBRARIES}
)
add_dependencies(tests_slam ${PROJECT_NAME}_generate_messages_cpp ${PROJECT_NAME}_gencfg)
add_dependencies(tests_slam ${PROJECT_NAME}_generate_messages_cpp)
add_dependencies(tests_slam ${catkin_EXPORTED_TARGETS})
endif()

Expand Down
Binary file removed realsense_ros_slam/include/.ParamTypes.h.swp
Binary file not shown.
2 changes: 1 addition & 1 deletion realsense_ros_slam/include/2DMapCommon.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#pragma once

Expand Down
2 changes: 1 addition & 1 deletion realsense_ros_slam/include/ParamTypes.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#pragma once
#include "stdio.h"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#pragma once
#include <iostream>
Expand Down
2 changes: 1 addition & 1 deletion realsense_ros_slam/src/slam_nodelet.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#include "realsense_ros_slam/slam_nodelet.h"
#include <tf2/convert.h>
Expand Down
2 changes: 1 addition & 1 deletion realsense_ros_slam/test/slam_test.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: Apache 2.0. See LICENSE file in root directory.
// Copyright(c) 2016 Intel Corporation. All Rights Reserved
// Copyright(c) 2017 Intel Corporation. All Rights Reserved

#include <gtest/gtest.h>
#include <string> // Added to satisfy roslint
Expand Down

0 comments on commit 8ddfc42

Please sign in to comment.