Skip to content

Commit ca7fd21

Browse files
gineshidalgo99gineshidalgo99
committed
Includes: quotes by angle brackets (#61)
1 parent 16df5f3 commit ca7fd21

File tree

195 files changed

+390
-680
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

195 files changed

+390
-680
lines changed

‎.github/issue_template.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@ You might select multiple topics, delete the rest:
3939
**GPU model** (`nvidia-smi`):
4040
**Caffe version**: Default from OpenPose or custom version.
4141
**OpenCV version**: installed with `apt-get install libopencv-dev` or OpenCV 2.X or OpenCV 3.X.
42-
Generation mode (only for Ubuntu): Makefile + Makefile.config or CMake.
42+
Generation mode (only for Ubuntu): Makefile + Makefile.config (default) or CMake.
4343
Compiler (`gcc --version` on Ubuntu):

‎3rdparty/windows/getCaffe3rdparty.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ SET WGET_EXE=wget\wget.exe
66

77
:: Download temporary zip
88
echo ----- Downloading Caffe -----
9-
SET CAFEE_FOLDER=caffe\
10-
SET ZIP_NAME=caffe3rdparty_2017_07_11.zip
9+
SET CAFEE_FOLDER=caffe3rdparty\
10+
SET ZIP_NAME=caffe3rdparty_2017_07_14.zip
1111
SET ZIP_FULL_PATH=%CAFEE_FOLDER%%ZIP_NAME%
1212
%WGET_EXE% -c http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/windows/%ZIP_NAME% -P %CAFEE_FOLDER%
1313
echo:

‎doc/release_notes.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ OpenPose Library - Release Notes
8989
2. OpenPose is now completely portable across Windows 10 computers (with Nvidia graphic card).
9090
3. Added OpenPose 1.0.1 portable demo.
9191
4. Removed Python and some unnecessary boost dependencies on the VS project.
92+
5. Replaced all double quotes by angle brackets in include statements (issue #61).
9293
2. Main bugs fixed:
9394
1. Pycaffe can now be imported from Python.
9495
2. Fixed `Tutorial/Wrapper` VS linking errors.

‎include/openpose/core/common.hpp‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
11
#ifndef OPENPOSE_CORE_COMMON_HPP
22
#define OPENPOSE_CORE_COMMON_HPP
33

4-
#include "rectangle.hpp"
5-
#include "array.hpp"
6-
#include "macros.hpp"
7-
#include "point.hpp"
4+
// Std library most used classes
5+
#include <array>
6+
#include <memory> // std::shared_ptr
7+
#include <string>
8+
#include <vector>
9+
// OpenPose most used classes
10+
#include <openpose/core/array.hpp>
11+
#include <openpose/core/point.hpp>
12+
#include <openpose/core/rectangle.hpp>
13+
#include <openpose/utilities/errorAndLog.hpp>
14+
#include <openpose/utilities/profiler.hpp>
15+
// Macros at the end, otherwise circular dependency with array, point & rectangle
16+
#include <openpose/core/macros.hpp>
817

918
#endif // OPENPOSE_CORE_COMMON_HPP

‎include/openpose/core/cvMatToOpInput.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
#define OPENPOSE_CORE_CV_MAT_TO_OP_INPUT_HPP
33

44
#include <utility> // std::pair
5-
#include <vector>
65
#include <opencv2/core/core.hpp> // cv::Mat
7-
#include "common.hpp"
6+
#include <openpose/core/common.hpp>
87

98
namespace op
109
{

‎include/openpose/core/cvMatToOpOutput.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#ifndef OPENPOSE_CORE_CV_MAT_TO_OP_OUTPUT_HPP
22
#define OPENPOSE_CORE_CV_MAT_TO_OP_OUTPUT_HPP
33

4-
#include <vector>
54
#include <opencv2/core/core.hpp> // cv::Mat
6-
#include "common.hpp"
5+
#include <openpose/core/common.hpp>
76

87
namespace op
98
{

‎include/openpose/core/datum.hpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
#ifndef OPENPOSE_CORE_DATUM_HPP
22
#define OPENPOSE_CORE_DATUM_HPP
33

4-
#include <array>
5-
#include <memory> // std::shared_ptr
6-
#include <string>
74
#include <opencv2/core/core.hpp> // cv::Mat
8-
#include "common.hpp"
5+
#include <openpose/core/common.hpp>
96

107
namespace op
118
{

‎include/openpose/core/headers.hpp‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@
22
#define OPENPOSE_CORE_HEADERS_HPP
33

44
// core module
5-
#include "array.hpp"
6-
#include "common.hpp"
7-
#include "cvMatToOpInput.hpp"
8-
#include "cvMatToOpOutput.hpp"
9-
#include "datum.hpp"
10-
#include "enumClasses.hpp"
11-
#include "keypointScaler.hpp"
12-
#include "macros.hpp"
13-
#include "net.hpp"
14-
#include "netCaffe.hpp"
15-
#include "nmsBase.hpp"
16-
#include "nmsCaffe.hpp"
17-
#include "opOutputToCvMat.hpp"
18-
#include "point.hpp"
19-
#include "rectangle.hpp"
20-
#include "renderer.hpp"
21-
#include "resizeAndMergeBase.hpp"
22-
#include "resizeAndMergeCaffe.hpp"
23-
#include "wCvMatToOpInput.hpp"
24-
#include "wCvMatToOpOutput.hpp"
25-
#include "wKeypointScaler.hpp"
26-
#include "wOpOutputToCvMat.hpp"
5+
#include <openpose/core/array.hpp>
6+
#include <openpose/core/common.hpp>
7+
#include <openpose/core/cvMatToOpInput.hpp>
8+
#include <openpose/core/cvMatToOpOutput.hpp>
9+
#include <openpose/core/datum.hpp>
10+
#include <openpose/core/enumClasses.hpp>
11+
#include <openpose/core/keypointScaler.hpp>
12+
#include <openpose/core/macros.hpp>
13+
#include <openpose/core/net.hpp>
14+
#include <openpose/core/netCaffe.hpp>
15+
#include <openpose/core/nmsBase.hpp>
16+
#include <openpose/core/nmsCaffe.hpp>
17+
#include <openpose/core/opOutputToCvMat.hpp>
18+
#include <openpose/core/point.hpp>
19+
#include <openpose/core/rectangle.hpp>
20+
#include <openpose/core/renderer.hpp>
21+
#include <openpose/core/resizeAndMergeBase.hpp>
22+
#include <openpose/core/resizeAndMergeCaffe.hpp>
23+
#include <openpose/core/wCvMatToOpInput.hpp>
24+
#include <openpose/core/wCvMatToOpOutput.hpp>
25+
#include <openpose/core/wKeypointScaler.hpp>
26+
#include <openpose/core/wOpOutputToCvMat.hpp>
2727

2828
#endif // OPENPOSE_CORE_HEADERS_HPP

‎include/openpose/core/keypointScaler.hpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#ifndef OPENPOSE_CORE_KEYPOINT_SCALER_HPP
22
#define OPENPOSE_CORE_KEYPOINT_SCALER_HPP
33

4-
#include <vector>
5-
#include "common.hpp"
6-
#include "enumClasses.hpp"
4+
#include <openpose/core/common.hpp>
5+
#include <openpose/core/enumClasses.hpp>
76

87
namespace op
98
{

‎include/openpose/core/macros.hpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef OPENPOSE_UTILITIES_MACROS_HPP
2-
#define OPENPOSE_UTILITIES_MACROS_HPP
1+
#ifndef OPENPOSE_CORE_MACROS_HPP
2+
#define OPENPOSE_CORE_MACROS_HPP
33

44
#ifndef _WIN32
55
#define OP_API
@@ -47,6 +47,5 @@
4747
#include <openpose/core/datum.hpp>
4848
#include <openpose/core/point.hpp>
4949
#include <openpose/core/rectangle.hpp>
50-
#include <openpose/core/macros.hpp>
5150

52-
#endif // OPENPOSE_UTILITIES_MACROS_HPP
51+
#endif // OPENPOSE_CORE_MACROS_HPP

0 commit comments

Comments
 (0)