diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-14 13:03:46 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-19 13:53:21 +0100 |
| commit | 26e876912435bdafbca2b425af43824d7ec5b876 (patch) | |
| tree | b7ee83cdd9de18ce5970bab0bb217a972d3d2445 /src/3rdparty/libjpeg/src/jcmaster.c | |
| parent | 7a6c6da2ebbfef33f7284ce5c96aa0c3acabc6bc (diff) | |
| parent | bac999f38ca10147832846f6d7df1e4a051d3760 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: Ifecc2d9db396d783124df8567553ba5f846f30bb
Diffstat (limited to 'src/3rdparty/libjpeg/src/jcmaster.c')
| -rw-r--r-- | src/3rdparty/libjpeg/src/jcmaster.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/libjpeg/src/jcmaster.c b/src/3rdparty/libjpeg/src/jcmaster.c index 93b3de6826..998dc40a5c 100644 --- a/src/3rdparty/libjpeg/src/jcmaster.c +++ b/src/3rdparty/libjpeg/src/jcmaster.c @@ -492,8 +492,8 @@ prepare_for_pass(j_compress_ptr cinfo) */ master->pass_type = output_pass; master->pass_number++; - /*FALLTHROUGH*/ #endif + /*FALLTHROUGH*/ case output_pass: /* Do a data-output pass. */ /* We need not repeat per-scan setup if prior optimization pass did it. */ |