projects
/
platform
/
upstream
/
libaec.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2e015ff
)
Only copy options actually set
author
Mathis Rosenhauer
<rosenhauer@dkrz.de>
Tue, 20 Nov 2012 16:27:28 +0000
(17:27 +0100)
committer
Thomas Jahns
<jahns@dkrz.de>
Tue, 19 Feb 2013 10:33:00 +0000
(11:33 +0100)
src/sz_compat.c
patch
|
blob
|
history
diff --git
a/src/sz_compat.c
b/src/sz_compat.c
index
fdb07b8
..
4afe6ed
100644
(file)
--- a/
src/sz_compat.c
+++ b/
src/sz_compat.c
@@
-18,7
+18,8
@@
static int convert_options(int sz_opts)
co[SZ_NN_OPTION_MASK] = AEC_DATA_PREPROCESS;
for (i = 1; i < NOPTS; i <<= 1)
- opts |= co[i];
+ if (sz_opts & i)
+ opts |= co[i];
return opts;
}
@@
-101,7
+102,7
@@
static size_t remove_padding(void *buf, size_t total,
j -= padding_size;
memcpy((char *)buf + j, (char *)buf + i, pixel_size);
}
- if (
(i % (line_size + padding_size)
) == 0)
+ if (
i % (line_size + padding_size
) == 0)
j -= padding_size;
return j;
}