Merge pull request #41 from chirsz-ever/fix-getimage-from-ipc-2008

fix(graphics): 修复在 `initgraph` 前调用 `getimage` 时出错
wysaid · Aug 31, 2020 · 40bca13 · 40bca13
2 parents 2bc0650 + f3f0f4d
commit 40bca13
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/image.cpp b/src/image.cpp
@@ -317,12 +317,15 @@ IMAGE::getimage(LPCSTR filename, int zoomWidth, int zoomHeight) {
 
 inline void getimage_from_IPicture(PIMAGE self, IPicture* pPicture) {
 	long  lWidth, lHeight, lWidthPixels, lHeightPixels;
-	PIMAGE img = CONVERT_IMAGE_CONST(0);
-	pPicture->get_Width (&lWidth );
-	lWidthPixels  = MulDiv(lWidth,  GetDeviceCaps(img->m_hDC, LOGPIXELSX), 2540);
-	pPicture->get_Height(&lHeight);
-	lHeightPixels = MulDiv(lHeight, GetDeviceCaps(img->m_hDC, LOGPIXELSY), 2540);
-	CONVERT_IMAGE_END;
+	{
+		::HDC ScreenDC = ::GetDC(NULL);
+		pPicture->get_Width (&lWidth);
+		pPicture->get_Height(&lHeight);
+		// convert Himetric units to pixels
+		lWidthPixels  = ::MulDiv(lWidth,  ::GetDeviceCaps(ScreenDC, LOGPIXELSX), 2540);
+		lHeightPixels = ::MulDiv(lHeight, ::GetDeviceCaps(ScreenDC, LOGPIXELSY), 2540);
+		::ReleaseDC(NULL, ScreenDC);
+	}
 
 	self->resize(lWidthPixels, lHeightPixels);
 	{