修复编译错误或者报警

PtzNew
Matthew 3 months ago
parent 7b0c32e7b9
commit 09dae14725

@ -2509,8 +2509,8 @@ void DngCreator::writeInputStream(std::vector<uint8_t>& outStream,
uint64_t uOffset = static_cast<uint32_t>(offset); uint64_t uOffset = static_cast<uint32_t>(offset);
ALOGV("%s: nativeWriteInputStream called with: width=%u, height=%u, " ALOGV("%s: nativeWriteInputStream called with: width=%u, height=%u, "
"rowStride=%d, pixStride=%d, offset=%" PRId64, __FUNCTION__, uWidth, "rowStride=%d, pixStride=%d, offset=%lld", __FUNCTION__, uWidth,
uHeight, rowStride, pixStride, offset); uHeight, rowStride, pixStride, (int64_t)offset);
ByteVectorOutput out(outStream); ByteVectorOutput out(outStream);
// std::vector<uint8_t>& out = outStream; // std::vector<uint8_t>& out = outStream;
@ -2578,8 +2578,8 @@ void DngCreator::writeInputBuffer(std::vector<uint8_t>& outStream,
uint64_t uOffset = static_cast<uint32_t>(offset); uint64_t uOffset = static_cast<uint32_t>(offset);
ALOGV("%s: nativeWriteInputStream called with: width=%u, height=%u, " ALOGV("%s: nativeWriteInputStream called with: width=%u, height=%u, "
"rowStride=%d, pixStride=%d, offset=%" PRId64, __FUNCTION__, uWidth, "rowStride=%d, pixStride=%d, offset=%lld", __FUNCTION__, uWidth,
uHeight, rowStride, pixStride, offset); uHeight, rowStride, pixStride, (int64_t)offset);
ByteVectorOutput out(outStream); ByteVectorOutput out(outStream);
// std::vector<uint8_t>& out = outStream; // std::vector<uint8_t>& out = outStream;

@ -445,7 +445,7 @@ uint8_t getdevtype(int devno)
return devparam[devno].ProtocolIdx; return devparam[devno].ProtocolIdx;
} }
// 初始化所有串口及所接传感器的配置 // 初始化所有串口及所接传感器的配置
void Gm_InitSerialComm(SENSOR_PARAM *sensorParam, char *filedir,const char *log) void Gm_InitSerialComm(SENSOR_PARAM *sensorParam, const char *filedir,const char *log)
{ {
int i; int i;
char szbuf[128]; char szbuf[128];
@ -1124,7 +1124,7 @@ void SerialDataProcess(int devidx, u_char *buf, int len)
} }
} }
void DebugLog(int commid, char *szbuf, char flag) void DebugLog(int commid, const char *szbuf, char flag)
{ {
if (NULL == szbuf) if (NULL == szbuf)
return; return;
@ -1152,7 +1152,7 @@ void DebugLog(int commid, char *szbuf, char flag)
} }
} }
int SaveLogTofile(int commid, char *szbuf) int SaveLogTofile(int commid, const char *szbuf)
{ {
int status; int status;
time_t now; time_t now;

@ -346,11 +346,11 @@ void Gm_OpenSerialPort(int devidx);
// 关闭串口通讯 // 关闭串口通讯
void Gm_CloseSerialPort(); void Gm_CloseSerialPort();
void DebugLog(int commid, char *szbuf, char flag); void DebugLog(int commid, const char *szbuf, char flag);
int SaveLogTofile(int commid, char *szbuf); int SaveLogTofile(int commid, const char *szbuf);
// 功能说明:串口发送数据 返回实际发送的字节数 // 功能说明:串口发送数据 返回实际发送的字节数
int GM_SerialComSend(const unsigned char * cSendBuf, size_t nSendLen, int commid); int GM_SerialComSend(const unsigned char * cSendBuf, size_t nSendLen, int commid);
void Gm_InitSerialComm(SENSOR_PARAM *sensorParam, char *filedir,const char *log); void Gm_InitSerialComm(SENSOR_PARAM *sensorParam, const char *filedir,const char *log);
// 启动串口通讯 // 启动串口通讯
void GM_StartSerialComm(); void GM_StartSerialComm();
// 启动使用串口拍照 // 启动使用串口拍照

@ -182,5 +182,5 @@ bool HangYuCtrl::TakePhoto(std::vector<uint8_t>& img)
bool HangYuCtrl::TakeVideo(uint32_t duration, std::string path) bool HangYuCtrl::TakeVideo(uint32_t duration, std::string path)
{ {
return false;
} }

@ -158,6 +158,7 @@ bool YuShiCtrl::TakePhoto(std::vector<uint8_t>& img)
bool YuShiCtrl::TakeVideo(uint32_t duration, std::string path) { bool YuShiCtrl::TakeVideo(uint32_t duration, std::string path) {
return false;
} }

Loading…
Cancel
Save