Skip to content

Commit 8869122

Browse files
jim-bcomjim-bcom
authored
fix: add missing namespace to references to datastructure objects (#12)
1 parent 5c804a6 commit 8869122

File tree

3 files changed

+36
-36
lines changed

3 files changed

+36
-36
lines changed

‎IStereoCameraCalibration_grpcProxy.cpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ XPCFErrorCode IStereoCameraCalibration_grpcProxy::onConfigured()
4242
}
4343

4444

45-
SolAR::FrameworkReturnCode IStereoCameraCalibration_grpcProxy::calibrate(std::vector<SRef<datastructure::Image>> const& images1, std::vector<SRef<datastructure::Image>> const& images2, datastructure::CameraParameters const& camParams1, datastructure::CameraParameters const& camParams2, datastructure::Transform3Df& transformation, datastructure::RectificationParameters& rectParams1, datastructure::RectificationParameters& rectParams2)
45+
SolAR::FrameworkReturnCode IStereoCameraCalibration_grpcProxy::calibrate(std::vector<SRef<SolAR::datastructure::Image>> const& images1, std::vector<SRef<SolAR::datastructure::Image>> const& images2, SolAR::datastructure::CameraParameters const& camParams1, SolAR::datastructure::CameraParameters const& camParams2, SolAR::datastructure::Transform3Df& transformation, SolAR::datastructure::RectificationParameters& rectParams1, SolAR::datastructure::RectificationParameters& rectParams2)
4646
{
4747
::grpc::ClientContext context;
4848
::grpcIStereoCameraCalibration::calibrateRequest reqIn;
@@ -52,13 +52,13 @@ SolAR::FrameworkReturnCode IStereoCameraCalibration_grpcProxy::calibrate(std::v
5252
xpcf::grpcCompressType serverCompressionType = xpcf::prepareClientCompressionContext(context, proxyCompressionInfo);
5353
reqIn.set_grpcservercompressionformat (static_cast<int32_t>(serverCompressionType));
5454
#endif
55-
reqIn.set_images1(xpcf::serialize<std::vector<SRef<datastructure::Image>>>(images1));
56-
reqIn.set_images2(xpcf::serialize<std::vector<SRef<datastructure::Image>>>(images2));
57-
reqIn.set_camparams1(xpcf::serialize<datastructure::CameraParameters>(camParams1));
58-
reqIn.set_camparams2(xpcf::serialize<datastructure::CameraParameters>(camParams2));
59-
reqIn.set_transformation(xpcf::serialize<datastructure::Transform3Df>(transformation));
60-
reqIn.set_rectparams1(xpcf::serialize<datastructure::RectificationParameters>(rectParams1));
61-
reqIn.set_rectparams2(xpcf::serialize<datastructure::RectificationParameters>(rectParams2));
55+
reqIn.set_images1(xpcf::serialize<std::vector<SRef<SolAR::datastructure::Image>>>(images1));
56+
reqIn.set_images2(xpcf::serialize<std::vector<SRef<SolAR::datastructure::Image>>>(images2));
57+
reqIn.set_camparams1(xpcf::serialize<SolAR::datastructure::CameraParameters>(camParams1));
58+
reqIn.set_camparams2(xpcf::serialize<SolAR::datastructure::CameraParameters>(camParams2));
59+
reqIn.set_transformation(xpcf::serialize<SolAR::datastructure::Transform3Df>(transformation));
60+
reqIn.set_rectparams1(xpcf::serialize<SolAR::datastructure::RectificationParameters>(rectParams1));
61+
reqIn.set_rectparams2(xpcf::serialize<SolAR::datastructure::RectificationParameters>(rectParams2));
6262
#ifdef ENABLE_PROXY_TIMERS
6363
boost::posix_time::ptime start = boost::posix_time::microsec_clock::universal_time();
6464
std::cout << "====> IStereoCameraCalibration_grpcProxy::calibrate request sent at " << to_simple_string(start) << std::endl;
@@ -74,14 +74,14 @@ SolAR::FrameworkReturnCode IStereoCameraCalibration_grpcProxy::calibrate(std::v
7474
throw xpcf::RemotingException("grpcIStereoCameraCalibrationService","calibrate",static_cast<uint32_t>(grpcRemoteStatus.error_code()));
7575
}
7676

77-
transformation = xpcf::deserialize<datastructure::Transform3Df>(respOut.transformation());
78-
rectParams1 = xpcf::deserialize<datastructure::RectificationParameters>(respOut.rectparams1());
79-
rectParams2 = xpcf::deserialize<datastructure::RectificationParameters>(respOut.rectparams2());
77+
transformation = xpcf::deserialize<SolAR::datastructure::Transform3Df>(respOut.transformation());
78+
rectParams1 = xpcf::deserialize<SolAR::datastructure::RectificationParameters>(respOut.rectparams1());
79+
rectParams2 = xpcf::deserialize<SolAR::datastructure::RectificationParameters>(respOut.rectparams2());
8080
return static_cast<SolAR::FrameworkReturnCode>(respOut.xpcfgrpcreturnvalue());
8181
}
8282

8383

84-
SolAR::FrameworkReturnCode IStereoCameraCalibration_grpcProxy::rectify(datastructure::CameraParameters const& camParams1, datastructure::CameraParameters const& camParams2, datastructure::RectificationParameters& rectParams1, datastructure::RectificationParameters& rectParams2)
84+
SolAR::FrameworkReturnCode IStereoCameraCalibration_grpcProxy::rectify(SolAR::datastructure::CameraParameters const& camParams1, SolAR::datastructure::CameraParameters const& camParams2, SolAR::datastructure::RectificationParameters& rectParams1, SolAR::datastructure::RectificationParameters& rectParams2)
8585
{
8686
::grpc::ClientContext context;
8787
::grpcIStereoCameraCalibration::rectifyRequest reqIn;
@@ -91,10 +91,10 @@ SolAR::FrameworkReturnCode IStereoCameraCalibration_grpcProxy::rectify(datastru
9191
xpcf::grpcCompressType serverCompressionType = xpcf::prepareClientCompressionContext(context, proxyCompressionInfo);
9292
reqIn.set_grpcservercompressionformat (static_cast<int32_t>(serverCompressionType));
9393
#endif
94-
reqIn.set_camparams1(xpcf::serialize<datastructure::CameraParameters>(camParams1));
95-
reqIn.set_camparams2(xpcf::serialize<datastructure::CameraParameters>(camParams2));
96-
reqIn.set_rectparams1(xpcf::serialize<datastructure::RectificationParameters>(rectParams1));
97-
reqIn.set_rectparams2(xpcf::serialize<datastructure::RectificationParameters>(rectParams2));
94+
reqIn.set_camparams1(xpcf::serialize<SolAR::datastructure::CameraParameters>(camParams1));
95+
reqIn.set_camparams2(xpcf::serialize<SolAR::datastructure::CameraParameters>(camParams2));
96+
reqIn.set_rectparams1(xpcf::serialize<SolAR::datastructure::RectificationParameters>(rectParams1));
97+
reqIn.set_rectparams2(xpcf::serialize<SolAR::datastructure::RectificationParameters>(rectParams2));
9898
#ifdef ENABLE_PROXY_TIMERS
9999
boost::posix_time::ptime start = boost::posix_time::microsec_clock::universal_time();
100100
std::cout << "====> IStereoCameraCalibration_grpcProxy::rectify request sent at " << to_simple_string(start) << std::endl;
@@ -110,8 +110,8 @@ SolAR::FrameworkReturnCode IStereoCameraCalibration_grpcProxy::rectify(datastru
110110
throw xpcf::RemotingException("grpcIStereoCameraCalibrationService","rectify",static_cast<uint32_t>(grpcRemoteStatus.error_code()));
111111
}
112112

113-
rectParams1 = xpcf::deserialize<datastructure::RectificationParameters>(respOut.rectparams1());
114-
rectParams2 = xpcf::deserialize<datastructure::RectificationParameters>(respOut.rectparams2());
113+
rectParams1 = xpcf::deserialize<SolAR::datastructure::RectificationParameters>(respOut.rectparams1());
114+
rectParams2 = xpcf::deserialize<SolAR::datastructure::RectificationParameters>(respOut.rectparams2());
115115
return static_cast<SolAR::FrameworkReturnCode>(respOut.xpcfgrpcreturnvalue());
116116
}
117117

‎IStereoCameraCalibration_grpcProxy.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ class IStereoCameraCalibration_grpcProxy: public org::bcom::xpcf::ConfigurableB
2222
void unloadComponent () override final;
2323
org::bcom::xpcf::XPCFErrorCode onConfigured() override;
2424

25-
SolAR::FrameworkReturnCode calibrate(std::vector<SRef<datastructure::Image>> const& images1, std::vector<SRef<datastructure::Image>> const& images2, datastructure::CameraParameters const& camParams1, datastructure::CameraParameters const& camParams2, datastructure::Transform3Df& transformation, datastructure::RectificationParameters& rectParams1, datastructure::RectificationParameters& rectParams2) override;
26-
SolAR::FrameworkReturnCode rectify(datastructure::CameraParameters const& camParams1, datastructure::CameraParameters const& camParams2, datastructure::RectificationParameters& rectParams1, datastructure::RectificationParameters& rectParams2) override;
25+
SolAR::FrameworkReturnCode calibrate(std::vector<SRef<SolAR::datastructure::Image>> const& images1, std::vector<SRef<SolAR::datastructure::Image>> const& images2, SolAR::datastructure::CameraParameters const& camParams1, SolAR::datastructure::CameraParameters const& camParams2, SolAR::datastructure::Transform3Df& transformation, SolAR::datastructure::RectificationParameters& rectParams1, SolAR::datastructure::RectificationParameters& rectParams2) override;
26+
SolAR::FrameworkReturnCode rectify(SolAR::datastructure::CameraParameters const& camParams1, SolAR::datastructure::CameraParameters const& camParams2, SolAR::datastructure::RectificationParameters& rectParams1, SolAR::datastructure::RectificationParameters& rectParams2) override;
2727

2828

2929
private:

‎IStereoCameraCalibration_grpcServer.cpp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,17 @@ ::grpc::Status IStereoCameraCalibration_grpcServer::grpcIStereoCameraCalibration
5151
boost::posix_time::ptime start = boost::posix_time::microsec_clock::universal_time();
5252
std::cout << "====> IStereoCameraCalibration_grpcServer::calibrate request received at " << to_simple_string(start) << std::endl;
5353
#endif
54-
std::vector<SRef<datastructure::Image>> images1 = xpcf::deserialize<std::vector<SRef<datastructure::Image>>>(request->images1());
55-
std::vector<SRef<datastructure::Image>> images2 = xpcf::deserialize<std::vector<SRef<datastructure::Image>>>(request->images2());
56-
datastructure::CameraParameters camParams1 = xpcf::deserialize<datastructure::CameraParameters>(request->camparams1());
57-
datastructure::CameraParameters camParams2 = xpcf::deserialize<datastructure::CameraParameters>(request->camparams2());
58-
datastructure::Transform3Df transformation = xpcf::deserialize<datastructure::Transform3Df>(request->transformation());
59-
datastructure::RectificationParameters rectParams1 = xpcf::deserialize<datastructure::RectificationParameters>(request->rectparams1());
60-
datastructure::RectificationParameters rectParams2 = xpcf::deserialize<datastructure::RectificationParameters>(request->rectparams2());
54+
std::vector<SRef<SolAR::datastructure::Image>> images1 = xpcf::deserialize<std::vector<SRef<SolAR::datastructure::Image>>>(request->images1());
55+
std::vector<SRef<SolAR::datastructure::Image>> images2 = xpcf::deserialize<std::vector<SRef<SolAR::datastructure::Image>>>(request->images2());
56+
SolAR::datastructure::CameraParameters camParams1 = xpcf::deserialize<SolAR::datastructure::CameraParameters>(request->camparams1());
57+
SolAR::datastructure::CameraParameters camParams2 = xpcf::deserialize<SolAR::datastructure::CameraParameters>(request->camparams2());
58+
SolAR::datastructure::Transform3Df transformation = xpcf::deserialize<SolAR::datastructure::Transform3Df>(request->transformation());
59+
SolAR::datastructure::RectificationParameters rectParams1 = xpcf::deserialize<SolAR::datastructure::RectificationParameters>(request->rectparams1());
60+
SolAR::datastructure::RectificationParameters rectParams2 = xpcf::deserialize<SolAR::datastructure::RectificationParameters>(request->rectparams2());
6161
SolAR::FrameworkReturnCode returnValue = m_xpcfComponent->calibrate(images1, images2, camParams1, camParams2, transformation, rectParams1, rectParams2);
62-
response->set_transformation(xpcf::serialize<datastructure::Transform3Df>(transformation));
63-
response->set_rectparams1(xpcf::serialize<datastructure::RectificationParameters>(rectParams1));
64-
response->set_rectparams2(xpcf::serialize<datastructure::RectificationParameters>(rectParams2));
62+
response->set_transformation(xpcf::serialize<SolAR::datastructure::Transform3Df>(transformation));
63+
response->set_rectparams1(xpcf::serialize<SolAR::datastructure::RectificationParameters>(rectParams1));
64+
response->set_rectparams2(xpcf::serialize<SolAR::datastructure::RectificationParameters>(rectParams2));
6565
response->set_xpcfgrpcreturnvalue(static_cast<int32_t>(returnValue));
6666
#ifdef ENABLE_SERVER_TIMERS
6767
boost::posix_time::ptime end = boost::posix_time::microsec_clock::universal_time();
@@ -83,13 +83,13 @@ ::grpc::Status IStereoCameraCalibration_grpcServer::grpcIStereoCameraCalibration
8383
boost::posix_time::ptime start = boost::posix_time::microsec_clock::universal_time();
8484
std::cout << "====> IStereoCameraCalibration_grpcServer::rectify request received at " << to_simple_string(start) << std::endl;
8585
#endif
86-
datastructure::CameraParameters camParams1 = xpcf::deserialize<datastructure::CameraParameters>(request->camparams1());
87-
datastructure::CameraParameters camParams2 = xpcf::deserialize<datastructure::CameraParameters>(request->camparams2());
88-
datastructure::RectificationParameters rectParams1 = xpcf::deserialize<datastructure::RectificationParameters>(request->rectparams1());
89-
datastructure::RectificationParameters rectParams2 = xpcf::deserialize<datastructure::RectificationParameters>(request->rectparams2());
86+
SolAR::datastructure::CameraParameters camParams1 = xpcf::deserialize<SolAR::datastructure::CameraParameters>(request->camparams1());
87+
SolAR::datastructure::CameraParameters camParams2 = xpcf::deserialize<SolAR::datastructure::CameraParameters>(request->camparams2());
88+
SolAR::datastructure::RectificationParameters rectParams1 = xpcf::deserialize<SolAR::datastructure::RectificationParameters>(request->rectparams1());
89+
SolAR::datastructure::RectificationParameters rectParams2 = xpcf::deserialize<SolAR::datastructure::RectificationParameters>(request->rectparams2());
9090
SolAR::FrameworkReturnCode returnValue = m_xpcfComponent->rectify(camParams1, camParams2, rectParams1, rectParams2);
91-
response->set_rectparams1(xpcf::serialize<datastructure::RectificationParameters>(rectParams1));
92-
response->set_rectparams2(xpcf::serialize<datastructure::RectificationParameters>(rectParams2));
91+
response->set_rectparams1(xpcf::serialize<SolAR::datastructure::RectificationParameters>(rectParams1));
92+
response->set_rectparams2(xpcf::serialize<SolAR::datastructure::RectificationParameters>(rectParams2));
9393
response->set_xpcfgrpcreturnvalue(static_cast<int32_t>(returnValue));
9494
#ifdef ENABLE_SERVER_TIMERS
9595
boost::posix_time::ptime end = boost::posix_time::microsec_clock::universal_time();

0 commit comments

Comments
 (0)