Skip to content

Commit

Permalink
Header call moved to first line of each cpp
Browse files Browse the repository at this point in the history
  • Loading branch information
gineshidalgo99 committed Oct 7, 2019
1 parent d5d3427 commit 41d8c08
Show file tree
Hide file tree
Showing 54 changed files with 55 additions and 53 deletions.
1 change: 1 addition & 0 deletions doc/release_notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,7 @@ OpenPose Library - Release Notes
1. Headers do not contain any 3rd-party library includes nor functions. This way, OpenPose can be exported without needing 3rd-party includes nor static library files (e.g., lib files in Windows), allowing people to use their own versions of OpenCV, Eigen, etc. without conflicting with OpenPose. Dynamic library files (e.g., `dll` files in Windows, `so` in Ubuntu) are still required.
2. Created the `openpose_private` directory with some internal headers that, if exported with OpenPose, would require including 3rd-party headers and static library files.
3. Default OpenCV version for Windows upgraded to version 4.1.1, extracted from their oficial website: section `Releases`, subsection `OpenCV - 4.1.1`, `Windows` version.
4. In all `*.cpp` files, their include of their analog `*.hpp` file has been moved to the first line of those `*.cpp` files to slightly speed up compiling time.
2. Functions or parameters renamed:
1. All headers moved into `openpose_private` and all 3rd-party library calls in headers.
3. Main bugs fixed:
Expand Down
1 change: 1 addition & 0 deletions include/openpose/pose/poseGpuRenderer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <openpose/pose/enumClasses.hpp>
#include <openpose/pose/poseExtractorNet.hpp>
#include <openpose/pose/poseParameters.hpp>
#include <openpose/pose/poseParametersRender.hpp>
#include <openpose/pose/poseRenderer.hpp>

namespace op
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/3d/jointAngleEstimation.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#ifdef USE_3D_ADAM_MODEL
#include <openpose/3d/jointAngleEstimation.hpp>
#ifdef USE_3D_ADAM_MODEL
#include <adam/FitToBody.h>
#include <adam/totalmodel.h>
#endif
#include <openpose/3d/jointAngleEstimation.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/core/arrayCpuGpu.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <openpose/core/arrayCpuGpu.hpp>
#ifdef USE_CAFFE
#include <caffe/blob.hpp>
#endif
#include <openpose/utilities/errorAndLog.hpp>
#include <openpose/core/arrayCpuGpu.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/core/datum.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <openpose/utilities/errorAndLog.hpp>
#include <openpose/core/datum.hpp>
#include <openpose/utilities/errorAndLog.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/core/gpuRenderer.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <openpose/core/gpuRenderer.hpp>
#ifdef USE_CUDA
#include <cuda.h>
#include <cuda_runtime_api.h>
#endif
#include <openpose/core/gpuRenderer.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/core/keypointScaler.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <openpose/utilities/keypoint.hpp>
#include <openpose/core/keypointScaler.hpp>
#include <openpose/utilities/keypoint.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/core/point.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <openpose/utilities/errorAndLog.hpp>
#include <openpose/core/point.hpp>
#include <ostream>
#include <openpose/utilities/errorAndLog.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/core/rectangle.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <openpose/utilities/errorAndLog.hpp>
#include <openpose/core/rectangle.hpp>
#include <openpose/utilities/errorAndLog.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/core/scaleAndSizeExtractor.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <openpose/core/scaleAndSizeExtractor.hpp>
#include <openpose/utilities/fastMath.hpp>
#include <openpose/utilities/openCv.hpp> // resizeGetScaleFactor
#include <openpose/core/scaleAndSizeExtractor.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/core/verbosePrinter.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <openpose/utilities/fastMath.hpp>
#include <openpose/core/verbosePrinter.hpp>
#include <openpose/utilities/fastMath.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/face/faceCpuRenderer.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <openpose/face/renderFace.hpp>
#include <openpose/face/faceCpuRenderer.hpp>
#include <openpose/face/renderFace.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/face/faceDetector.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <openpose/face/faceDetector.hpp>
#include <openpose/pose/poseParameters.hpp>
#include <openpose/utilities/check.hpp>
#include <openpose/utilities/keypoint.hpp>
#include <openpose/face/faceDetector.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/face/faceExtractorNet.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <openpose/utilities/check.hpp>
#include <openpose/face/faceExtractorNet.hpp>
#include <openpose/utilities/check.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/face/faceGpuRenderer.cpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#include <openpose/face/faceGpuRenderer.hpp>
#ifdef USE_CUDA
#include <cuda.h>
#include <cuda_runtime_api.h>
#endif
#include <openpose/face/renderFace.hpp>
#include <openpose/gpu/cuda.hpp>
#include <openpose/face/faceGpuRenderer.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/face/faceRenderer.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <openpose/face/faceRenderer.hpp>
#include <openpose/face/renderFace.hpp>
#include <openpose/utilities/keypoint.hpp>
#include <openpose/face/faceRenderer.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/face/renderFace.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <openpose/face/renderFace.hpp>
#include <openpose/face/faceParameters.hpp>
#include <openpose/utilities/fastMath.hpp>
#include <openpose/utilities/keypoint.hpp>
#include <openpose/face/renderFace.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/filestream/bvhSaver.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifdef USE_3D_ADAM_MODEL
#include <openpose/filestream/bvhSaver.hpp>
#ifdef USE_3D_ADAM_MODEL
#include <adam/BVHWriter.h>
#endif
#include <openpose/filestream/bvhSaver.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/filestream/cocoJsonSaver.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <openpose/filestream/cocoJsonSaver.hpp>
#include <numeric> // std::iota
#include <openpose/pose/poseParametersRender.hpp>
#include <openpose/utilities/fileSystem.hpp>
#include <openpose/utilities/string.hpp>
#include <openpose/filestream/cocoJsonSaver.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/filestream/fileSaver.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <openpose/utilities/fileSystem.hpp>
#include <openpose/filestream/fileSaver.hpp>
#include <openpose/utilities/fileSystem.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/filestream/fileStream.cpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#include <openpose/filestream/fileStream.hpp>
#include <fstream> // std::ifstream, std::ofstream
#include <opencv2/highgui/highgui.hpp> // cv::imread
#include <openpose/utilities/fastMath.hpp>
#include <openpose/utilities/fileSystem.hpp>
#include <openpose/utilities/string.hpp>
#include <openpose/filestream/jsonOfstream.hpp>
#include <openpose/filestream/fileStream.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/filestream/heatMapSaver.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <openpose/filestream/heatMapSaver.hpp>
#include <openpose/utilities/openCv.hpp>
#include <openpose/filestream/fileStream.hpp>
#include <openpose/filestream/heatMapSaver.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/filestream/imageSaver.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <openpose/filestream/fileStream.hpp>
#include <openpose/filestream/imageSaver.hpp>
#include <openpose/filestream/fileStream.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/filestream/keypointSaver.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <openpose/filestream/fileStream.hpp>
#include <openpose/filestream/keypointSaver.hpp>
#include <openpose/filestream/fileStream.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/filestream/peopleJsonSaver.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <openpose/filestream/fileStream.hpp>
#include <openpose/filestream/peopleJsonSaver.hpp>
#include <openpose/filestream/fileStream.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/filestream/udpSender.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <openpose/filestream/udpSender.hpp>
#ifdef USE_ASIO
#include <iostream>
#include <asio.hpp>
Expand All @@ -6,7 +7,6 @@
#include <Eigen/Core>
#endif
#include <openpose/filestream/fileStream.hpp>
#include <openpose/filestream/udpSender.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/filestream/videoSaver.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <openpose/filestream/videoSaver.hpp>
#include <opencv2/highgui/highgui.hpp> // cv::VideoWriter
#include <openpose/filestream/imageSaver.hpp>
#include <openpose/utilities/fileSystem.hpp>
#include <openpose/utilities/string.hpp>
#include <openpose/filestream/videoSaver.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/gpu/cuda.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include <openpose/gpu/cuda.hpp>
#ifdef USE_CUDA
#include <cuda.h>
#include <cuda_runtime.h>
#include <openpose/utilities/fastMath.hpp>
#endif
#include <openpose/gpu/cuda.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/gpu/cuda.cu
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include <openpose/gpu/cuda.hpp>
#ifdef USE_CUDA
#include <cuda.h>
#include <cuda_runtime.h>
#include <openpose_private/gpu/cuda.hu>
#endif
#include <openpose/gpu/cuda.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/gui/gui.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <openpose/gui/gui.hpp>
#include <opencv2/highgui/highgui.hpp> // cv::waitKey
#include <openpose/filestream/fileStream.hpp>
#include <openpose/utilities/check.hpp>
#include <openpose/gui/gui.hpp>

namespace op
{
Expand Down
4 changes: 2 additions & 2 deletions src/openpose/gui/gui3D.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include <atomic>
#include <openpose/gui/gui3D.hpp>
#include <atomic>
#include <mutex>
#include <stdio.h>
#ifdef USE_3D_RENDERER
Expand All @@ -11,7 +12,6 @@
#include <openpose/hand/handParameters.hpp>
#include <openpose/pose/poseParameters.hpp>
#include <openpose/utilities/keypoint.hpp>
#include <openpose/gui/gui3D.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/gui/guiAdam.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#ifdef USE_3D_ADAM_MODEL
#include <openpose/gui/guiAdam.hpp>
#ifdef USE_3D_ADAM_MODEL
#include <adam/KinematicModel.h>
#include <adam/Renderer.h>
Expand All @@ -8,7 +9,6 @@
#endif
#include <openpose/3d/jointAngleEstimation.hpp>
#include <openpose/filestream/videoSaver.hpp>
#include <openpose/gui/guiAdam.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/hand/handCpuRenderer.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <openpose/hand/renderHand.hpp>
#include <openpose/hand/handCpuRenderer.hpp>
#include <openpose/hand/renderHand.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/hand/handDetector.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <openpose/hand/handDetector.hpp>
#include <openpose/pose/poseParameters.hpp>
#include <openpose/utilities/check.hpp>
#include <openpose/utilities/fastMath.hpp>
#include <openpose/utilities/keypoint.hpp>
#include <openpose/hand/handDetector.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/hand/handDetectorFromTxt.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <openpose/hand/handDetectorFromTxt.hpp>
#include <openpose/filestream/fileStream.hpp>
#include <openpose/utilities/fileSystem.hpp>
#include <openpose/hand/handDetectorFromTxt.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/hand/handExtractorNet.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <openpose/utilities/check.hpp>
#include <openpose/hand/handExtractorNet.hpp>
#include <openpose/utilities/check.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/hand/handGpuRenderer.cpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#include <openpose/hand/handGpuRenderer.hpp>
#ifdef USE_CUDA
#include <cuda.h>
#include <cuda_runtime_api.h>
#endif
#include <openpose/gpu/cuda.hpp>
#include <openpose/hand/renderHand.hpp>
#include <openpose/hand/handGpuRenderer.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/hand/handRenderer.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <openpose/utilities/keypoint.hpp>
#include <openpose/hand/handRenderer.hpp>
#include <openpose/utilities/keypoint.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/hand/renderHand.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <openpose/hand/renderHand.hpp>
#include <openpose/hand/handParameters.hpp>
#include <openpose/utilities/fastMath.hpp>
#include <openpose/utilities/keypoint.hpp>
#include <openpose/hand/renderHand.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/net/bodyPartConnectorBase.cu
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <openpose/net/bodyPartConnectorBase.hpp>
#include <openpose/gpu/cuda.hpp>
#include <openpose/pose/poseParameters.hpp>
#include <openpose/utilities/fastMath.hpp>
#include <openpose/net/bodyPartConnectorBase.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/net/maximumBase.cu
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <openpose/net/maximumBase.hpp>
#include <thrust/device_ptr.h>
#include <thrust/extrema.h>
#include <openpose/gpu/cuda.hpp>
#include <openpose/gpu/cuda.hpp>
#include <openpose/net/maximumBase.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/net/maximumCaffe.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <openpose/net/maximumCaffe.hpp>
#ifdef USE_CAFFE
#include <caffe/blob.hpp>
#endif
#include <openpose/net/maximumBase.hpp>
#include <openpose/net/maximumCaffe.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/net/nmsBase.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <opencv2/opencv.hpp>
#include <openpose/net/nmsBase.hpp>
#include <opencv2/opencv.hpp>

namespace op
{
Expand Down
2 changes: 1 addition & 1 deletion src/openpose/pose/poseCpuRenderer.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <openpose/pose/poseCpuRenderer.hpp>
#include <openpose/pose/renderPose.hpp>
#include <openpose/utilities/keypoint.hpp>
#include <openpose/pose/poseCpuRenderer.hpp>

namespace op
{
Expand Down
Loading

0 comments on commit 41d8c08

Please sign in to comment.