indrajith/reilua-enhanced
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CopyBufferData uses size instead of length.

Browse Source
This commit is contained in:
jussi
2024-08-29 12:13:30 +03:00
parent 35e73465ac
commit 366f8f5c92
4 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
API.md
View File

@@ -5502,9 +5502,9 @@ Unload buffer data
--- ---
> RL.CopyBufferData( Buffer dst, Buffer src, int posDst, int posSrc, int length ) > RL.CopyBufferData( Buffer dst, Buffer src, int posDst, int posSrc, int size )
Copy buffer data to another buffer. src element size is used for length Copy buffer data to another buffer. Size is in bytes
--- ---

6
ReiLua_API.lua
View File

@@ -2660,14 +2660,14 @@ function RL.LoadBufferFromString( buffer ) end
---@return any RL.UnloadBuffer ---@return any RL.UnloadBuffer
function RL.UnloadBuffer( buffer ) end function RL.UnloadBuffer( buffer ) end
---Copy buffer data to another buffer. src element size is used for length ---Copy buffer data to another buffer. Size is in bytes
---@param dst any ---@param dst any
---@param src any ---@param src any
---@param posDst integer ---@param posDst integer
---@param posSrc integer ---@param posSrc integer
---@param length integer ---@param size integer
---@return any RL.CopyBufferData ---@return any RL.CopyBufferData
function RL.CopyBufferData( dst, src, posDst, posSrc, length ) end function RL.CopyBufferData( dst, src, posDst, posSrc, size ) end
---Set buffer data value ---Set buffer data value
---@param buffer any ---@param buffer any

2
examples/compressed_resource_file/main.lua
View File

@@ -61,7 +61,7 @@ local function loadDataFile( path )
imgData.data = RL.LoadBufferFormatted( imageDataSize, RL.BUFFER_UNSIGNED_CHAR, 0 ) imgData.data = RL.LoadBufferFormatted( imageDataSize, RL.BUFFER_UNSIGNED_CHAR, 0 )
RL.CopyBufferData( imgData.data, buffer, 0, 4, imageDataSize / 4 ) RL.CopyBufferData( imgData.data, buffer, 0, 4, imageDataSize )
local image = RL.LoadImageFromData( local image = RL.LoadImageFromData(
imgData.data, imgData.data,

15
src/core.c
View File

@@ -3494,7 +3494,7 @@ int lcoreLoadBufferFromFile( lua_State* L ) {
lua_pushnil( L ); lua_pushnil( L );
return 1; return 1;
} }
fread( buffer.data, buffer.size, 1, file ); fread( buffer.data, 1, buffer.size, file );
fclose( file ); fclose( file );
uluaPushBuffer( L, buffer ); uluaPushBuffer( L, buffer );
@@ -3541,28 +3541,27 @@ int lcoreUnloadBuffer( lua_State* L ) {
} }
/* /*
> RL.CopyBufferData( Buffer dst, Buffer src, int posDst, int posSrc, int length ) > RL.CopyBufferData( Buffer dst, Buffer src, int posDst, int posSrc, int size )
Copy buffer data to another buffer. src element size is used for length Copy buffer data to another buffer. Size is in bytes
*/ */
int lcoreCopyBufferData( lua_State* L ) { int lcoreCopyBufferData( lua_State* L ) {
Buffer* dst = uluaGetBuffer( L, 1 ); Buffer* dst = uluaGetBuffer( L, 1 );
Buffer* src = uluaGetBuffer( L, 2 ); Buffer* src = uluaGetBuffer( L, 2 );
int posDst = luaL_checkinteger( L, 3 ); int posDst = luaL_checkinteger( L, 3 );
int posSrc = luaL_checkinteger( L, 4 ); int posSrc = luaL_checkinteger( L, 4 );
int length = luaL_checkinteger( L, 5 ); int size = luaL_checkinteger( L, 5 );
void* dstP = dst->data + posDst * getBufferElementSize( dst ); void* dstP = dst->data + posDst * getBufferElementSize( dst );
void* srcP = src->data + posSrc * getBufferElementSize( src ); void* srcP = src->data + posSrc * getBufferElementSize( src );
size_t size = length * getBufferElementSize( src );
/* Note that we use src element size for dst length. */ /* Note that we use src element size for dst length. */
if ( posDst < 0 || dst->size < posDst * getBufferElementSize( dst ) + size ) { if ( posDst < 0 || dst->size < posDst * getBufferElementSize( dst ) + size ) {
TraceLog( state->logLevelInvalid, "CopyBufferData. posDst %d with length %d out of bounds", posDst, length ); TraceLog( state->logLevelInvalid, "CopyBufferData. posDst %d with size %d out of bounds", posDst, size );
return 0; return 0;
} }
if ( posSrc < 0 || src->size < posSrc * getBufferElementSize( src ) + size ) { if ( posSrc < 0 || src->size < posSrc * getBufferElementSize( src ) + size ) {
TraceLog( state->logLevelInvalid, "CopyBufferData. posSrc %d with length %d out of bounds", posSrc, length ); TraceLog( state->logLevelInvalid, "CopyBufferData. posSrc %d with size %d out of bounds", posSrc, size );
return 0; return 0;
} }
memcpy( dstP, srcP, size ); memcpy( dstP, srcP, size );
@@ -3809,7 +3808,7 @@ int lcoreExportBuffer( lua_State* L ) {
FILE* file; FILE* file;
file = fopen( path, "wb" ); file = fopen( path, "wb" );
fwrite( buffer->data, buffer->size, 1, file ); fwrite( buffer->data, 1, buffer->size, file );
fclose( file ); fclose( file );
return 0; return 0;