Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
7f012475
Commit
7f012475
authored
Dec 08, 2012
by
Piotr Bandurski
Committed by
Michael Niedermayer
Dec 09, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tiff: support zlib with invertedFillOrder
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
f4946472
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
2 deletions
+16
-2
tiff.c
libavcodec/tiff.c
+16
-2
No files found.
libavcodec/tiff.c
View file @
7f012475
...
@@ -405,18 +405,31 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride,
...
@@ -405,18 +405,31 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride,
#if CONFIG_ZLIB
#if CONFIG_ZLIB
if
(
s
->
compr
==
TIFF_DEFLATE
||
s
->
compr
==
TIFF_ADOBE_DEFLATE
)
{
if
(
s
->
compr
==
TIFF_DEFLATE
||
s
->
compr
==
TIFF_ADOBE_DEFLATE
)
{
uint8_t
*
zbuf
;
uint8_t
*
src2
=
NULL
,
*
zbuf
;
unsigned
long
outlen
;
unsigned
long
outlen
;
int
ret
;
int
i
,
ret
;
outlen
=
width
*
lines
;
outlen
=
width
*
lines
;
zbuf
=
av_malloc
(
outlen
);
zbuf
=
av_malloc
(
outlen
);
if
(
!
zbuf
)
if
(
!
zbuf
)
return
AVERROR
(
ENOMEM
);
return
AVERROR
(
ENOMEM
);
if
(
s
->
fill_order
)
{
src2
=
av_malloc
((
unsigned
)
size
+
FF_INPUT_BUFFER_PADDING_SIZE
);
if
(
!
src2
)
{
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"Error allocating temporary buffer
\n
"
);
av_free
(
zbuf
);
return
AVERROR
(
ENOMEM
);
}
for
(
i
=
0
;
i
<
size
;
i
++
)
src2
[
i
]
=
ff_reverse
[
src
[
i
]];
memset
(
src2
+
size
,
0
,
FF_INPUT_BUFFER_PADDING_SIZE
);
src
=
src2
;
}
ret
=
tiff_uncompress
(
zbuf
,
&
outlen
,
src
,
size
);
ret
=
tiff_uncompress
(
zbuf
,
&
outlen
,
src
,
size
);
if
(
ret
!=
Z_OK
)
{
if
(
ret
!=
Z_OK
)
{
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"Uncompressing failed (%lu of %lu) with error %d
\n
"
,
outlen
,
"Uncompressing failed (%lu of %lu) with error %d
\n
"
,
outlen
,
(
unsigned
long
)
width
*
lines
,
ret
);
(
unsigned
long
)
width
*
lines
,
ret
);
av_free
(
src2
);
av_free
(
zbuf
);
av_free
(
zbuf
);
return
-
1
;
return
-
1
;
}
}
...
@@ -430,6 +443,7 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride,
...
@@ -430,6 +443,7 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride,
dst
+=
stride
;
dst
+=
stride
;
src
+=
width
;
src
+=
width
;
}
}
av_free
(
src2
);
av_free
(
zbuf
);
av_free
(
zbuf
);
return
0
;
return
0
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment