1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
Description: Fix IPATCH_FILE_SWAP16 usage in IpatchSF2Reader
Author: Joshua Element Green <jgreen@users.sourceforge.net>
Origin: upstream, https://sourceforge.net/p/swami/code/ci/5a2a3816c8757b28bfed9ada29180f3a75c54133
Bug-Debian: https://bugs.debian.org/894386
--- a/libinstpatch/IpatchSF2Reader.c
+++ b/libinstpatch/IpatchSF2Reader.c
@@ -647,13 +647,13 @@ sfload_pbags (IpatchSF2Reader *reader, G
if (!ipatch_file_read (riff->handle, bag_table, chunk->size, err))
return (FALSE); /* bag_table will be freed by finalize() */
- pgenndx = IPATCH_FILE_SWAP16 (riff->handle, &bag_table[0]);
- pmodndx = IPATCH_FILE_SWAP16 (riff->handle, &bag_table[1]);
+ pgenndx = IPATCH_FILE_SWAP16 (riff->handle->file, &bag_table[0]);
+ pmodndx = IPATCH_FILE_SWAP16 (riff->handle->file, &bag_table[1]);
for (i=0; i < reader->pbag_count; i++)
{
- genndx = IPATCH_FILE_SWAP16 (riff->handle, &bag_table[(i+1)*2]);
- modndx = IPATCH_FILE_SWAP16 (riff->handle, &bag_table[(i+1)*2+1]);
+ genndx = IPATCH_FILE_SWAP16 (riff->handle->file, &bag_table[(i+1)*2]);
+ modndx = IPATCH_FILE_SWAP16 (riff->handle->file, &bag_table[(i+1)*2+1]);
if (genndx < pgenndx)
{
@@ -973,13 +973,13 @@ sfload_ibags (IpatchSF2Reader *reader, G
if (!ipatch_file_read (riff->handle, bag_table, chunk->size, err))
return (FALSE); /* bag_table will be freed by finalize() */
- pgenndx = IPATCH_FILE_SWAP16 (riff->handle, &bag_table[0]);
- pmodndx = IPATCH_FILE_SWAP16 (riff->handle, &bag_table[1]);
+ pgenndx = IPATCH_FILE_SWAP16 (riff->handle->file, &bag_table[0]);
+ pmodndx = IPATCH_FILE_SWAP16 (riff->handle->file, &bag_table[1]);
for (i=0; i < reader->ibag_count; i++)
{
- genndx = IPATCH_FILE_SWAP16 (riff->handle, &bag_table[(i+1)*2]);
- modndx = IPATCH_FILE_SWAP16 (riff->handle, &bag_table[(i+1)*2+1]);
+ genndx = IPATCH_FILE_SWAP16 (riff->handle->file, &bag_table[(i+1)*2]);
+ modndx = IPATCH_FILE_SWAP16 (riff->handle->file, &bag_table[(i+1)*2+1]);
if (genndx < pgenndx)
{
|
