Skip to content

Commit 9a4ba59

Browse files
eustascopybara-github
authored andcommitted
internal change
PiperOrigin-RevId: 795452145
1 parent 3cc6172 commit 9a4ba59

File tree

12 files changed

+28
-23
lines changed

12 files changed

+28
-23
lines changed

c/dec/state.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,10 @@
99
#ifndef BROTLI_DEC_STATE_H_
1010
#define BROTLI_DEC_STATE_H_
1111

12-
#include <brotli/decode.h>
13-
#include <brotli/shared_dictionary.h>
14-
1512
#include "../common/constants.h"
16-
#include "../common/dictionary.h"
1713
#include "../common/platform.h"
18-
#include "../common/transform.h"
14+
#include <brotli/shared_dictionary.h>
15+
#include <brotli/decode.h>
1916
#include "bit_reader.h"
2017
#include "huffman.h"
2118

c/enc/compound_dictionary.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66

77
#include "compound_dictionary.h"
88

9-
#include <brotli/shared_dictionary.h>
10-
119
#include "../common/platform.h"
10+
#include <brotli/shared_dictionary.h>
1211
#include "memory.h"
1312

1413
static PreparedDictionary* CreatePreparedDictionaryWithParams(MemoryManager* m,

c/enc/compound_dictionary.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77
#ifndef BROTLI_ENC_PREPARED_DICTIONARY_H_
88
#define BROTLI_ENC_PREPARED_DICTIONARY_H_
99

10-
#include <brotli/shared_dictionary.h>
11-
1210
#include "../common/platform.h"
11+
#include <brotli/shared_dictionary.h>
1312
#include "memory.h"
1413

1514
/* "Fat" prepared dictionary, could be cooked outside of C implementation,

c/enc/encode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
/* Implementation of Brotli compressor. */
88

99
#include <brotli/encode.h>
10-
#include <brotli/shared_dictionary.h>
1110

1211
#include "../common/constants.h"
1312
#include "../common/context.h"
1413
#include "../common/platform.h"
14+
#include <brotli/shared_dictionary.h>
1515
#include "../common/version.h"
1616
#include "backward_references_hq.h"
1717
#include "backward_references.h"

c/enc/encoder_dict.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66

77
#include "encoder_dict.h"
88

9-
#include <brotli/encode.h>
10-
#include <brotli/shared_dictionary.h>
11-
129
#include "../common/dictionary.h"
1310
#include "../common/platform.h"
11+
#include <brotli/shared_dictionary.h>
1412
#include "../common/shared_dictionary_internal.h"
1513
#include "../common/transform.h"
14+
#include <brotli/encode.h>
1615
#include "compound_dictionary.h"
1716
#include "dictionary_hash.h"
1817
#include "hash_base.h"

c/enc/encoder_dict.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77
#ifndef BROTLI_ENC_ENCODER_DICT_H_
88
#define BROTLI_ENC_ENCODER_DICT_H_
99

10-
#include <brotli/shared_dictionary.h>
11-
1210
#include "../common/dictionary.h"
11+
#include <brotli/shared_dictionary.h>
1312
#include "../common/platform.h"
1413
#include "compound_dictionary.h"
1514
#include "memory.h"

c/enc/params.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#define BROTLI_ENC_PARAMS_H_
1111

1212
#include <brotli/encode.h>
13-
1413
#include "encoder_dict.h"
1514

1615
typedef struct BrotliHasherParams {

c/enc/quality.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010
#ifndef BROTLI_ENC_QUALITY_H_
1111
#define BROTLI_ENC_QUALITY_H_
1212

13-
#include <brotli/encode.h>
14-
1513
#include "../common/platform.h"
14+
#include <brotli/encode.h>
1615
#include "params.h"
1716

1817
#define FAST_ONE_PASS_COMPRESSION_QUALITY 0

c/tools/brotli.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
/* Command line interface for Brotli library. */
88

99
/* Mute strerror/strcpy warnings. */
10+
#include <brotli/shared_dictionary.h>
1011
#if !defined(_CRT_SECURE_NO_WARNINGS)
1112
#define _CRT_SECURE_NO_WARNINGS
1213
#endif
@@ -20,12 +21,11 @@
2021
#include <sys/types.h>
2122
#include <time.h>
2223

23-
#include <brotli/decode.h>
24-
#include <brotli/encode.h>
2524
#include <brotli/types.h>
26-
2725
#include "../common/constants.h"
2826
#include "../common/version.h"
27+
#include <brotli/decode.h>
28+
#include <brotli/encode.h>
2929

3030
#if defined(_WIN32)
3131
#include <io.h>

java/org/brotli/wrapper/dec/decoder_jni.cc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,15 @@
66

77
#include "decoder_jni.h" // NOLINT: build/include
88

9-
#include <brotli/decode.h>
9+
#include <jni.h>
1010

11+
#include <cstddef>
12+
#include <cstdint>
1113
#include <new>
1214

15+
#include <brotli/shared_dictionary.h>
16+
#include <brotli/decode.h>
17+
1318
namespace {
1419
/* A structure used to persist the decoder's state in between calls. */
1520
typedef struct DecoderHandle {

0 commit comments

Comments
 (0)