Pārlūkot izejas kodu

Z991239-1812 #comment fix: 屏蔽图像翻转功能,编译不过

陈礼鹏80274480 4 gadi atpakaļ
vecāks
revīzija
b0948461ea

+ 20 - 20
Module/mod_screenshot/mod_screenshot.cpp

@@ -313,16 +313,16 @@ public:
 			}
 		}
 
-#ifndef RVC_OS_WIN
-		//linux需翻转图像
-		Dbg("size = %d, 3*width*height= %d", size, 3 * width * height);
-		IplImage* pImage = cvCreateImage(cvSize(width, height), IPL_DEPTH_8U, 3);
-		memcpy(pImage->imageData, buf, size);
-		cvFlip(pImage);
-		//cvSaveImage(".\\jietu_opencv.jpg", pImage);
-		memcpy(buf, pImage->imageData, size);
-		cvReleaseImage(&pImage);
-#endif
+//#ifndef RVC_OS_WIN
+//		//linux需翻转图像
+//		Dbg("size = %d, 3*width*height= %d", size, 3 * width * height);
+//		IplImage* pImage = cvCreateImage(cvSize(width, height), IPL_DEPTH_8U, 3);
+//		memcpy(pImage->imageData, buf, size);
+//		cvFlip(pImage);
+//		//cvSaveImage(".\\jietu_opencv.jpg", pImage);
+//		memcpy(buf, pImage->imageData, size);
+//		cvReleaseImage(&pImage);
+//#endif
 
 		ChannelService_Send_Info Info;
 		Info.compress = false;
@@ -412,16 +412,16 @@ public:
 			}
 		}
 
-#ifndef RVC_OS_WIN
-		//linux需翻转图像
-		Dbg("size = %d, 3*width*height= %d", size, 3 * width * height);
-		IplImage* pImage = cvCreateImage(cvSize(width, height), IPL_DEPTH_8U, 3);
-		memcpy(pImage->imageData, buf, size);
-		cvFlip(pImage);
-		//cvSaveImage(".\\jietu_opencv.jpg", pImage);
-		memcpy(buf, pImage->imageData, size);
-		cvReleaseImage(&pImage);
-#endif
+//#ifndef RVC_OS_WIN
+//		//linux需翻转图像
+//		Dbg("size = %d, 3*width*height= %d", size, 3 * width * height);
+//		IplImage* pImage = cvCreateImage(cvSize(width, height), IPL_DEPTH_8U, 3);
+//		memcpy(pImage->imageData, buf, size);
+//		cvFlip(pImage);
+//		//cvSaveImage(".\\jietu_opencv.jpg", pImage);
+//		memcpy(buf, pImage->imageData, size);
+//		cvReleaseImage(&pImage);
+//#endif
 
 		ChannelService_Send_Info Info;
 		Info.compress = false;

+ 11 - 10
Module/mod_snapshot/mod_snapshot.cpp

@@ -18,6 +18,7 @@ using namespace AssistantChannel;
 #include "EventCode.h"
 #include "CommEntityUtil.hpp"
 
+
 #define LOG_EVT_SELFCHECK_ASSISTANTCHANNEL_IDLE		0x50500001  //协助通道重启
 
 class CPhotoCaptureEntity;
@@ -258,16 +259,16 @@ public:
 			}
 		}
 
-#ifndef RVC_OS_WIN
-		//linux需翻转图像
-		int size = frm->width * frm->height * 3;
-		IplImage* pImage = cvCreateImage(cvSize(frm->width, frm->height), IPL_DEPTH_8U, 3);
-		memcpy(pImage->imageData, frm->data[0], size);
-		cvFlip(pImage);
-		//cvSaveImage(".\\jietu_opencv.jpg", pImage);
-		memcpy(frm->data[0], pImage->imageData, size);
-		cvReleaseImage(&pImage);
-#endif
+//#ifndef RVC_OS_WIN
+//		//linux需翻转图像
+//		int size = frm->width * frm->height * 3;
+//		IplImage* pImage = cvCreateImage(cvSize(frm->width, frm->height), IPL_DEPTH_8U, 3);
+//		memcpy(pImage->imageData, frm->data[0], size);
+//		cvFlip(pImage);
+//		//cvSaveImage(".\\jietu_opencv.jpg", pImage);
+//		memcpy(frm->data[0], pImage->imageData, size);
+//		cvReleaseImage(&pImage);
+//#endif
 
 		jpeg2k_coded_image codec_image = {0};
 		if((rc == 0)||(rc==Error_TimeOut))