mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-19 08:38:14 +01:00
std: add compact_retaining, history_retain_length
This commit is contained in:
1 parent
0f91f23bb6
commit
5fb82e7d0a
33 files changed
+1088
-226
No files matched your search
@@ -212,7 +212,8 @@ main1(int argc, char** argv) {
|
||||
return wuffs_base__status__message(&status);
|
||||
}
|
||||
|
||||
wuffs_base__io_buffer__compact(&src);
|
||||
wuffs_base__io_buffer__compact_retaining(
|
||||
&src, wuffs_bzip2__decoder__history_retain_length(&dec));
|
||||
if (src.meta.wi == src.data.len) {
|
||||
return "main: internal error: no I/O progress possible";
|
||||
}
|
||||
|
||||
@@ -255,11 +255,11 @@ static void //
|
||||
ignore_return_value(int ignored) {}
|
||||
|
||||
const char* //
|
||||
read_more_src() {
|
||||
read_more_src(uint64_t history_retain_length) {
|
||||
if (g_src.meta.closed) {
|
||||
return "main: unexpected end of file";
|
||||
}
|
||||
wuffs_base__io_buffer__compact(&g_src);
|
||||
wuffs_base__io_buffer__compact_retaining(&g_src, history_retain_length);
|
||||
ssize_t n = read(STDIN_FD, g_src.data.ptr + g_src.meta.wi,
|
||||
g_src.data.len - g_src.meta.wi);
|
||||
if (n > 0) {
|
||||
@@ -285,7 +285,7 @@ load_image_type() {
|
||||
(wuffs_base__io_buffer__reader_length(&g_src) == g_src.data.len)) {
|
||||
break;
|
||||
}
|
||||
TRY(read_more_src());
|
||||
TRY(read_more_src(0));
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
@@ -410,7 +410,7 @@ advance_for_redirect() {
|
||||
break;
|
||||
}
|
||||
g_src.meta.ri = g_src.meta.wi;
|
||||
TRY(read_more_src());
|
||||
TRY(read_more_src(0));
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
@@ -437,7 +437,8 @@ redirect:
|
||||
} else if (status.repr != wuffs_base__suspension__short_read) {
|
||||
return wuffs_base__status__message(&status);
|
||||
}
|
||||
TRY(read_more_src());
|
||||
TRY(read_more_src(
|
||||
wuffs_base__image_decoder__history_retain_length(g_image_decoder)));
|
||||
}
|
||||
|
||||
// Read the dimensions.
|
||||
@@ -636,7 +637,8 @@ convert_frames() {
|
||||
} else if (dfc_status.repr != wuffs_base__suspension__short_read) {
|
||||
return wuffs_base__status__message(&dfc_status);
|
||||
}
|
||||
TRY(read_more_src());
|
||||
TRY(read_more_src(
|
||||
wuffs_base__image_decoder__history_retain_length(g_image_decoder)));
|
||||
}
|
||||
|
||||
wuffs_base__flicks duration =
|
||||
@@ -678,7 +680,8 @@ convert_frames() {
|
||||
if (df_status.repr != wuffs_base__suspension__short_read) {
|
||||
break;
|
||||
}
|
||||
decode_frame_io_error_message = read_more_src();
|
||||
decode_frame_io_error_message = read_more_src(
|
||||
wuffs_base__image_decoder__history_retain_length(g_image_decoder));
|
||||
if (decode_frame_io_error_message != NULL) {
|
||||
// Neuter the "short read" df_status so that convert_frames returns the
|
||||
// I/O error message instead.
|
||||
|
||||
@@ -1001,11 +1001,11 @@ static void //
|
||||
ignore_return_value(int ignored) {}
|
||||
|
||||
const char* //
|
||||
read_src() {
|
||||
read_src(uint64_t history_retain_length) {
|
||||
if (g_src.meta.closed) {
|
||||
return "main: internal error: read requested on a closed source";
|
||||
}
|
||||
g_src.compact();
|
||||
g_src.compact_retaining(history_retain_length);
|
||||
if (g_src.meta.wi >= g_src.data.len) {
|
||||
return "main: g_src buffer is full";
|
||||
}
|
||||
@@ -1398,7 +1398,7 @@ main1(int argc, char** argv) {
|
||||
}
|
||||
// Check that we've exhausted the input.
|
||||
if ((g_src.meta.ri == g_src.meta.wi) && !g_src.meta.closed) {
|
||||
TRY(read_src());
|
||||
TRY(read_src(g_dec.history_retain_length()));
|
||||
}
|
||||
if ((g_src.meta.ri < g_src.meta.wi) || !g_src.meta.closed) {
|
||||
return "main: valid JSON followed by further (unexpected) data";
|
||||
@@ -1409,7 +1409,7 @@ main1(int argc, char** argv) {
|
||||
if (g_cursor_index != g_src.meta.ri) {
|
||||
return "main: internal error: inconsistent g_src indexes";
|
||||
}
|
||||
TRY(read_src());
|
||||
TRY(read_src(g_dec.history_retain_length()));
|
||||
g_cursor_index = g_src.meta.ri;
|
||||
} else if (status.repr == wuffs_base__suspension__short_write) {
|
||||
g_tok.compact();
|
||||
|
||||
@@ -193,7 +193,7 @@ class Wuffs_Load_RW_Input : public wuffs_aux::sync_io::Input {
|
||||
|
||||
private:
|
||||
std::string //
|
||||
CopyIn(wuffs_aux::IOBuffer* dst) override {
|
||||
CopyIn(wuffs_aux::IOBuffer* dst, uint64_t history_retain_length) override {
|
||||
if (!m_rw) {
|
||||
return "Wuffs_Load_RW_Input: NULL SDL_RWops";
|
||||
} else if (!dst) {
|
||||
@@ -201,7 +201,7 @@ class Wuffs_Load_RW_Input : public wuffs_aux::sync_io::Input {
|
||||
} else if (dst->meta.closed) {
|
||||
return "Wuffs_Load_RW_Input: end of file";
|
||||
}
|
||||
dst->compact();
|
||||
dst->compact_retaining(history_retain_length);
|
||||
if (dst->writer_length() == 0) {
|
||||
return "Wuffs_Load_RW_Input: full IOBuffer";
|
||||
}
|
||||
|
||||
+2
-1
@@ -214,7 +214,8 @@ main1(int argc, char** argv) {
|
||||
return wuffs_base__status__message(&status);
|
||||
}
|
||||
|
||||
wuffs_base__io_buffer__compact(&src);
|
||||
wuffs_base__io_buffer__compact_retaining(
|
||||
&src, wuffs_gzip__decoder__history_retain_length(&dec));
|
||||
if (src.meta.wi == src.data.len) {
|
||||
return "main: internal error: no I/O progress possible";
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user