提交 f7a03b68 编写于 作者: G gineshidalgo99

Removed warnings

上级 3cf6fb0b
......@@ -205,7 +205,7 @@ if (UNIX AND NOT APPLE)
option(WITH_CERES "Add Ceres support for advanced 3-D reconstruction." OFF)
endif (UNIX AND NOT APPLE)
option(WITH_FLIR_CAMERA "Add FLIR (formerly Point Grey) camera code (requires Spinnaker SDK already installed)." OFF)
option(WITH_3D_ADAM_MODEL "Add 3-D Adam model (requires OpenGL, Ceres, Eigen, OpenMP, FreeImage, GLEW, and IGL already installed)." OFF)
# option(WITH_3D_ADAM_MODEL "Add 3-D Adam model (requires OpenGL, Ceres, Eigen, OpenMP, FreeImage, GLEW, and IGL already installed)." OFF)
# Set the acceleration library
if (WIN32 OR APPLE)
......@@ -229,7 +229,7 @@ option(DOWNLOAD_FACE_MODEL "Download face model." ON)
option(DOWNLOAD_HAND_MODEL "Download hand model." ON)
# Asio
option(USE_ASIO "Include Asio header-only library." OFF)
# option(USE_ASIO "Include Asio header-only library." OFF)
# More options
option(BUILD_EXAMPLES "Build OpenPose examples." ON)
......
......@@ -17,7 +17,7 @@
## Features
- **Functionality**:
- **2D real-time multi-person keypoint detection**:
- 15 or **18-keypoint body keypoint estimation**. **Running time invariant to number of detected people**.
- 15 or 18 or **25-keypoint body/foot keypoint estimation**. **Running time invariant to number of detected people**.
- **2x21-keypoint hand keypoint estimation**. Currently, **running time depends** on **number of detected people**.
- **70-keypoint face keypoint estimation**. Currently, **running time depends** on **number of detected people**.
- **3D real-time multi-person keypoint detection**:
......@@ -36,9 +36,13 @@
## Latest Features
- Jun 2018: [**Mac OSX version (CPU)**](doc/installation.md)!
- Jun 2018: [**Combined body-foot model released! Faster and more accurate.**](doc/installation.md)!
- Jun 2018: [**Python version**](doc/calibration_demo.md) released!
- Jun 2018: [**AMD graphic card version**](doc/calibration_demo.md) released!
- Jun 2018: [**Calibration toolbox**](doc/calibration_demo.md) released!
- Jun 2018: [**Mac OSX version (CPU)**](doc/installation.md) released!
- Mar 2018: [**CPU version**](doc/installation.md#cpu-version)!
- Mar 2018: Improved [**3-D keypoint reconstruction module**](doc/3d_reconstruction_demo.md) (from multiple camera views)!
- Mar 2018: [**3-D keypoint reconstruction module**](doc/3d_reconstruction_demo.md) (from multiple camera views)!
- Sep 2017: [**CMake**](doc/installation.md) installer and **IP camera** support!
- Jul 2017: [**Windows portable binaries and demo**](https://github.com/CMU-Perceptual-Computing-Lab/openpose/releases)!
- Jul 2017: **Hands** released!
......
OpenPose Library - Latest Released Features
====================================
- Jun 2018: [**Mac OSX version (CPU)**](./installation.md)!
- Jun 2018: [**Combined body-foot model released! Faster and more accurate.**](./installation.md)!
- Jun 2018: [**AMD graphic card version**](./calibration_demo.md) released!
- Jun 2018: [**Calibration toolbox**](./calibration_demo.md) released!
- Jun 2018: [**Mac OSX version (CPU)**](./installation.md) released!
- Mar 2018: [**CPU version**](./installation.md#cpu-version)!
- Mar 2018: Improved [**3-D keypoint reconstruction module**](./3d_reconstruction_demo.md) (from multiple camera views)!
- Mar 2018: [**3-D keypoint reconstruction module**](./3d_reconstruction_demo.md) (from multiple camera views)!
- Sep 2017: [**CMake**](./installation.md) installer and **IP camera** support!
- Jul 2017: [**Windows portable binaries and demo**](https://github.com/CMU-Perceptual-Computing-Lab/openpose/releases)!
- Jul 2017: **Hands** released!
......
......@@ -165,9 +165,9 @@ namespace op
// Basic triangulation
triangulate(reconstructedPoint, cameraMatrices, pointsOnEachCamera);
const auto projectionErrorLinear = calcReprojectionError(reconstructedPoint, cameraMatrices, pointsOnEachCamera);
#ifdef USE_CERES
const auto projectionErrorLinear = calcReprojectionError(reconstructedPoint, cameraMatrices, pointsOnEachCamera);
// Empirically detected that reprojection error (for 4 cameras) only minimizes the error if initial
// project error > ~2.5, and that it improves more the higher that error actually is
// Therefore, we disable it for already accurate samples in order to get both:
......@@ -227,6 +227,8 @@ namespace op
// / double(cameraMatrices.size()));
// return reprojectionErrorDecrease;
}
#else
UNUSED(reprojectionMaxAcceptable);
#endif
// assert(reconstructedPoint.at<double>(3) == 1.);
......
......@@ -164,7 +164,10 @@ namespace op
else if (castedKey=='4')
elementToRender = ElementToRender::AddPAFs;
else
{
error("Unknown ElementToRender value.", __LINE__, __FUNCTION__, __FILE__);
elementToRender = ElementToRender::Skeleton;
}
for (auto& renderer : renderers)
renderer->setElementToRender(elementToRender);
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册