[Scummvm-git-logs] scummvm master -> 883e96e3dc39ca98f005b2c7a6e94a026aa9c5d3
neuromancer
noreply at scummvm.org
Sat Nov 18 21:12:36 UTC 2023
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
b87e4b635b IMAGE: moved scr decoder from freescape to image
883e96e3dc IMAGE: moved neo decoder from freescape to image
Commit: b87e4b635b99f1a16f0fef2590cefd7ba960080a
https://github.com/scummvm/scummvm/commit/b87e4b635b99f1a16f0fef2590cefd7ba960080a
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2023-11-18T22:12:23+01:00
Commit Message:
IMAGE: moved scr decoder from freescape to image
Changed paths:
A image/scr.cpp
A image/scr.h
R engines/freescape/scr.cpp
R engines/freescape/scr.h
engines/freescape/freescape.cpp
engines/freescape/module.mk
image/module.mk
diff --git a/engines/freescape/freescape.cpp b/engines/freescape/freescape.cpp
index f9e57b07fa7..0d6464b2c0c 100644
--- a/engines/freescape/freescape.cpp
+++ b/engines/freescape/freescape.cpp
@@ -29,7 +29,7 @@
#include "freescape/freescape.h"
#include "freescape/language/8bitDetokeniser.h"
#include "freescape/neo.h"
-#include "freescape/scr.h"
+#include "image/scr.h"
#include "freescape/objects/sensor.h"
namespace Freescape {
@@ -896,7 +896,7 @@ Graphics::ManagedSurface *FreescapeEngine::loadAndConvertNeoImage(Common::Seekab
}
Graphics::ManagedSurface *FreescapeEngine::loadAndCenterScrImage(Common::SeekableReadStream *stream) {
- ScrDecoder decoder;
+ Image::ScrDecoder decoder;
decoder.loadStream(*stream);
Graphics::ManagedSurface *surface = new Graphics::ManagedSurface();
const Graphics::Surface *decoded = decoder.getSurface();
diff --git a/engines/freescape/module.mk b/engines/freescape/module.mk
index d6fb3bb9e1e..26c20b3ac05 100644
--- a/engines/freescape/module.mk
+++ b/engines/freescape/module.mk
@@ -34,7 +34,6 @@ MODULE_OBJS := \
objects/geometricobject.o \
objects/group.o \
objects/sensor.o \
- scr.o \
sweepAABB.o \
sound.o \
ui.o
diff --git a/image/module.mk b/image/module.mk
index 442750c37d4..f0d3c0faeae 100644
--- a/image/module.mk
+++ b/image/module.mk
@@ -9,6 +9,7 @@ MODULE_OBJS := \
pcx.o \
pict.o \
png.o \
+ scr.o \
tga.o \
xbm.o \
codecs/bmp_raw.o \
diff --git a/engines/freescape/scr.cpp b/image/scr.cpp
similarity index 97%
rename from engines/freescape/scr.cpp
rename to image/scr.cpp
index 1621363fe30..d270a0633c7 100644
--- a/engines/freescape/scr.cpp
+++ b/image/scr.cpp
@@ -24,9 +24,9 @@
#include "graphics/pixelformat.h"
#include "graphics/surface.h"
-#include "freescape/scr.h"
+#include "image/scr.h"
-namespace Freescape {
+namespace Image {
ScrDecoder::ScrDecoder() {
_surface = nullptr;
@@ -102,4 +102,4 @@ bool ScrDecoder::loadStream(Common::SeekableReadStream &stream) {
return true;
}
-} // End of namespace Freescape
+} // End of namespace Image
diff --git a/engines/freescape/scr.h b/image/scr.h
similarity index 80%
rename from engines/freescape/scr.h
rename to image/scr.h
index 054dc0a16de..6c4799598d7 100644
--- a/engines/freescape/scr.h
+++ b/image/scr.h
@@ -19,21 +19,29 @@
*
*/
-#ifndef FREESCAPE_SCR_H
-#define FREESCAPE_SCR_H
+#ifndef IMAGE_SCR_H
+#define IMAGE_SCR_H
#include "image/image_decoder.h"
-/*
-ZX-Spectrum SCREEN$ decoder based on:
-https://gist.github.com/alexanderk23/f459c76847d9412548f7
-*/
+/**
+ * @defgroup image_scr SCR decoder
+ * @ingroup image
+ *
+ * @brief Decoder for ZX-Spectrum SCREEN$ based on:
+ * https://gist.github.com/alexanderk23/f459c76847d9412548f7
+ *
+ *
+ * Used in engines:
+ * - Freescape
+ * @{
+ */
namespace Common {
class SeekableReadStream;
}
-namespace Freescape {
+namespace Image {
class ScrDecoder : public Image::ImageDecoder {
public:
@@ -49,6 +57,6 @@ private:
uint32 getPixelAddress(int x, int y);
uint32 getAttributeAddress(int x, int y);
};
-} // End of namespace Freescape
+} // End of namespace Image
-#endif // FREESCAPE_SCR_H
+#endif // IMAGE_SCR_H
\ No newline at end of file
Commit: 883e96e3dc39ca98f005b2c7a6e94a026aa9c5d3
https://github.com/scummvm/scummvm/commit/883e96e3dc39ca98f005b2c7a6e94a026aa9c5d3
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2023-11-18T22:12:23+01:00
Commit Message:
IMAGE: moved neo decoder from freescape to image
Changed paths:
A image/neo.cpp
A image/neo.h
R engines/freescape/neo.cpp
R engines/freescape/neo.h
engines/freescape/freescape.cpp
engines/freescape/module.mk
image/module.mk
diff --git a/engines/freescape/freescape.cpp b/engines/freescape/freescape.cpp
index 0d6464b2c0c..f5495159986 100644
--- a/engines/freescape/freescape.cpp
+++ b/engines/freescape/freescape.cpp
@@ -25,11 +25,11 @@
#include "common/random.h"
#include "common/timer.h"
#include "graphics/cursorman.h"
+#include "image/neo.h"
+#include "image/scr.h"
#include "freescape/freescape.h"
#include "freescape/language/8bitDetokeniser.h"
-#include "freescape/neo.h"
-#include "image/scr.h"
#include "freescape/objects/sensor.h"
namespace Freescape {
@@ -877,7 +877,7 @@ void FreescapeEngine::clearTemporalMessages() {
byte *FreescapeEngine::getPaletteFromNeoImage(Common::SeekableReadStream *stream, int offset) {
stream->seek(offset);
- NeoDecoder decoder;
+ Image::NeoDecoder decoder;
decoder.loadStream(*stream);
byte *palette = (byte *)malloc(16 * 3 * sizeof(byte));
memcpy(palette, decoder.getPalette(), 16 * 3 * sizeof(byte));
@@ -886,7 +886,7 @@ byte *FreescapeEngine::getPaletteFromNeoImage(Common::SeekableReadStream *stream
Graphics::ManagedSurface *FreescapeEngine::loadAndConvertNeoImage(Common::SeekableReadStream *stream, int offset, byte *palette) {
stream->seek(offset);
- NeoDecoder decoder(palette);
+ Image::NeoDecoder decoder(palette);
decoder.loadStream(*stream);
Graphics::ManagedSurface *surface = new Graphics::ManagedSurface();
surface->copyFrom(*decoder.getSurface());
diff --git a/engines/freescape/module.mk b/engines/freescape/module.mk
index 26c20b3ac05..a074d330ed3 100644
--- a/engines/freescape/module.mk
+++ b/engines/freescape/module.mk
@@ -30,7 +30,6 @@ MODULE_OBJS := \
language/instruction.o \
metaengine.o \
movement.o \
- neo.o \
objects/geometricobject.o \
objects/group.o \
objects/sensor.o \
diff --git a/image/module.mk b/image/module.mk
index f0d3c0faeae..df24ea3f61f 100644
--- a/image/module.mk
+++ b/image/module.mk
@@ -6,6 +6,7 @@ MODULE_OBJS := \
gif.o \
iff.o \
jpeg.o \
+ neo.o \
pcx.o \
pict.o \
png.o \
diff --git a/engines/freescape/neo.cpp b/image/neo.cpp
similarity index 97%
rename from engines/freescape/neo.cpp
rename to image/neo.cpp
index 4adb268e041..04a182a4e23 100644
--- a/engines/freescape/neo.cpp
+++ b/image/neo.cpp
@@ -24,9 +24,9 @@
#include "graphics/pixelformat.h"
#include "graphics/surface.h"
-#include "freescape/neo.h"
+#include "image/neo.h"
-namespace Freescape {
+namespace Image {
NeoDecoder::NeoDecoder(byte *palette) {
_surface = nullptr;
@@ -119,4 +119,4 @@ bool NeoDecoder::loadStream(Common::SeekableReadStream &stream) {
return true;
}
-} // End of namespace Freescape
+} // End of namespace Image
\ No newline at end of file
diff --git a/engines/freescape/neo.h b/image/neo.h
similarity index 82%
rename from engines/freescape/neo.h
rename to image/neo.h
index d52309319f1..60db4154338 100644
--- a/engines/freescape/neo.h
+++ b/image/neo.h
@@ -19,20 +19,28 @@
*
*/
-#ifndef FREESCAPE_NEO_H
-#define FREESCAPE_NEO_H
+#ifndef IMAGE_NEO_H
+#define IMAGE_NEO_H
#include "image/image_decoder.h"
-/*
-Atari-ST Neochrome decoder based on NEOLoad by Jason "Joefish" Railton
-*/
+/**
+ * @defgroup image_neo Neochrome decoder
+ * @ingroup image
+ *
+ * @brief Atari-ST Neochrome decoder based on NEOLoad by Jason "Joefish" Railton
+ *
+ *
+ * Used in engines:
+ * - Freescape
+ * @{
+ */
namespace Common {
class SeekableReadStream;
}
-namespace Freescape {
+namespace Image {
class NeoDecoder : public Image::ImageDecoder {
public:
@@ -52,6 +60,6 @@ private:
byte *_palette;
uint16 _paletteColorCount;
};
-} // End of namespace Freescape
+} // End of namespace Image
-#endif // FREESCAPE_NEO_H
+#endif // IMAGE_NEO_H
\ No newline at end of file
More information about the Scummvm-git-logs
mailing list