aboutsummaryrefslogtreecommitdiff
path: root/engines/saga/saga.h
diff options
context:
space:
mode:
authorAndrew Kurushin2010-10-23 21:56:16 +0000
committerAndrew Kurushin2010-10-23 21:56:16 +0000
commit405c523bbb199919ef172e4cb549625b319e6b2d (patch)
treeff6e32efdcd660f37f615eff22050d6a3922f2e8 /engines/saga/saga.h
parentdeb461d2003e8183402530cd27ae56c289f50050 (diff)
downloadscummvm-rg350-405c523bbb199919ef172e4cb549625b319e6b2d.tar.gz
scummvm-rg350-405c523bbb199919ef172e4cb549625b319e6b2d.tar.bz2
scummvm-rg350-405c523bbb199919ef172e4cb549625b319e6b2d.zip
SAGA: replace decodeBGImage malloc with ByteArray
svn-id: r53748
Diffstat (limited to 'engines/saga/saga.h')
-rw-r--r--engines/saga/saga.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/saga/saga.h b/engines/saga/saga.h
index 987c286560..74ebe1b23f 100644
--- a/engines/saga/saga.h
+++ b/engines/saga/saga.h
@@ -547,14 +547,13 @@ public:
Common::RandomSource _rnd;
private:
- int decodeBGImageRLE(const byte *inbuf, size_t inbuf_len, ByteArray &outbuf);
- int flipImage(byte *img_buf, int columns, int scanlines);
- int unbankBGImage(byte *dest_buf, const byte *src_buf, int columns, int scanlines);
+ bool decodeBGImageRLE(const byte *inbuf, size_t inbuf_len, ByteArray &outbuf);
+ void flipImage(byte *imageBuffer, int columns, int scanlines);
+ void unbankBGImage(byte *dest_buf, const byte *src_buf, int columns, int scanlines);
uint32 _previousTicks;
public:
- int decodeBGImage(const byte *image_data, size_t image_size,
- byte **output_buf, size_t *output_buf_len, int *w, int *h, bool flip = false);
+ bool decodeBGImage(const byte *image_data, size_t image_size, ByteArray &outputBuffer, int *w, int *h, bool flip = false);
const byte *getImagePal(const byte *image_data, size_t image_size);
void loadStrings(StringsTable &stringsTable, const byte *stringsPointer, size_t stringsLength);