libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-26 14:27:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GUI: Replace byte arrays with Palette class in image album dialog

Browse Source
This commit is contained in:
Matthew Jimenez 2024-02-01 17:01:28 -06:00 committed by Filippos Karapetis
parent 0caa1711db
commit 9cb227e000
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engines/mtropolis/plugin/mti.cpp
View File

@ -38,6 +38,7 @@
#include "video/mpegps_decoder.h" #include "video/mpegps_decoder.h"
#include "graphics/managed_surface.h" #include "graphics/managed_surface.h"
#include "graphics/palette.h"
#include "common/file.h" #include "common/file.h"
namespace MTropolis { namespace MTropolis {
@ -416,7 +417,7 @@ class PrintModifierImageSupplier : public GUI::ImageAlbumImageSupplier {
public: public:
PrintModifierImageSupplier(const Common::String &inputPath, bool isMacVersion); PrintModifierImageSupplier(const Common::String &inputPath, bool isMacVersion);
bool loadImageSlot(uint slot, const Graphics::Surface *&outSurface, bool &outHasPalette, byte (&outPalette)[256 * 3], GUI::ImageAlbumImageMetadata &outMetadata) override; bool loadImageSlot(uint slot, const Graphics::Surface *&outSurface, bool &outHasPalette, Graphics::Palette &outPalette, GUI::ImageAlbumImageMetadata &outMetadata) override;
void releaseImageSlot(uint slot) override; void releaseImageSlot(uint slot) override;
uint getNumSlots() const override; uint getNumSlots() const override;
Common::U32String getDefaultFileNameForSlot(uint slot) const override; Common::U32String getDefaultFileNameForSlot(uint slot) const override;
@ -437,7 +438,7 @@ PrintModifierImageSupplier::PrintModifierImageSupplier(const Common::String &inp
_decoder.reset(new Image::BitmapDecoder()); _decoder.reset(new Image::BitmapDecoder());
} }
bool PrintModifierImageSupplier::loadImageSlot(uint slot, const Graphics::Surface *&outSurface, bool &outHasPalette, byte (&outPalette)[256 * 3], GUI::ImageAlbumImageMetadata &outMetadata) { bool PrintModifierImageSupplier::loadImageSlot(uint slot, const Graphics::Surface *&outSurface, bool &outHasPalette, Graphics::Palette &outPalette, GUI::ImageAlbumImageMetadata &outMetadata) {
Common::ScopedPtr<Common::SeekableReadStream> dataStream(createReadStreamForSlot(slot)); Common::ScopedPtr<Common::SeekableReadStream> dataStream(createReadStreamForSlot(slot));
if (!dataStream) if (!dataStream)
@ -454,7 +455,7 @@ bool PrintModifierImageSupplier::loadImageSlot(uint slot, const Graphics::Surfac
outHasPalette = _decoder->hasPalette(); outHasPalette = _decoder->hasPalette();
if (_decoder->hasPalette()) if (_decoder->hasPalette())
memcpy(outPalette + _decoder->getPaletteStartIndex() * 3, _decoder->getPalette(), _decoder->getPaletteColorCount() * 3); outPalette.set(_decoder->getPalette(), _decoder->getPaletteStartIndex(), _decoder->getPaletteColorCount());
outMetadata = GUI::ImageAlbumImageMetadata(); outMetadata = GUI::ImageAlbumImageMetadata();
outMetadata._orientation = GUI::kImageAlbumImageOrientationLandscape; outMetadata._orientation = GUI::kImageAlbumImageOrientationLandscape;

8
engines/testbed/misc.cpp
View File

@ -23,6 +23,8 @@
#include "common/timer.h" #include "common/timer.h"
#include "common/file.h" #include "common/file.h"
#include "graphics/palette.h"
#include "gui/dialog.h" #include "gui/dialog.h"
#include "gui/imagealbum-dialog.h" #include "gui/imagealbum-dialog.h"
@ -192,7 +194,7 @@ class ImageAlbumImageSupplier : public GUI::ImageAlbumImageSupplier {
public: public:
void addFile(const Common::Path &path, Common::FormatInfo::FormatID format, bool dontReportFormat); void addFile(const Common::Path &path, Common::FormatInfo::FormatID format, bool dontReportFormat);
bool loadImageSlot(uint slot, const Graphics::Surface *&outSurface, bool &outHasPalette, byte (&outPalette)[256 * 3], GUI::ImageAlbumImageMetadata &outMetadata) override; bool loadImageSlot(uint slot, const Graphics::Surface *&outSurface, bool &outHasPalette, Graphics::Palette &outPalette, GUI::ImageAlbumImageMetadata &outMetadata) override;
void releaseImageSlot(uint slot) override; void releaseImageSlot(uint slot) override;
bool getFileFormatForImageSlot(uint slot, Common::FormatInfo::FormatID &outFormat) const override; bool getFileFormatForImageSlot(uint slot, Common::FormatInfo::FormatID &outFormat) const override;
Common::SeekableReadStream *createReadStreamForSlot(uint slot) override; Common::SeekableReadStream *createReadStreamForSlot(uint slot) override;
@ -217,7 +219,7 @@ void ImageAlbumImageSupplier::addFile(const Common::Path &path, Common::FormatIn
_slots.push_back(FileInfo(path, format, dontReportFormat)); _slots.push_back(FileInfo(path, format, dontReportFormat));
} }
bool ImageAlbumImageSupplier::loadImageSlot(uint slot, const Graphics::Surface *&outSurface, bool &outHasPalette, byte (&outPalette)[256 * 3], GUI::ImageAlbumImageMetadata &outMetadata) { bool ImageAlbumImageSupplier::loadImageSlot(uint slot, const Graphics::Surface *&outSurface, bool &outHasPalette, Graphics::Palette &outPalette, GUI::ImageAlbumImageMetadata &outMetadata) {
FileInfo &fi = _slots[slot]; FileInfo &fi = _slots[slot];
@ -244,7 +246,7 @@ bool ImageAlbumImageSupplier::loadImageSlot(uint slot, const Graphics::Surface *
outSurface = fi._decoder->getSurface(); outSurface = fi._decoder->getSurface();
outHasPalette = fi._decoder->hasPalette(); outHasPalette = fi._decoder->hasPalette();
if (fi._decoder->hasPalette()) if (fi._decoder->hasPalette())
memcpy(outPalette, fi._decoder->getPalette() + fi._decoder->getPaletteStartIndex() * 3, fi._decoder->getPaletteColorCount() * 3); outPalette.set(fi._decoder->getPalette(), fi._decoder->getPaletteStartIndex(), fi._decoder->getPaletteColorCount());
outMetadata = GUI::ImageAlbumImageMetadata(); outMetadata = GUI::ImageAlbumImageMetadata();
return true; return true;

18
gui/imagealbum-dialog.cpp
View File

@ -21,6 +21,8 @@
#include "gui/imagealbum-dialog.h" #include "gui/imagealbum-dialog.h"
#include "graphics/palette.h"
#include "gui/dialog.h" #include "gui/dialog.h"
#include "gui/filebrowser-dialog.h" #include "gui/filebrowser-dialog.h"
#include "gui/gui-manager.h" #include "gui/gui-manager.h"
@ -164,12 +166,9 @@ void ImageAlbumDialog::changeToSlot(uint slot) {
const Graphics::Surface *surf = nullptr; const Graphics::Surface *surf = nullptr;
bool hasPalette = false; bool hasPalette = false;
byte palette[256 * 3]; Graphics::Palette palette(256);
ImageAlbumImageMetadata metadata; ImageAlbumImageMetadata metadata;
for (byte &paletteByte : palette)
paletteByte = 0;
if (_imageSupplier->loadImageSlot(slot, surf, hasPalette, palette, metadata)) { if (_imageSupplier->loadImageSlot(slot, surf, hasPalette, palette, metadata)) {
if (!canSaveImage) { if (!canSaveImage) {
// If we can't always save the image (meaning we don't have an image write-out function) then see if we can // If we can't always save the image (meaning we don't have an image write-out function) then see if we can
@ -215,7 +214,7 @@ void ImageAlbumDialog::changeToSlot(uint slot) {
Graphics::ManagedSurface rescaledGraphic; Graphics::ManagedSurface rescaledGraphic;
rescaledGraphic.create(scaledWidth, scaledHeight, surf->format); rescaledGraphic.create(scaledWidth, scaledHeight, surf->format);
if (hasPalette) if (hasPalette)
rescaledGraphic.setPalette(palette, 0, 256); rescaledGraphic.setPalette(palette.data(), 0, 256);
if (needs90Rotate) { if (needs90Rotate) {
bool isClockwise = metadata._viewTransformation == kImageAlbumViewTransformationRotate90CW; bool isClockwise = metadata._viewTransformation == kImageAlbumViewTransformationRotate90CW;
@ -251,7 +250,7 @@ void ImageAlbumDialog::changeToSlot(uint slot) {
_imageSupplier->releaseImageSlot(slot); _imageSupplier->releaseImageSlot(slot);
if (rescaledGraphic.format.bytesPerPixel == 1) if (rescaledGraphic.format.bytesPerPixel == 1)
rescaledGraphic.convertToInPlace(Graphics::createPixelFormat<888>(), palette, 0, 256); rescaledGraphic.convertToInPlace(Graphics::createPixelFormat<888>(), palette.data(), 0, 256);
int32 xCoord = (static_cast<int32>(_imageContainer->getWidth()) - static_cast<int32>(scaledWidth)) / 2u; int32 xCoord = (static_cast<int32>(_imageContainer->getWidth()) - static_cast<int32>(scaledWidth)) / 2u;
int32 yCoord = (static_cast<int32>(_imageContainer->getHeight()) - static_cast<int32>(scaledHeight)) / 2u; int32 yCoord = (static_cast<int32>(_imageContainer->getHeight()) - static_cast<int32>(scaledHeight)) / 2u;
@ -379,12 +378,9 @@ void ImageAlbumDialog::saveImageInSlot(uint slot) {
if (needsConversion) { if (needsConversion) {
const Graphics::Surface *surf = nullptr; const Graphics::Surface *surf = nullptr;
bool hasPalette = false; bool hasPalette = false;
byte palette[256 * 3]; Graphics::Palette palette(256);
ImageAlbumImageMetadata metadata; ImageAlbumImageMetadata metadata;
for (byte &paletteByte : palette)
paletteByte = 0;
if (_imageSupplier->loadImageSlot(slot, surf, hasPalette, palette, metadata)) { if (_imageSupplier->loadImageSlot(slot, surf, hasPalette, palette, metadata)) {
Common::ScopedPtr<Common::SeekableWriteStream> writeStream; Common::ScopedPtr<Common::SeekableWriteStream> writeStream;
@ -400,7 +396,7 @@ void ImageAlbumDialog::saveImageInSlot(uint slot) {
assert(saveCallback); assert(saveCallback);
Common::FormatInfo::ImageSaveProperties saveProps; Common::FormatInfo::ImageSaveProperties saveProps;
saveCallback(*writeStream, *surf, hasPalette ? palette : nullptr, saveProps); saveCallback(*writeStream, *surf, hasPalette ? palette.data() : nullptr, saveProps);
} else { } else {
warning("Failed to open image output stream"); warning("Failed to open image output stream");
} }

3
gui/imagealbum-dialog.h
View File

@ -34,6 +34,7 @@ class SeekableReadStream;
namespace Graphics { namespace Graphics {
class Palette;
struct Surface; struct Surface;
} // End of namespace Graphics } // End of namespace Graphics
@ -81,7 +82,7 @@ public:
* @param outMetadata Outputted metadata for the image * @param outMetadata Outputted metadata for the image
* @return True if the image loaded successfully, false if it failed * @return True if the image loaded successfully, false if it failed
*/ */
virtual bool loadImageSlot(uint slot, const Graphics::Surface *&outSurface, bool &outHasPalette, byte (&outPalette)[256 * 3], ImageAlbumImageMetadata &outMetadata) = 0; virtual bool loadImageSlot(uint slot, const Graphics::Surface *&outSurface, bool &outHasPalette, Graphics::Palette &outPalette, ImageAlbumImageMetadata &outMetadata) = 0;
/** /**
* @brief Releases any resources for an image loaded with loadImageSlot * @brief Releases any resources for an image loaded with loadImageSlot