diff --git a/examples/fit-model-ceres.cpp b/examples/fit-model-ceres.cpp index f77d7ee98..4927a6a39 100644 --- a/examples/fit-model-ceres.cpp +++ b/examples/fit-model-ceres.cpp @@ -337,7 +337,7 @@ int main(int argc, char* argv[]) camera.calculate_projection_matrix(), camera.get_viewport()); ceres_example::draw_landmarks(outimg, indexed_landmarks); - const auto camera_euler_rotation = camera.get_euler_rotation(); + auto camera_euler_rotation = camera.get_euler_rotation(); fitting_log << "Pose fit with mean shape:\tYaw " << glm::degrees(camera_euler_rotation[1]) << ", Pitch " << glm::degrees(camera_euler_rotation[0]) << ", Roll " << glm::degrees(camera_euler_rotation[2]) << "; t & f: " << camera.translation_and_intrinsics diff --git a/include/eos/fitting/ceres_nonlinear.hpp b/include/eos/fitting/ceres_nonlinear.hpp index c2ba63e94..30503ba46 100644 --- a/include/eos/fitting/ceres_nonlinear.hpp +++ b/include/eos/fitting/ceres_nonlinear.hpp @@ -172,7 +172,7 @@ struct LandmarkCost // Todo: use get_opencv_viewport() from nonlin_cam_esti.hpp. const tvec4 viewport(0, image_height, image_width, -image_height); // OpenCV convention - tvec3 projected_point(); // Note: could avoid default construction by using a lambda and + tvec3 projected_point; // Note: could avoid default construction by using a lambda and // immediate invocation if (use_perspective) { @@ -868,8 +868,8 @@ class ModelFitter std::unique_ptr problem; private: - const morphablemodel::MorphableModel* const morphable_model; - const morphablemodel::Blendshapes* const blendshapes; + const morphablemodel::MorphableModel* morphable_model; + const morphablemodel::Blendshapes* blendshapes; }; } /* namespace fitting */ diff --git a/include/eos/render/texture_extraction.hpp b/include/eos/render/texture_extraction.hpp index e82494539..31773cba2 100644 --- a/include/eos/render/texture_extraction.hpp +++ b/include/eos/render/texture_extraction.hpp @@ -606,7 +606,7 @@ eos::core::Image4u extract_texture(const core::Mesh& mesh, glm::mat4x4 view_mode vector wnd_coords; // will contain [x_wnd, y_wnd, z_ndc, 1/w_clip] for (auto&& vtx : mesh.vertices) { - auto clip_coords = projection_matrix * view_model_matrix * glm::tvec4(vtx.x(), vtx.y(), vtx.z(), 1.0f); + auto clip_coords = projection_matrix * view_model_matrix * glm::vec4(vtx.x(), vtx.y(), vtx.z(), 1.0f); clip_coords = divide_by_w(clip_coords); const vec2 screen_coords = clip_to_screen_space(clip_coords.x, clip_coords.y, image.width(), image.height()); clip_coords.x = screen_coords.x;