Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 16:36:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSPAINT] Use Gdiplus::Bitmap in place of ATL::CImage to load pictures -- this un-breaks loading a picture's resolution from file

Browse source 
svn path=/trunk/; revision=75615
This commit is contained in:
Benedikt Freisen 2017-08-18 17:01:01 +00:00
parent 369ad20c7b
commit 44fc547ffa
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/base/applications/mspaint/CMakeLists.txt
View file

@ -34,6 +34,6 @@ add_rc_deps(rsrc.rc ${mspaint_rc_deps})
add_executable(mspaint ${SOURCE} rsrc.rc) add_executable(mspaint ${SOURCE} rsrc.rc)
set_module_type(mspaint win32gui UNICODE) set_module_type(mspaint win32gui UNICODE)
target_link_libraries(mspaint atlnew uuid) target_link_libraries(mspaint atlnew uuid)
add_importlibs(mspaint hhctrl comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 rpcrt4 shlwapi) add_importlibs(mspaint hhctrl comdlg32 shell32 user32 gdi32 gdiplus advapi32 comctl32 msvcrt kernel32 rpcrt4 shlwapi)
add_pch(mspaint precomp.h SOURCE) add_pch(mspaint precomp.h SOURCE)
add_cd_file(TARGET mspaint DESTINATION reactos/system32 FOR all) add_cd_file(TARGET mspaint DESTINATION reactos/system32 FOR all)

10
reactos/base/applications/mspaint/dib.cpp
View file

@ -83,8 +83,8 @@ void ShowFileLoadError(LPCTSTR name)
void void
LoadDIBFromFile(HBITMAP * hBitmap, LPCTSTR name, LPSYSTEMTIME time, int *size, int *hRes, int *vRes) LoadDIBFromFile(HBITMAP * hBitmap, LPCTSTR name, LPSYSTEMTIME time, int *size, int *hRes, int *vRes)
{ {
CImage img; using namespace Gdiplus;
img.Load(name); // TODO: error handling Bitmap img(CStringW(name), FALSE); // always use WCHAR string
if (!hBitmap) if (!hBitmap)
{ {
@ -92,7 +92,7 @@ LoadDIBFromFile(HBITMAP * hBitmap, LPCTSTR name, LPSYSTEMTIME time, int *size, i
return; return;
} }
*hBitmap = img.Detach(); img.GetHBITMAP(Color(255, 255, 255), hBitmap);
// update time and size // update time and size
HANDLE hFile = HANDLE hFile =
@ -112,7 +112,9 @@ LoadDIBFromFile(HBITMAP * hBitmap, LPCTSTR name, LPSYSTEMTIME time, int *size, i
if (size) if (size)
*size = GetFileSize(hFile, NULL); *size = GetFileSize(hFile, NULL);
// TODO: update hRes and vRes // update hRes and vRes
*hRes = (int) (img.GetHorizontalResolution() * 1000 / 25.4);
*vRes = (int) (img.GetVerticalResolution() * 1000 / 25.4);
CloseHandle(hFile); CloseHandle(hFile);
} }