mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'hotfixes-1.1.1' into feature-docker-place

Browse Source
This commit is contained in:
Jinhao 2015-08-16 09:17:23 +08:00
commit c1e9ea3daf
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/nana/paint/graphics.hpp
View File

@ -131,7 +131,10 @@ namespace nana
void setsta(); ///< Clears the status if the graphics object had been changed void setsta(); ///< Clears the status if the graphics object had been changed
void set_changed(); void set_changed();
void release(); void release();
void save_as_file(const char*) const; // saves image as a bitmap file
/// Saves images as a windows bitmap file
/// @param file_utf8 A UTF-8 string to a filename
void save_as_file(const char* file_utf8) const throw();
void set_color(const ::nana::color&); void set_color(const ::nana::color&);
void set_text_color(const ::nana::color&); void set_text_color(const ::nana::color&);

10
source/paint/detail/image_png.hpp
View File

@ -21,10 +21,6 @@ namespace nana
: public image::image_impl_interface : public image::image_impl_interface
{ {
public: public:
image_png()
{
}
bool open(const nana::char_t* png_file) override bool open(const nana::char_t* png_file) override
{ {
#ifdef NANA_UNICODE #ifdef NANA_UNICODE
@ -148,6 +144,12 @@ namespace nana
return is_opened; return is_opened;
} }
bool open(const void* data, std::size_t bytes) override
{
throw std::logic_error("PNG is not supported for raw data buffer");
return false;
}
bool alpha_channel() const override bool alpha_channel() const override
{ {
return pixbuf_.alpha_channel(); return pixbuf_.alpha_channel();

21
source/paint/graphics.cpp
View File

@ -817,7 +817,7 @@ namespace paint
size_.width = size_.height = 0; size_.width = size_.height = 0;
} }
void graphics::save_as_file(const char* file) const void graphics::save_as_file(const char* file_utf8) const throw()
{ {
if(handle_) if(handle_)
{ {
@ -831,25 +831,28 @@ namespace paint
bmpInfo.bmiHeader.biPlanes = 1; bmpInfo.bmiHeader.biPlanes = 1;
bmpInfo.bmiHeader.biBitCount = 24; bmpInfo.bmiHeader.biBitCount = 24;
const size_t lineBytes = ((bmpInfo.bmiHeader.biWidth * 3) + 3) & (~3);
const size_t imageBytes = iHeight * lineBytes;
HDC hdcMem = ::CreateCompatibleDC(handle_->context); HDC hdcMem = ::CreateCompatibleDC(handle_->context);
BYTE *pData = nullptr; BYTE *pData = nullptr;
HBITMAP hBmp = CreateDIBSection(hdcMem, &bmpInfo, DIB_RGB_COLORS, reinterpret_cast<void**>(&pData), 0, 0); HBITMAP hBmp = ::CreateDIBSection(hdcMem, &bmpInfo, DIB_RGB_COLORS, reinterpret_cast<void**>(&pData), 0, 0);
::SelectObject(hdcMem, hBmp); ::SelectObject(hdcMem, hBmp);
BitBlt(hdcMem, 0, 0, iWidth, iHeight, handle_->context, 0, 0, SRCCOPY); BitBlt(hdcMem, 0, 0, iWidth, iHeight, handle_->context, 0, 0, SRCCOPY);
BITMAPFILEHEADER bmFileHeader = {0}; BITMAPFILEHEADER bmFileHeader = { 0 };
bmFileHeader.bfType = 0x4d42; //bmp bmFileHeader.bfType = 0x4d42; //bmp
bmFileHeader.bfOffBits = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER); bmFileHeader.bfOffBits = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER);
bmFileHeader.bfSize = bmFileHeader.bfOffBits + ((bmpInfo.bmiHeader.biWidth * bmpInfo.bmiHeader.biHeight) * 3); ///3=(24 / 8) bmFileHeader.bfSize = bmFileHeader.bfOffBits + imageBytes;
HANDLE hFile = CreateFileA(file,GENERIC_WRITE,0,NULL,CREATE_ALWAYS,FILE_ATTRIBUTE_NORMAL,NULL); HANDLE hFile = ::CreateFileW(static_cast<std::wstring>(::nana::charset(file_utf8, ::nana::unicode::utf8)).data(), GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
DWORD dwWrite = 0; DWORD dwWrite = 0;
WriteFile(hFile,&bmFileHeader,sizeof(BITMAPFILEHEADER),&dwWrite,NULL); ::WriteFile(hFile, &bmFileHeader, sizeof(BITMAPFILEHEADER), &dwWrite, nullptr);
WriteFile(hFile,&bmpInfo.bmiHeader, sizeof(BITMAPINFOHEADER),&dwWrite,NULL); ::WriteFile(hFile, &bmpInfo.bmiHeader, sizeof(BITMAPINFOHEADER), &dwWrite, nullptr);
WriteFile(hFile,pData, iWidth * iHeight * 3,&dwWrite,NULL); ::WriteFile(hFile, pData, imageBytes, &dwWrite, nullptr);
CloseHandle(hFile); ::CloseHandle(hFile);
::DeleteObject(hBmp); ::DeleteObject(hBmp);
::DeleteDC(hdcMem); ::DeleteDC(hdcMem);