[Scummvm-git-logs] scummvm master -> 0e0250818f674d34d39db43be8fa158cc79e03cd
moralrecordings
noreply at scummvm.org
Thu Jul 16 14:20:35 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
0e0250818f MACTOOLBOX: Fix dodgy Pattern constructor
Commit: 0e0250818f674d34d39db43be8fa158cc79e03cd
https://github.com/scummvm/scummvm/commit/0e0250818f674d34d39db43be8fa158cc79e03cd
Author: Scott Percival (code at moral.net.au)
Date: 2026-07-16T22:20:13+08:00
Commit Message:
MACTOOLBOX: Fix dodgy Pattern constructor
Changed paths:
graphics/mactoolbox/toolbox_quickdraw.cpp
diff --git a/graphics/mactoolbox/toolbox_quickdraw.cpp b/graphics/mactoolbox/toolbox_quickdraw.cpp
index 93627953ab6..7184d6975e9 100644
--- a/graphics/mactoolbox/toolbox_quickdraw.cpp
+++ b/graphics/mactoolbox/toolbox_quickdraw.cpp
@@ -519,7 +519,7 @@ void Toolbox::InsetRect(Common::Rect &r, int16 dh, int16 dv) {
void Toolbox::InvertOval(const Common::Rect &r) {
if (_port) {
// set pattern to full black
- Pattern pat({0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff});
+ Pattern pat = { { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff } };
_drawOval(r, pat, kPatXor, false, _wm->_colorBlack, _wm->_colorWhite);
if (_port->picSave) {
_port->picSave->pushOpRect(kOpInvertOval, r);
@@ -530,7 +530,7 @@ void Toolbox::InvertOval(const Common::Rect &r) {
void Toolbox::InvertPoly(const PolyHandle &poly) {
if (_port) {
// set pattern to full black
- Pattern pat({0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff});
+ Pattern pat = { { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff } };
_drawPoly(poly, pat, kPatXor, false, _wm->_colorBlack, _wm->_colorWhite);
if (_port->picSave) {
_port->picSave->pushOpPoly(kOpInvertPoly, poly);
@@ -541,7 +541,7 @@ void Toolbox::InvertPoly(const PolyHandle &poly) {
void Toolbox::InvertRect(const Common::Rect &r) {
if (_port) {
// set pattern to full black
- Pattern pat({0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff});
+ Pattern pat = { { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff } };
_drawRect(r, pat, kPatXor, false, _wm->_colorBlack, _wm->_colorWhite);
if (_port->picSave) {
_port->picSave->pushOpRect(kOpInvertRect, r);
@@ -552,7 +552,7 @@ void Toolbox::InvertRect(const Common::Rect &r) {
void Toolbox::InvertRoundRect(const Common::Rect &r, uint16 ovalWidth, uint16 ovalHeight) {
if (_port) {
// set pattern to full black
- Pattern pat({0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff});
+ Pattern pat = { { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff } };
_drawRoundRect(r, pat, kPatXor, false, _wm->_colorBlack, _wm->_colorWhite, ovalWidth, ovalHeight);
if (_port->picSave) {
_port->picSave->pushOpPoint(kOpOvSize, Common::Point(ovalWidth, ovalHeight));
More information about the Scummvm-git-logs
mailing list