[Scummvm-git-logs] scummvm master -> 6bf2881735cec83a8c0a29ad03d395ee062b4040
sev-
noreply at scummvm.org
Thu Nov 3 19:37:13 UTC 2022
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
3659fa9d70 GRAPHICS: MACGUI: Fixed returned palette size in WM
caa681f179 DIRECTOR: Switch test dithering to common code
7eb121f708 DIRECTOR: Made graphics test more robust
6bf2881735 DIRECTOR: Remove more leftovers from dithering code
Commit: 3659fa9d70fe779ece81855742994ae28ecd9802
https://github.com/scummvm/scummvm/commit/3659fa9d70fe779ece81855742994ae28ecd9802
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-11-03T20:36:59+01:00
Commit Message:
GRAPHICS: MACGUI: Fixed returned palette size in WM
Changed paths:
graphics/macgui/macwindowmanager.h
diff --git a/graphics/macgui/macwindowmanager.h b/graphics/macgui/macwindowmanager.h
index cd922d971b8..d88ceb5e992 100644
--- a/graphics/macgui/macwindowmanager.h
+++ b/graphics/macgui/macwindowmanager.h
@@ -331,7 +331,7 @@ public:
byte inverter(byte src);
const byte *getPalette() { return _palette; }
- byte getPaletteSize() { return _paletteSize; }
+ uint getPaletteSize() { return _paletteSize; }
void renderZoomBox(bool redraw = false);
void addZoomBox(ZoomBox *box);
Commit: caa681f1791a956e7c7f084304a83f6b49368ebf
https://github.com/scummvm/scummvm/commit/caa681f1791a956e7c7f084304a83f6b49368ebf
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-11-03T20:37:02+01:00
Commit Message:
DIRECTOR: Switch test dithering to common code
Changed paths:
engines/director/tests.cpp
diff --git a/engines/director/tests.cpp b/engines/director/tests.cpp
index d155cbcf609..01b8c892db1 100644
--- a/engines/director/tests.cpp
+++ b/engines/director/tests.cpp
@@ -109,7 +109,6 @@ void Window::testFontScaling() {
x += tile->getSurface()->w + 10;
}
-#if 0
Common::String path = pathMakeRelative("blend2.pic");
Common::File in;
in.open(path);
@@ -121,9 +120,12 @@ void Window::testFontScaling() {
Image::PICTDecoder *k = new Image::PICTDecoder();
k->loadStream(in);
- surface.blitFrom(k->getSurface(), Common::Point(5, 280));
+
+ Graphics::Surface *res = k->getSurface()->convertTo(_wm->_pixelformat, k->getPalette(), k->getPaletteSize(), _wm->getPalette(), _wm->getPaletteSize(), Graphics::kDitherNaive);
+
+ surface.blitFrom(res, Common::Point(400, 280));
in.close();
-#endif
+
g_system->copyRectToScreen(surface.getPixels(), surface.pitch, 0, 0, w, h); // testing fonts
Common::Event event;
Commit: 7eb121f708b6689d5e63bfa3448a1f9508106d5c
https://github.com/scummvm/scummvm/commit/7eb121f708b6689d5e63bfa3448a1f9508106d5c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-11-03T20:37:02+01:00
Commit Message:
DIRECTOR: Made graphics test more robust
Changed paths:
engines/director/tests.cpp
diff --git a/engines/director/tests.cpp b/engines/director/tests.cpp
index 01b8c892db1..de6cc37cb06 100644
--- a/engines/director/tests.cpp
+++ b/engines/director/tests.cpp
@@ -113,18 +113,17 @@ void Window::testFontScaling() {
Common::File in;
in.open(path);
- if (!in.isOpen()) {
- warning("b_importFileInto(): Cannot open file %s", path.c_str());
- return;
- }
+ if (in.isOpen()) {
+ Image::PICTDecoder *k = new Image::PICTDecoder();
+ k->loadStream(in);
- Image::PICTDecoder *k = new Image::PICTDecoder();
- k->loadStream(in);
+ Graphics::Surface *res = k->getSurface()->convertTo(_wm->_pixelformat, k->getPalette(), k->getPaletteSize(), _wm->getPalette(), _wm->getPaletteSize(), Graphics::kDitherNaive);
- Graphics::Surface *res = k->getSurface()->convertTo(_wm->_pixelformat, k->getPalette(), k->getPaletteSize(), _wm->getPalette(), _wm->getPaletteSize(), Graphics::kDitherNaive);
-
- surface.blitFrom(res, Common::Point(400, 280));
- in.close();
+ surface.blitFrom(res, Common::Point(400, 280));
+ in.close();
+ } else {
+ warning("b_importFileInto(): Cannot open file %s", path.c_str());
+ }
g_system->copyRectToScreen(surface.getPixels(), surface.pitch, 0, 0, w, h); // testing fonts
Commit: 6bf2881735cec83a8c0a29ad03d395ee062b4040
https://github.com/scummvm/scummvm/commit/6bf2881735cec83a8c0a29ad03d395ee062b4040
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-11-03T20:37:02+01:00
Commit Message:
DIRECTOR: Remove more leftovers from dithering code
Changed paths:
engines/director/castmember.cpp
engines/director/castmember.h
diff --git a/engines/director/castmember.cpp b/engines/director/castmember.cpp
index 3feb6075b30..03f88914ee4 100644
--- a/engines/director/castmember.cpp
+++ b/engines/director/castmember.cpp
@@ -313,51 +313,6 @@ void BitmapCastMember::copyStretchImg(Graphics::Surface *surface, const Common::
}
}
-void BitmapCastMember::ditherImage() {
- // If palette did not change, do not re-dither
- if (!_paletteLookup.setPalette(g_director->_wm->getPalette(), g_director->_wm->getPaletteSize()))
- return;
-
- int bpp = _img->getSurface()->format.bytesPerPixel;
- int w = _initialRect.width();
- int h = _initialRect.height();
-
- _ditheredImg = new Graphics::Surface;
- _ditheredImg->create(w, h, Graphics::PixelFormat::createFormatCLUT8());
-
- for (int y = 0; y < h; y++) {
- const byte *src = (const byte *)_img->getSurface()->getBasePtr(0, y);
- byte *dst = (byte *)_ditheredImg->getBasePtr(0, y);
-
- for (int x = 0; x < w; x++) {
- uint32 color;
-
- switch (bpp) {
- case 1:
- color = *((const byte *)src);
- src += 1;
- break;
- case 2:
- color = *((const uint16 *)src);
- src += 2;
- break;
- case 4:
- color = *((const uint32 *)src);
- src += 4;
- break;
- default:
- error("BitmapCastMember::ditherImage(): Unsupported bit depth: %d", bpp);
- }
-
- byte r, g, b;
- _img->getSurface()->format.colorToRGB(color, r, g, b);
-
- *dst = _paletteLookup.findBestColor(r, g, b);
- dst++;
- }
- }
-}
-
void BitmapCastMember::createMatte(Common::Rect &bbox) {
// Like background trans, but all white pixels NOT ENCLOSED by coloured pixels
// are transparent
diff --git a/engines/director/castmember.h b/engines/director/castmember.h
index 577b4da81d4..90826da1958 100644
--- a/engines/director/castmember.h
+++ b/engines/director/castmember.h
@@ -146,12 +146,6 @@ public:
uint32 _tag;
bool _noMatte;
-
-private:
- void ditherImage();
- void ditherFloydImage();
-
- Graphics::PaletteLookup _paletteLookup;
};
class DigitalVideoCastMember : public CastMember {
More information about the Scummvm-git-logs
mailing list