Z991239-1085 #comment Linux下libimageproc编译通过

Module/mod_IDCertificate/IDCertFSM.cpp

@@ -985,7 +985,7 @@ ErrorCodeEnum CIDCertFSM::GetPngBlob(CBlob &data, bool bClear)
 
 	//ErrorCodeEnum Error = ConvertBmpToPng(strBmpPath, strPngPath);
 	Dbg("photo change: %s,%s,%s",(LPCSTR)strBkPath,(LPCSTR)strBmpPath,(LPCSTR)strPngPath);
-	bool bResult = imageprocess((char*)strBkPath.GetData(),(char*)strBmpPath.GetData(),(char*)strPngPath.GetData());
+	bool bResult = imageprocess((char*)strBmpPath.GetData(),(char*)strPngPath.GetData());
 	Dbg("photo changed");
 	if (!bResult)
 	{

Other/libimageproc/libimageproc.cpp

@@ -6,66 +6,9 @@
 #include "highgui.h"
 #include "cv.h"
 #include "resource.h"
-//#include "atlcore.h"
 
-//static HINSTANCE g_module = NULL;
-
-// 这是导出函数的一个示例。
-
-//LIBIMAGEPROC_API bool imageprocess(char*BackImgPath,char*FrontImgPath,char*ResultImgPath)
-//{	
-//	IplImage *pBK = cvCreateImage(cvSize(324,202),IPL_DEPTH_8U,3);
-//
-//	//IplImage* hBitmap = cvLoadImage("bk.bmp", -1);
-//
-//	HBITMAP hBitmap = (HBITMAP)LoadImageA(g_module, 
-//		MAKEINTRESOURCEA(IDB_BK), 
-//		IMAGE_BITMAP, 
-//		0, 
-//		0, 
-//		LR_CREATEDIBSECTION|LR_DEFAULTSIZE);
-//	if (hBitmap)
-//	{
-//		long cb = 324 * 202 * 3;
-//		GetBitmapBits(hBitmap, cb, pBK->imageData);
-//		DeleteObject(hBitmap);
-//	}
-//	IplImage *pfront	= cvLoadImage(FrontImgPath,1);
-//	if (pBK == NULL || pfront == NULL)
-//		return false;
-//	IplImage *pImg		= cvCreateImage(cvSize(pfront->width,pfront->height),IPL_DEPTH_8U,1);
-//	int j,i;
-//	CvMat bk;
-//	cvGetSubRect(pBK,&bk,cvRect(200,30,pfront->width,pfront->height));
-//	
-//	cvCvtColor(pfront,pImg,CV_RGB2GRAY); //rgb转换为灰度图
-//	for(j = 0;j< pImg->height ; j++)
-//	{
-//		uchar* ptr = (uchar*)(pImg->imageData+j*pImg->widthStep);
-//		uchar* ptr1 = (uchar*)(pfront->imageData+j*pfront->widthStep);
-//		uchar* ptr2 = (uchar*)(bk.data.ptr+j*bk.step);
-//		for(i = 0;i < pImg->width ; i++)
-//		{
-//			if(ptr[i] < 220)  //像素值小于220的保留下来 并显示到背景图上 即白色部分被去除 
-//			{
-//				ptr2[i*3] = ptr1[i*3];
-//				ptr2[i*3 + 1] = ptr1[i*3 + 1];
-//				ptr2[i*3 + 2] = ptr1[i*3 + 2];
-//			}
-//		}
-//	}
-//
-//	cvSaveImage(ResultImgPath,pBK);
-//	cvReleaseImage( &pBK);
-//	cvReleaseImage( &pfront);
-//	cvReleaseImage( &pImg);
-//	return true;
-//}
-
-bool imageprocess(char* BackImgPath, char* FrontImgPath, char* ResultImgPath)
+bool imageprocess(char* FrontImgPath, char* ResultImgPath)
 {
-	//IplImage* pBK = cvCreateImage(cvSize(324, 202), IPL_DEPTH_8U, 3);
-
 	IplImage* pBK = cvLoadImage("bk.bmp", 1);
 
 	IplImage* pfront = cvLoadImage(FrontImgPath, 1);
@@ -99,20 +42,3 @@ bool imageprocess(char* BackImgPath, char* FrontImgPath, char* ResultImgPath)
 	cvReleaseImage(&pImg);
 	return true;
 }
-
-//BOOL APIENTRY DllMain( HINSTANCE hModule, DWORD  ul_reason_for_call, LPVOID lpReserved)
-//{
-//	switch (ul_reason_for_call)
-//	{
-//	case DLL_PROCESS_ATTACH:
-//		g_module = hModule;
-//		DisableThreadLibraryCalls(hModule);
-//		break;
-//	case DLL_THREAD_ATTACH:
-//	case DLL_THREAD_DETACH:
-//	case DLL_PROCESS_DETACH:
-//		break;
-//	}
-//
-//	return TRUE;
-//}

Other/libimageproc/libimageproc.h

@@ -12,4 +12,4 @@
 
 //LIBIMAGEPROC_API bool imageprocess(char*BackImgPath,char*FrontImgPath,char*ResultImgPath);
 
-bool imageprocess(char* BackImgPath, char* FrontImgPath, char* ResultImgPath);
+bool imageprocess(char* FrontImgPath, char* ResultImgPath);