[Scummvm-git-logs] scummvm master -> 7443b55507c1041e87e0f17f715d9b45f916935d
dreammaster
noreply at scummvm.org
Wed Mar 30 05:24:55 UTC 2022
This automated email contains information about 7 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
5d67d62cab AGS: Fixed MemoryStream::ReadByte()
b6815247da AGS: Fixed AdjustBitmapForUseWithDisplayMode()
d2bb96db47 AGS: Fixed printing error in SpriteCache::LoadSprite()
5c49430367 AGS: Removed 16-bit BGR bitmap conversion as redundant
e379c04198 AGS: Remove deprecated method
59ff6beda1 AGS: Remove redundant code from engine_setup_color_conversions()
7443b55507 AGS: Change MemoryStream to work with arrays of uint8_t (was char)
Commit: 5d67d62cab2dc69982eb612fff34c25c350b026b
https://github.com/scummvm/scummvm/commit/5d67d62cab2dc69982eb612fff34c25c350b026b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2022-03-29T21:51:17-07:00
Commit Message:
AGS: Fixed MemoryStream::ReadByte()
>From upstream 07c7f8492771cffa9b6831c0a56b2e8a7fdd5410
Changed paths:
engines/ags/shared/util/memory_stream.cpp
diff --git a/engines/ags/shared/util/memory_stream.cpp b/engines/ags/shared/util/memory_stream.cpp
index baa77c87a17..d08613110d2 100644
--- a/engines/ags/shared/util/memory_stream.cpp
+++ b/engines/ags/shared/util/memory_stream.cpp
@@ -110,7 +110,7 @@ int32_t MemoryStream::ReadByte() {
if (EOS()) {
return -1;
}
- return _cbuf[(size_t)(_pos++)];
+ return static_cast<uint8_t>(_cbuf[(size_t)(_pos++)]);
}
size_t MemoryStream::Write(const void *buffer, size_t size) {
Commit: b6815247dac7d48556476bedfc6029d0f132607a
https://github.com/scummvm/scummvm/commit/b6815247dac7d48556476bedfc6029d0f132607a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2022-03-29T22:07:28-07:00
Commit Message:
AGS: Fixed AdjustBitmapForUseWithDisplayMode()
>From upstream 077803120808a9b18a888bb24f7124844f21fa00
Changed paths:
engines/ags/engine/ac/draw.cpp
diff --git a/engines/ags/engine/ac/draw.cpp b/engines/ags/engine/ac/draw.cpp
index 02bb0221e66..6f5e9890087 100644
--- a/engines/ags/engine/ac/draw.cpp
+++ b/engines/ags/engine/ac/draw.cpp
@@ -148,11 +148,8 @@ Bitmap *convert_32_to_32bgr(Bitmap *tempbl) {
//
Bitmap *AdjustBitmapForUseWithDisplayMode(Bitmap *bitmap, bool has_alpha) {
const int bmp_col_depth = bitmap->GetColorDepth();
-#if defined (AGS_INVERTED_COLOR_ORDER)
- const int sys_col_depth = System_GetColorDepth();
-#endif
+ const int compat_col_depth = _G(gfxDriver)->GetCompatibleBitmapFormat(bmp_col_depth);
const int game_col_depth = _GP(game).GetColorDepth();
- const int compat_col_depth = _G(gfxDriver)->GetCompatibleBitmapFormat(game_col_depth);
const bool must_switch_palette = bitmap->GetColorDepth() == 8 && game_col_depth > 8;
if (must_switch_palette)
@@ -167,6 +164,7 @@ Bitmap *AdjustBitmapForUseWithDisplayMode(Bitmap *bitmap, bool has_alpha) {
// to match graphics driver expectation about pixel format.
// TODO: make GetCompatibleBitmapFormat tell this somehow
#if defined (AGS_INVERTED_COLOR_ORDER)
+ const int sys_col_depth = System_GetColorDepth();
if (sys_col_depth > 16 && bmp_col_depth == 32) {
// Convert RGB to BGR.
new_bitmap = convert_32_to_32bgr(bitmap);
Commit: d2bb96db47b6737a4ce98ff5084d8bea71c2ce16
https://github.com/scummvm/scummvm/commit/d2bb96db47b6737a4ce98ff5084d8bea71c2ce16
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2022-03-29T22:09:00-07:00
Commit Message:
AGS: Fixed printing error in SpriteCache::LoadSprite()
>From upstream 2398b431552b182f98c9fd5ee48204e8688694a5
Changed paths:
engines/ags/shared/ac/sprite_cache.cpp
diff --git a/engines/ags/shared/ac/sprite_cache.cpp b/engines/ags/shared/ac/sprite_cache.cpp
index a90f311241d..e80de98edee 100644
--- a/engines/ags/shared/ac/sprite_cache.cpp
+++ b/engines/ags/shared/ac/sprite_cache.cpp
@@ -374,7 +374,7 @@ size_t SpriteCache::LoadSprite(sprkey_t index) {
if (!image) {
Debug::Printf(kDbgGroup_SprCache, kDbgMsg_Warn,
"LoadSprite: failed to load sprite %d:\n%s\n - remapping to sprite 0.", index,
- err ? err->FullMessage().GetCStr() : "Sprite does not exist.");
+ err ? "Sprite does not exist." : err->FullMessage().GetCStr());
RemapSpriteToSprite0(index);
return 0;
}
Commit: 5c49430367f94f1d900a62325fa7379fd96c5409
https://github.com/scummvm/scummvm/commit/5c49430367f94f1d900a62325fa7379fd96c5409
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2022-03-29T22:14:28-07:00
Commit Message:
AGS: Removed 16-bit BGR bitmap conversion as redundant
>From upstream 759f0111901e567c71814f679eaa97fda5c491b8
Changed paths:
engines/ags/engine/ac/draw.cpp
engines/ags/engine/ac/global_debug.cpp
engines/ags/engine/main/engine_setup.cpp
diff --git a/engines/ags/engine/ac/draw.cpp b/engines/ags/engine/ac/draw.cpp
index 6f5e9890087..f0b8110bf5c 100644
--- a/engines/ags/engine/ac/draw.cpp
+++ b/engines/ags/engine/ac/draw.cpp
@@ -84,33 +84,6 @@ void setpal() {
int _places_r = 3, _places_g = 2, _places_b = 3;
-// convert RGB to BGR for strange graphics cards
-Bitmap *convert_16_to_16bgr(Bitmap *tempbl) {
-
- int x, y;
- unsigned short c, r, ds, b;
-
- for (y = 0; y < tempbl->GetHeight(); y++) {
- unsigned short *p16 = (unsigned short *)tempbl->GetScanLine(y);
-
- for (x = 0; x < tempbl->GetWidth(); x++) {
- c = p16[x];
- if (c != MASK_COLOR_16) {
- b = _rgb_scale_5[c & 0x1F];
- ds = _rgb_scale_6[(c >> 5) & 0x3F];
- r = _rgb_scale_5[(c >> 11) & 0x1F];
- // allegro assumes 5-6-5 for 16-bit
- p16[x] = (((r >> _places_r) << _G(_rgb_r_shift_16)) |
- ((ds >> _places_g) << _G(_rgb_g_shift_16)) |
- ((b >> _places_b) << _G(_rgb_b_shift_16)));
-
- }
- }
- }
-
- return tempbl;
-}
-
// PSP: convert 32 bit RGB to BGR.
Bitmap *convert_32_to_32bgr(Bitmap *tempbl) {
@@ -192,10 +165,6 @@ Bitmap *AdjustBitmapForUseWithDisplayMode(Bitmap *bitmap, bool has_alpha) {
else // else simply convert bitmap
new_bitmap = BitmapHelper::CreateBitmapCopy(bitmap, compat_col_depth);
}
- // Special case when we must convert 16-bit RGB to BGR
- else if (_G(convert_16bit_bgr) == 1 && bmp_col_depth == 16) {
- new_bitmap = convert_16_to_16bgr(bitmap);
- }
// Finally, if we did not create a new copy already, - convert to driver compatible format
if ((new_bitmap == bitmap) && (bmp_col_depth != compat_col_depth))
diff --git a/engines/ags/engine/ac/global_debug.cpp b/engines/ags/engine/ac/global_debug.cpp
index af8a2fa9477..1e3c6fe0d7d 100644
--- a/engines/ags/engine/ac/global_debug.cpp
+++ b/engines/ags/engine/ac/global_debug.cpp
@@ -56,16 +56,16 @@ String GetRuntimeInfo() {
Rect render_frame = _G(gfxDriver)->GetRenderDestination();
PGfxFilter filter = _G(gfxDriver)->GetGraphicsFilter();
String runtimeInfo = String::FromFormat(
- "Adventure Game Studio run-time engine[ACI version %s"
- "[Game resolution %d x %d (%d-bit)"
- "[Running %d x %d at %d-bit%s%s[GFX: %s; %s[Draw frame %d x %d["
- "Sprite cache size: %d KB (limit %d KB; %d locked)",
- _G(EngineVersion).LongString.GetCStr(), _GP(game).GetGameRes().Width, _GP(game).GetGameRes().Height, _GP(game).GetColorDepth(),
- mode.Width, mode.Height, mode.ColorDepth, (_G(convert_16bit_bgr)) ? " BGR" : "",
- mode.IsWindowed() ? " W" : "",
- _G(gfxDriver)->GetDriverName(), filter->GetInfo().Name.GetCStr(),
- render_frame.GetWidth(), render_frame.GetHeight(),
- _GP(spriteset).GetCacheSize() / 1024, _GP(spriteset).GetMaxCacheSize() / 1024, _GP(spriteset).GetLockedSize() / 1024);
+ "Adventure Game Studio run-time engine[ACI version %s"
+ "[Game resolution %d x %d (%d-bit)"
+ "[Running %d x %d at %d-bit%s[GFX: %s; %s[Draw frame %d x %d["
+ "Sprite cache size: %d KB (limit %d KB; %d locked)",
+ _G(EngineVersion).LongString.GetCStr(), _GP(game).GetGameRes().Width, _GP(game).GetGameRes().Height, _GP(game).GetColorDepth(),
+ mode.Width, mode.Height, mode.ColorDepth,
+ mode.IsWindowed() ? " W" : "",
+ _G(gfxDriver)->GetDriverName(), filter->GetInfo().Name.GetCStr(),
+ render_frame.GetWidth(), render_frame.GetHeight(),
+ _GP(spriteset).GetCacheSize() / 1024, _GP(spriteset).GetMaxCacheSize() / 1024, _GP(spriteset).GetLockedSize() / 1024);
if (_GP(play).separate_music_lib)
runtimeInfo.Append("[AUDIO.VOX enabled");
if (_GP(play).voice_avail)
diff --git a/engines/ags/engine/main/engine_setup.cpp b/engines/ags/engine/main/engine_setup.cpp
index 4e8a1f47045..6906f762aa8 100644
--- a/engines/ags/engine/main/engine_setup.cpp
+++ b/engines/ags/engine/main/engine_setup.cpp
@@ -181,17 +181,6 @@ void engine_setup_color_conversions(int coldepth) {
_G(_rgb_g_shift_15) = 5;
_G(_rgb_b_shift_15) = 0;
- // Most cards do 5-6-5 RGB, which is the format the files are saved in
- // Some do 5-6-5 BGR, or 6-5-5 RGB, in which case convert the gfx
- if ((coldepth == 16) && ((_G(_rgb_b_shift_16) != 0) || (_G(_rgb_r_shift_16) != 11))) {
- _G(convert_16bit_bgr) = 1;
- if (_G(_rgb_r_shift_16) == 10) {
- // some very old graphics cards lie about being 16-bit when they
- // are in fact 15-bit ... get around this
- _G(places_r) = 3;
- _G(places_g) = 3;
- }
- }
if (coldepth > 16) {
// when we're using 32-bit colour, it converts hi-color images
// the wrong way round - so fix that
Commit: e379c041980bdf4c1d22225d930f146869389076
https://github.com/scummvm/scummvm/commit/e379c041980bdf4c1d22225d930f146869389076
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2022-03-29T22:16:06-07:00
Commit Message:
AGS: Remove deprecated method
Changed paths:
engines/ags/shared/font/fonts.cpp
engines/ags/shared/font/fonts.h
diff --git a/engines/ags/shared/font/fonts.cpp b/engines/ags/shared/font/fonts.cpp
index 1ae62b329bf..0eb4b658117 100644
--- a/engines/ags/shared/font/fonts.cpp
+++ b/engines/ags/shared/font/fonts.cpp
@@ -167,16 +167,6 @@ int get_font_outline_thickness(size_t font_number) {
return _GP(fonts)[font_number].Info.AutoOutlineThickness;
}
-int get_font_outline_font(size_t font_number) {
- for (size_t fontNum = 0; fontNum < _GP(fonts).size(); ++fontNum) {
- if (_GP(fonts)[fontNum].Info.Outline == (int)font_number)
- return fontNum;
- }
-
- return FONT_OUTLINE_NONE;
- return _GP(fonts)[font_number].Info.AutoOutlineThickness;
-}
-
void set_font_outline(size_t font_number, int outline_type,
enum FontInfo::AutoOutlineStyle style, int thickness) {
if (font_number >= _GP(fonts).size())
diff --git a/engines/ags/shared/font/fonts.h b/engines/ags/shared/font/fonts.h
index 751e869ebd5..10322040b48 100644
--- a/engines/ags/shared/font/fonts.h
+++ b/engines/ags/shared/font/fonts.h
@@ -111,8 +111,6 @@ int get_text_lines_height(size_t fontNumber, size_t numlines);
// Gets the height of a graphic surface enough to accomodate this number of text lines;
// note this accounts for the real pixel font height
int get_text_lines_surf_height(size_t fontNumber, size_t numlines);
-// get the source font associated with an outline font
-int get_font_outline_font(size_t font_number);
// Set font's outline type
void set_font_outline(size_t font_number, int outline_type,
enum FontInfo::AutoOutlineStyle style = FontInfo::kSquared, int thickness = 1);
Commit: 59ff6beda1009223021d622ca699668eb93da26f
https://github.com/scummvm/scummvm/commit/59ff6beda1009223021d622ca699668eb93da26f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2022-03-29T22:18:00-07:00
Commit Message:
AGS: Remove redundant code from engine_setup_color_conversions()
>From upstream 914d025655277e6e86d3ae8eb42adb8c196969f8
Changed paths:
engines/ags/engine/main/engine_setup.cpp
diff --git a/engines/ags/engine/main/engine_setup.cpp b/engines/ags/engine/main/engine_setup.cpp
index 6906f762aa8..f4843f59f84 100644
--- a/engines/ags/engine/main/engine_setup.cpp
+++ b/engines/ags/engine/main/engine_setup.cpp
@@ -170,7 +170,7 @@ void engine_pre_gfxsystem_screen_destroy() {
// Setup color conversion parameters
void engine_setup_color_conversions(int coldepth) {
- // default shifts for how we store the sprite data1
+ // default shifts for how we store the sprite data
_G(_rgb_r_shift_32) = 16;
_G(_rgb_g_shift_32) = 8;
_G(_rgb_b_shift_32) = 0;
@@ -181,20 +181,10 @@ void engine_setup_color_conversions(int coldepth) {
_G(_rgb_g_shift_15) = 5;
_G(_rgb_b_shift_15) = 0;
- if (coldepth > 16) {
- // when we're using 32-bit colour, it converts hi-color images
- // the wrong way round - so fix that
-
- _G(_rgb_r_shift_16) = 11;
- _G(_rgb_g_shift_16) = 5;
- _G(_rgb_b_shift_16) = 0;
- } else if (coldepth == 16) {
- // ensure that any 32-bit graphics displayed are converted
- // properly to the current depth
- _G(_rgb_r_shift_32) = 16;
- _G(_rgb_g_shift_32) = 8;
- _G(_rgb_b_shift_32) = 0;
- } else if (coldepth < 16) {
+ // TODO: investigate if this is still necessary, and under which circumstances?
+ // the color conversion should likely be done when preparing textures or
+ // rendering to final output instead, not in the main engine code.
+ if (coldepth < 16) {
// ensure that any 32-bit graphics displayed are converted
// properly to the current depth
#if AGS_PLATFORM_OS_WINDOWS
Commit: 7443b55507c1041e87e0f17f715d9b45f916935d
https://github.com/scummvm/scummvm/commit/7443b55507c1041e87e0f17f715d9b45f916935d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2022-03-29T22:24:19-07:00
Commit Message:
AGS: Change MemoryStream to work with arrays of uint8_t (was char)
>From upstream c9317cdf92c1729f95453182474b3063ff25deec
Changed paths:
engines/ags/shared/ac/sprite_file.cpp
engines/ags/shared/ac/sprite_file.h
engines/ags/shared/util/memory_stream.cpp
engines/ags/shared/util/memory_stream.h
diff --git a/engines/ags/shared/ac/sprite_file.cpp b/engines/ags/shared/ac/sprite_file.cpp
index 2aa4806b6d5..ef08fd907ff 100644
--- a/engines/ags/shared/ac/sprite_file.cpp
+++ b/engines/ags/shared/ac/sprite_file.cpp
@@ -276,7 +276,7 @@ HError SpriteFile::LoadSprite(sprkey_t index, Shared::Bitmap *&sprite) {
}
HError SpriteFile::LoadSpriteData(sprkey_t index, Size &metric, int &bpp,
- std::vector<char> &data) {
+ std::vector<uint8_t> &data) {
metric = Size();
bpp = 0;
if (index < 0 || (size_t)index >= _spriteData.size())
@@ -345,7 +345,7 @@ int SaveSpriteFile(const String &save_to_file,
writer.Begin(compressOutput, lastslot);
std::unique_ptr<Bitmap> temp_bmp; // for disposing temp sprites
- std::vector<char> membuf; // for loading raw sprite data
+ std::vector<uint8_t> membuf; // for loading raw sprite data
const bool diff_compress =
read_from_file && read_from_file->IsFileCompressed() != compressOutput;
@@ -379,7 +379,7 @@ int SaveSpriteFile(const String &save_to_file,
writer.WriteEmptySlot();
continue; // empty slot
}
- writer.WriteSpriteData(membuf, metric.Width, metric.Height, bpp);
+ writer.WriteSpriteData(&membuf[0], membuf.size(), metric.Width, metric.Height, bpp);
}
writer.Finalize();
@@ -446,10 +446,10 @@ void SpriteFileWriter::WriteBitmap(Bitmap *image) {
if (_compress) {
MemoryStream mems(_membuf, kStream_Write);
rle_compress(image, &mems);
- WriteSpriteData(_membuf, w, h, bpp);
+ WriteSpriteData(&_membuf[0], _membuf.size(), w, h, bpp);
_membuf.clear();
} else {
- WriteSpriteData((const char *)image->GetData(), w * h * bpp, w, h, bpp);
+ WriteSpriteData(image->GetData(), w * h * bpp, w, h, bpp);
}
}
@@ -462,7 +462,7 @@ void SpriteFileWriter::WriteEmptySlot() {
_index.Heights.push_back(0);
}
-void SpriteFileWriter::WriteSpriteData(const char *pbuf, size_t len,
+void SpriteFileWriter::WriteSpriteData(const uint8_t *pbuf, size_t len,
int w, int h, int bpp) {
if (!_out) return;
soff_t sproff = _out->GetPosition();
diff --git a/engines/ags/shared/ac/sprite_file.h b/engines/ags/shared/ac/sprite_file.h
index 8052aff5f50..2699964e909 100644
--- a/engines/ags/shared/ac/sprite_file.h
+++ b/engines/ags/shared/ac/sprite_file.h
@@ -104,7 +104,7 @@ public:
// Loads an image data and creates a ready bitmap
HError LoadSprite(sprkey_t index, Bitmap *&sprite);
// Loads an image data into the buffer, reports the bitmap metrics and color depth
- HError LoadSpriteData(sprkey_t index, Size &metric, int &bpp, std::vector<char> &data);
+ HError LoadSpriteData(sprkey_t index, Size &metric, int &bpp, std::vector<uint8_t> &data);
private:
// Seek stream to sprite
@@ -141,9 +141,7 @@ public:
// Writes an empty slot marker
void WriteEmptySlot();
// Writes a raw sprite data without additional processing
- void WriteSpriteData(const char *pbuf, size_t len, int w, int h, int bpp);
- void WriteSpriteData(const std::vector<char> &buf, int w, int h, int bpp)
- { WriteSpriteData(&buf[0], buf.size(), w, h, bpp); }
+ void WriteSpriteData(const uint8_t *pbuf, size_t len, int w, int h, int bpp);
// Finalizes current format; no further writing is possible after this
void Finalize();
@@ -154,7 +152,7 @@ private:
// sprite index accumulated on write for reporting back to user
SpriteFileIndex _index;
// compression buffer
- std::vector<char> _membuf;
+ std::vector<uint8_t> _membuf;
};
// Saves all sprites to file; fills in index data for external use
diff --git a/engines/ags/shared/util/memory_stream.cpp b/engines/ags/shared/util/memory_stream.cpp
index d08613110d2..b49aa6ebcc9 100644
--- a/engines/ags/shared/util/memory_stream.cpp
+++ b/engines/ags/shared/util/memory_stream.cpp
@@ -26,7 +26,7 @@ namespace AGS3 {
namespace AGS {
namespace Shared {
-MemoryStream::MemoryStream(const std::vector<char> &cbuf, DataEndianess stream_endianess)
+MemoryStream::MemoryStream(const std::vector<uint8_t> &cbuf, DataEndianess stream_endianess)
: DataStream(stream_endianess)
, _cbuf(&cbuf.front())
, _len(cbuf.size())
@@ -37,14 +37,14 @@ MemoryStream::MemoryStream(const std::vector<char> &cbuf, DataEndianess stream_e
MemoryStream::MemoryStream(const String &cbuf, DataEndianess stream_endianess)
: DataStream(stream_endianess)
- , _cbuf(cbuf.GetCStr())
+ , _cbuf(reinterpret_cast<const uint8_t *>(cbuf.GetCStr()))
, _len(cbuf.GetLength())
, _buf(nullptr)
, _mode(kStream_Read)
, _pos(0) {
}
-MemoryStream::MemoryStream(std::vector<char> &buf, StreamWorkMode mode, DataEndianess stream_endianess)
+MemoryStream::MemoryStream(std::vector<uint8_t> &buf, StreamWorkMode mode, DataEndianess stream_endianess)
: DataStream(stream_endianess)
, _len(buf.size())
, _buf(&buf)
@@ -110,7 +110,7 @@ int32_t MemoryStream::ReadByte() {
if (EOS()) {
return -1;
}
- return static_cast<uint8_t>(_cbuf[(size_t)(_pos++)]);
+ return _cbuf[(size_t)(_pos++)];
}
size_t MemoryStream::Write(const void *buffer, size_t size) {
diff --git a/engines/ags/shared/util/memory_stream.h b/engines/ags/shared/util/memory_stream.h
index cfb2ce45568..66889ca5ba1 100644
--- a/engines/ags/shared/util/memory_stream.h
+++ b/engines/ags/shared/util/memory_stream.h
@@ -21,7 +21,7 @@
//=============================================================================
//
-// MemoryStream does reading and writing over the buffer of chars stored in
+// MemoryStream does reading and writing over the buffer of bytes stored in
// memory. Currently has rather trivial implementation. Does not own a buffer
// itself, but works with the provided std::vector reference, which means that
// the buffer *must* persist until stream is closed.
@@ -46,13 +46,13 @@ class MemoryStream : public DataStream {
public:
// Construct memory stream in the read-only mode over a const std::vector;
// vector must persist in memory until the stream is closed.
- MemoryStream(const std::vector<char> &cbuf, DataEndianess stream_endianess = kLittleEndian);
+ MemoryStream(const std::vector<uint8_t> &cbuf, DataEndianess stream_endianess = kLittleEndian);
// Construct memory stream in the read-only mode over a const String;
// String object must persist in memory until the stream is closed.
MemoryStream(const String &cbuf, DataEndianess stream_endianess = kLittleEndian);
// Construct memory stream in the chosen mode over a given std::vector;
// vector must persist in memory until the stream is closed.
- MemoryStream(std::vector<char> &buf, StreamWorkMode mode, DataEndianess stream_endianess = kLittleEndian);
+ MemoryStream(std::vector<uint8_t> &buf, StreamWorkMode mode, DataEndianess stream_endianess = kLittleEndian);
~MemoryStream() override;
void Close() override;
@@ -78,9 +78,9 @@ public:
bool Seek(soff_t offset, StreamSeek origin) override;
private:
- const char *_cbuf;
+ const uint8_t *_cbuf;
size_t _len;
- std::vector<char> *_buf;
+ std::vector<uint8_t> *_buf;
const StreamWorkMode _mode;
soff_t _pos;
};
More information about the Scummvm-git-logs
mailing list