p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Temporary fix for windows link errors.

This commit is contained in:
Axel1092 2021-06-01 17:02:45 +02:00 committed by Axel1092
parent 68d75a9874
commit 28a044de99
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PythonAPI/carla/source/libcarla/SensorData.cpp
View File

@ -210,7 +210,7 @@ static void ConvertImage(T &self, EColorConverter cc) {
throw std::invalid_argument("invalid color converter!"); throw std::invalid_argument("invalid color converter!");
} }
} }
#ifndef _WIN32
// method to convert optical flow images to rgb // method to convert optical flow images to rgb
static boost::python::numpy::ndarray ColorCodedFlow ( static boost::python::numpy::ndarray ColorCodedFlow (
carla::sensor::data::OpticalFlowImage& image) { carla::sensor::data::OpticalFlowImage& image) {
@ -317,6 +317,7 @@ static boost::python::numpy::ndarray ColorCodedFlow (
bn::dtype type = bn::dtype::get_builtin<uint8_t>(); bn::dtype type = bn::dtype::get_builtin<uint8_t>();
return bn::from_data(&result[0], type, shape, stride, bp::object()).copy(); return bn::from_data(&result[0], type, shape, stride, bp::object()).copy();
} }
#endif
template <typename T> template <typename T>
static std::string SaveImageToDisk(T &self, std::string path, EColorConverter cc) { static std::string SaveImageToDisk(T &self, std::string path, EColorConverter cc) {
@ -396,7 +397,9 @@ void export_sensor_data() {
.add_property("height", &csd::OpticalFlowImage::GetHeight) .add_property("height", &csd::OpticalFlowImage::GetHeight)
.add_property("fov", &csd::OpticalFlowImage::GetFOVAngle) .add_property("fov", &csd::OpticalFlowImage::GetFOVAngle)
.add_property("raw_data", &GetRawDataAsBuffer<csd::OpticalFlowImage>) .add_property("raw_data", &GetRawDataAsBuffer<csd::OpticalFlowImage>)
#ifndef _WIN32
.def("get_color_coded_flow", &ColorCodedFlow) .def("get_color_coded_flow", &ColorCodedFlow)
#endif
.def("__len__", &csd::OpticalFlowImage::size) .def("__len__", &csd::OpticalFlowImage::size)
.def("__iter__", iterator<csd::OpticalFlowImage>()) .def("__iter__", iterator<csd::OpticalFlowImage>())
.def("__getitem__", +[](const csd::OpticalFlowImage &self, size_t pos) -> csd::OpticalFlowPixel { .def("__getitem__", +[](const csd::OpticalFlowImage &self, size_t pos) -> csd::OpticalFlowPixel {

5
PythonAPI/carla/source/libcarla/libcarla.cpp
View File

@ -209,8 +209,9 @@ static auto MakeCallback(boost::python::object callback) {
} }
}; };
} }
#ifndef _WIN32
#include <boost/python/numpy.hpp> #include <boost/python/numpy.hpp>
#endif
#include "Geom.cpp" #include "Geom.cpp"
#include "Actor.cpp" #include "Actor.cpp"
@ -238,7 +239,9 @@ BOOST_PYTHON_MODULE(libcarla) {
#if PY_MAJOR_VERSION < 3 || PY_MINOR_VERSION < 7 #if PY_MAJOR_VERSION < 3 || PY_MINOR_VERSION < 7
PyEval_InitThreads(); PyEval_InitThreads();
#endif #endif
#ifndef _WIN32
boost::python::numpy::initialize(); boost::python::numpy::initialize();
#endif
scope().attr("__path__") = "libcarla"; scope().attr("__path__") = "libcarla";
export_geom(); export_geom();
export_control(); export_control();