Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSPAINT] Support converting to black and white (#5554)

Browse source 
- Add ImageModel::IsBlackAndWhite and ImageModel::PushBlackAndWhite
  helper functions.
- Add CAttributesDialog::m_bBlackAndWhite.
- If IDD_ATTRIBUTESRB4 is checked, then make
  the bitmap black and white.
- Add IDS_LOSECOLOR to show message.
CORE-19094
This commit is contained in:
Katayama Hirofumi MZ 2023-08-11 20:27:12 +09:00 committed by GitHub
parent 97f59fa545
commit e6c23361a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 100 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
base/applications/mspaint/dialogs.cpp
View file

@ -103,10 +103,14 @@ LRESULT CAttributesDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam,
newHeight = imageModel.GetHeight();
CheckDlgButton(IDD_ATTRIBUTESRB3, BST_CHECKED);
CheckDlgButton(IDD_ATTRIBUTESRB5, BST_CHECKED);
SetDlgItemInt(IDD_ATTRIBUTESEDIT1, newWidth, FALSE);
SetDlgItemInt(IDD_ATTRIBUTESEDIT2, newHeight, FALSE);
if (imageModel.IsBlackAndWhite())
CheckRadioButton(IDD_ATTRIBUTESRB4, IDD_ATTRIBUTESRB5, IDD_ATTRIBUTESRB4);
else
CheckRadioButton(IDD_ATTRIBUTESRB4, IDD_ATTRIBUTESRB5, IDD_ATTRIBUTESRB5);
if (g_isAFile)
{
TCHAR date[100];
@ -142,6 +146,7 @@ LRESULT CAttributesDialog::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL
LRESULT CAttributesDialog::OnOk(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
{
m_bBlackAndWhite = (IsDlgButtonChecked(IDD_ATTRIBUTESRB4) == BST_CHECKED);
EndDialog(1);
return 0;
}

1
base/applications/mspaint/dialogs.h
View file

@ -64,6 +64,7 @@ public:
public:
int newWidth;
int newHeight;
BOOL m_bBlackAndWhite;
};
class CStretchSkewDialog : public CDialogImpl<CStretchSkewDialog>

44
base/applications/mspaint/history.cpp
View file

@ -267,3 +267,47 @@ HBITMAP ImageModel::CopyBitmap()
m_hbmOld = ::SelectObject(m_hDrawingDC, m_hBms[m_currInd]); // Re-select
return ret;
}
BOOL ImageModel::IsBlackAndWhite()
{
LONG cxWidth = GetWidth(), cyHeight = GetHeight();
for (LONG y = 0; y < cyHeight; ++y)
{
for (LONG x = 0; x < cxWidth; ++x)
{
COLORREF rgbColor = ::GetPixel(m_hDrawingDC, x, y);
if (rgbColor != RGB(0, 0, 0) && rgbColor != RGB(255, 255, 255))
return FALSE;
}
}
return TRUE;
}
void ImageModel::PushBlackAndWhite()
{
HBITMAP hNewBitmap = CopyBitmap();
if (!hNewBitmap)
return;
HDC hdc2 = ::CreateCompatibleDC(NULL);
HGDIOBJ hbm2Old = ::SelectObject(hdc2, hNewBitmap);
LONG cxWidth = GetWidth(), cyHeight = GetHeight();
for (LONG y = 0; y < cyHeight; ++y)
{
for (LONG x = 0; x < cxWidth; ++x)
{
COLORREF rgbColor = ::GetPixel(m_hDrawingDC, x, y);
BYTE Red = GetRValue(rgbColor);
BYTE Green = GetGValue(rgbColor);
BYTE Blue = GetBValue(rgbColor);
if ((Red + Green + Blue) / 3 >= 255 / 2)
::SetPixelV(hdc2, x, y, RGB(255, 255, 255)); // White
else
::SetPixelV(hdc2, x, y, RGB(0, 0, 0)); // Black
}
}
::SelectObject(hdc2, hbm2Old);
::DeleteDC(hdc2);
PushImageForUndo(hNewBitmap);
}

2
base/applications/mspaint/history.h
View file

@ -37,6 +37,8 @@ public:
void RotateNTimes90Degrees(int iN);
void Clamp(POINT& pt) const;
void NotifyImageChanged();
BOOL IsBlackAndWhite();
void PushBlackAndWhite();
protected:
HDC m_hDrawingDC; // The device context for this class

1
base/applications/mspaint/lang/bg-BG.rc
View file

@ -264,4 +264,5 @@ BEGIN
IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
IDS_CANTSENDMAIL "Failed to send a mail."
IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
END

1
base/applications/mspaint/lang/cs-CZ.rc
View file

@ -264,4 +264,5 @@ BEGIN
IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
IDS_CANTSENDMAIL "Failed to send a mail."
IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
END

1
base/applications/mspaint/lang/de-DE.rc
View file

@ -263,4 +263,5 @@ BEGIN
IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
IDS_CANTSENDMAIL "Failed to send a mail."
IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
END

1
base/applications/mspaint/lang/en-GB.rc
View file

@ -263,4 +263,5 @@ BEGIN
IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
IDS_CANTSENDMAIL "Failed to send a mail."
IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
END

1
base/applications/mspaint/lang/en-US.rc
View file

@ -264,4 +264,5 @@ BEGIN
IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
IDS_CANTSENDMAIL "Failed to send a mail."
IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
END

1
base/applications/mspaint/lang/es-ES.rc
View file

@ -266,4 +266,5 @@ BEGIN
IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
IDS_CANTSENDMAIL "Failed to send a mail."
IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
END

1
base/applications/mspaint/lang/et-EE.rc
View file

@ -263,4 +263,5 @@ BEGIN
IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
IDS_CANTSENDMAIL "Failed to send a mail."
IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
END

1
base/applications/mspaint/lang/eu-ES.rc
View file

@ -264,4 +264,5 @@ BEGIN
IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
IDS_CANTSENDMAIL "Failed to send a mail."
IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
END

1
base/applications/mspaint/lang/fr-FR.rc
View file

@ -264,4 +264,5 @@ BEGIN
IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
IDS_CANTSENDMAIL "Failed to send a mail."
IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
END

1
base/applications/mspaint/lang/he-IL.rc
View file

@ -266,4 +266,5 @@ BEGIN
IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
IDS_CANTSENDMAIL "Failed to send a mail."
IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
END

1
base/applications/mspaint/lang/hu-HU.rc
View file

@ -264,4 +264,5 @@ BEGIN
IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
IDS_CANTSENDMAIL "Failed to send a mail."
IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
END

1
base/applications/mspaint/lang/id-ID.rc
View file

@ -263,4 +263,5 @@ BEGIN
IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
IDS_CANTSENDMAIL "Failed to send a mail."
IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
END

1
base/applications/mspaint/lang/it-IT.rc
View file

@ -264,4 +264,5 @@ BEGIN
IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
IDS_CANTSENDMAIL "Failed to send a mail."
IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
END

1
base/applications/mspaint/lang/ja-JP.rc
View file

@ -265,4 +265,5 @@ BEGIN
IDS_CANTPASTE "クリップボードからの貼り付けに失敗しました。データ形式が間違っているか、未対応です。"
IDS_SAVEERROR "次のファイルとして画像を保存するのに失敗しました:\n\n%s"
IDS_CANTSENDMAIL "Failed to send a mail."
IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
END

1
base/applications/mspaint/lang/nl-NL.rc
View file

@ -263,4 +263,5 @@ BEGIN
IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
IDS_CANTSENDMAIL "Failed to send a mail."
IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
END

1
base/applications/mspaint/lang/no-NO.rc
View file

@ -263,4 +263,5 @@ BEGIN
IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
IDS_CANTSENDMAIL "Failed to send a mail."
IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
END

1
base/applications/mspaint/lang/pl-PL.rc
View file

@ -266,4 +266,5 @@ BEGIN
IDS_CANTPASTE "Nie można wkleić ze schowka. Format danych jest nieprawidłowy lub nieobsługiwany."
IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
IDS_CANTSENDMAIL "Failed to send a mail."
IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
END

1
base/applications/mspaint/lang/pt-BR.rc
View file

@ -264,4 +264,5 @@ BEGIN
IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
IDS_CANTSENDMAIL "Failed to send a mail."
IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
END

1
base/applications/mspaint/lang/pt-PT.rc
View file

@ -264,4 +264,5 @@ BEGIN
IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
IDS_CANTSENDMAIL "Failed to send a mail."
IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
END

1
base/applications/mspaint/lang/ro-RO.rc
View file

@ -265,4 +265,5 @@ BEGIN
IDS_CANTPASTE "Nu a putut fi lipit din clipboard. Formatul de date este fie incorect, fie nesuportat."
IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
IDS_CANTSENDMAIL "Failed to send a mail."
IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
END

1
base/applications/mspaint/lang/ru-RU.rc
View file

@ -267,4 +267,5 @@ BEGIN
IDS_CANTPASTE "Не удалось вставить из буфера обмена. Формат данных либо некорректный, либо не поддерживается."
IDS_SAVEERROR "Не удалось сохранить точечный рисунок в файл:\n\n%s"
IDS_CANTSENDMAIL "Failed to send a mail."
IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
END

1
base/applications/mspaint/lang/sk-SK.rc
View file

@ -263,4 +263,5 @@ BEGIN
IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
IDS_CANTSENDMAIL "Failed to send a mail."
IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
END

1
base/applications/mspaint/lang/sq-AL.rc
View file

@ -263,4 +263,5 @@ BEGIN
IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
IDS_CANTSENDMAIL "Failed to send a mail."
IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
END

1
base/applications/mspaint/lang/sv-SE.rc
View file

@ -264,4 +264,5 @@ BEGIN
IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
IDS_CANTSENDMAIL "Failed to send a mail."
IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
END

1
base/applications/mspaint/lang/tr-TR.rc
View file

@ -264,4 +264,5 @@ BEGIN
IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
IDS_CANTSENDMAIL "Failed to send a mail."
IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
END

1
base/applications/mspaint/lang/uk-UA.rc
View file

@ -265,4 +265,5 @@ BEGIN
IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
IDS_CANTSENDMAIL "Failed to send a mail."
IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
END

1
base/applications/mspaint/lang/vi-VN.rc
View file

@ -263,4 +263,5 @@ BEGIN
IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
IDS_CANTSENDMAIL "Failed to send a mail."
IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
END

1
base/applications/mspaint/lang/zh-CN.rc
View file

@ -266,4 +266,5 @@ BEGIN
IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
IDS_CANTSENDMAIL "Failed to send a mail."
IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
END

1
base/applications/mspaint/lang/zh-HK.rc
View file

@ -264,4 +264,5 @@ BEGIN
IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
IDS_CANTSENDMAIL "Failed to send a mail."
IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
END

1
base/applications/mspaint/lang/zh-TW.rc
View file

@ -264,4 +264,5 @@ BEGIN
IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
IDS_CANTSENDMAIL "Failed to send a mail."
IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
END

1
base/applications/mspaint/resource.h
View file

@ -222,3 +222,4 @@
#define IDS_CANTPASTE 940
#define IDS_SAVEERROR 941
#define IDS_CANTSENDMAIL 942
#define IDS_LOSECOLOR 943

17
base/applications/mspaint/winproc.cpp
View file

@ -949,7 +949,22 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH
{
if (attributesDialog.DoModal(mainWindow.m_hWnd))
{
imageModel.Crop(attributesDialog.newWidth, attributesDialog.newHeight, 0, 0);
if (attributesDialog.m_bBlackAndWhite && !imageModel.IsBlackAndWhite())
{
CString strText(MAKEINTRESOURCE(IDS_LOSECOLOR));
CString strTitle(MAKEINTRESOURCE(IDS_PROGRAMNAME));
INT id = MessageBox(strText, strTitle, MB_ICONINFORMATION | MB_YESNOCANCEL);
if (id != IDYES)
break;
imageModel.PushBlackAndWhite();
}
if (imageModel.GetWidth() != attributesDialog.newWidth ||
imageModel.GetHeight() != attributesDialog.newHeight)
{
imageModel.Crop(attributesDialog.newWidth, attributesDialog.newHeight);
}
}
break;
}