[Scummvm-git-logs] scummvm master -> 29713de5cc7d2e259c7036167c8988f3be86195b
bluegr
noreply at scummvm.org
Mon Sep 23 20:29:24 UTC 2024
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:
29713de5cc SCI: fix RELEASE_BUILD tests
Commit: 29713de5cc7d2e259c7036167c8988f3be86195b
https://github.com/scummvm/scummvm/commit/29713de5cc7d2e259c7036167c8988f3be86195b
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2024-09-23T23:29:21+03:00
Commit Message:
SCI: fix RELEASE_BUILD tests
Changed paths:
engines/sci/graphics/celobj32.cpp
diff --git a/engines/sci/graphics/celobj32.cpp b/engines/sci/graphics/celobj32.cpp
index 85d71853f2e..23350bf328d 100644
--- a/engines/sci/graphics/celobj32.cpp
+++ b/engines/sci/graphics/celobj32.cpp
@@ -129,19 +129,25 @@ struct SCALER_NoScale {
_rowEdge = _row - 1;
#endif
_row += _lastIndex - (x - _sourceX);
+#ifndef RELEASE_BUILD
+
assert(_row > _rowEdge);
+#endif
} else {
#ifndef RELEASE_BUILD
_rowEdge = _row + _lastIndex + 1;
#endif
_row += x - _sourceX;
+#ifndef RELEASE_BUILD
assert(_row < _rowEdge);
+#endif
}
}
inline byte read() {
+#ifndef RELEASE_BUILD
assert(_row != _rowEdge);
-
+#endif
if (FLIP) {
return *_row--;
} else {
@@ -297,11 +303,15 @@ struct SCALER_Scale {
? static_cast<const byte *>( _sourceBuffer->getBasePtr(0, _valuesY[y]))
: _reader.getRow(_valuesY[y]);
_x = x;
+#ifndef RELEASE_BUILD
assert(_x >= _minX && _x <= _maxX);
+#endif
}
inline byte read() {
+#ifndef RELEASE_BUILD
assert(_x >= _minX && _x <= _maxX);
+#endif
return _row[_valuesX[_x++]];
}
};
@@ -343,7 +353,9 @@ public:
}
inline const byte *getRow(const int16 y) const {
+#ifndef RELEASE_BUILD
assert(y >= 0 && y < _sourceHeight);
+#endif
return _pixels + y * _sourceWidth;
}
};
More information about the Scummvm-git-logs
mailing list