[Scummvm-git-logs] scummvm master -> cffdc106a8c8211fb6c793fe0402fb87def733ca

antoniou79 a.antoniou79 at gmail.com
Fri Jul 9 07:14:24 UTC 2021


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
cffdc106a8 ANDROID: Use 64bit version of AAsset_getLength and AAsset_seek


Commit: cffdc106a8c8211fb6c793fe0402fb87def733ca
    https://github.com/scummvm/scummvm/commit/cffdc106a8c8211fb6c793fe0402fb87def733ca
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2021-07-09T10:13:50+03:00

Commit Message:
ANDROID: Use 64bit version of AAsset_getLength and AAsset_seek

Complementary to commit 8e55f03b6db86ce8f728460177f92a07e17ee972

Changed paths:
    backends/platform/android/asset-archive.cpp


diff --git a/backends/platform/android/asset-archive.cpp b/backends/platform/android/asset-archive.cpp
index 05cbb524f1..0d8fab8415 100644
--- a/backends/platform/android/asset-archive.cpp
+++ b/backends/platform/android/asset-archive.cpp
@@ -59,15 +59,15 @@ private:
 	void close();
 	AAsset *_asset;
 
-	uint32 _pos;
-	uint32 _len;
+	int64 _pos;
+	int64 _len;
 	bool _eos;
 };
 
 AssetInputStream::AssetInputStream(AAssetManager *as, const Common::String &path) :
 	_eos(false), _pos(0) {
 	_asset = AAssetManager_open(as, path.c_str(), AASSET_MODE_RANDOM);
-	_len = AAsset_getLength(_asset);
+	_len = AAsset_getLength64(_asset);
 }
 
 AssetInputStream::~AssetInputStream() {
@@ -90,7 +90,7 @@ uint32 AssetInputStream::read(void *dataPtr, uint32 dataSize) {
 }
 
 bool AssetInputStream::seek(int64 offset, int whence) {
-	int res = AAsset_seek(_asset, offset, whence);
+	int64 res = AAsset_seek64(_asset, offset, whence);
 	if (res == -1) {
 		return false;
 	}




More information about the Scummvm-git-logs mailing list