Un-choosy-fy std/png decoder.filter_2

This commit is contained in:
Nigel Tao committed 2021-02-18 13:32:25 +11:00
1 parent bbc720c261
commit 26c7fb941f
2 files changed
+1 -22

No files matched your search

-19
View File
@@ -8537,10 +8537,6 @@ struct wuffs_png__decoder__struct {
wuffs_base__empty_struct (*choosy_filter_1)(
wuffs_png__decoder* self,
wuffs_base__slice_u8 a_curr);
wuffs_base__empty_struct (*choosy_filter_2)(
wuffs_png__decoder* self,
wuffs_base__slice_u8 a_curr,
wuffs_base__slice_u8 a_prev);
wuffs_base__empty_struct (*choosy_filter_3)(
wuffs_png__decoder* self,
wuffs_base__slice_u8 a_curr,
@@ -31328,12 +31324,6 @@ wuffs_png__decoder__filter_2(
wuffs_base__slice_u8 a_curr,
wuffs_base__slice_u8 a_prev);
static wuffs_base__empty_struct
wuffs_png__decoder__filter_2__choosy_default(
wuffs_png__decoder* self,
wuffs_base__slice_u8 a_curr,
wuffs_base__slice_u8 a_prev);
static wuffs_base__empty_struct
wuffs_png__decoder__filter_3(
wuffs_png__decoder* self,
@@ -31548,7 +31538,6 @@ wuffs_png__decoder__initialize(
}
self->private_impl.choosy_filter_1 = &wuffs_png__decoder__filter_1__choosy_default;
self->private_impl.choosy_filter_2 = &wuffs_png__decoder__filter_2__choosy_default;
self->private_impl.choosy_filter_3 = &wuffs_png__decoder__filter_3__choosy_default;
self->private_impl.choosy_filter_4 = &wuffs_png__decoder__filter_4__choosy_default;
self->private_impl.choosy_filter_and_swizzle = &wuffs_png__decoder__filter_and_swizzle__choosy_default;
@@ -32066,14 +32055,6 @@ wuffs_png__decoder__filter_2(
wuffs_png__decoder* self,
wuffs_base__slice_u8 a_curr,
wuffs_base__slice_u8 a_prev) {
return (*self->private_impl.choosy_filter_2)(self, a_curr, a_prev);
}
static wuffs_base__empty_struct
wuffs_png__decoder__filter_2__choosy_default(
wuffs_png__decoder* self,
wuffs_base__slice_u8 a_curr,
wuffs_base__slice_u8 a_prev) {
uint64_t v_n = 0;
uint64_t v_i = 0;
+1 -3
View File
@@ -78,9 +78,7 @@ pri func decoder.filter_1_distance_4_fallback!(curr: slice base.u8) {
// Filter 2: Up.
pri func decoder.filter_2!(curr: slice base.u8, prev: slice base.u8),
choosy,
{
pri func decoder.filter_2!(curr: slice base.u8, prev: slice base.u8) {
var n : base.u64
var i : base.u64