mirror of
https://github.com/webmproject/libwebp.git
synced 2024-11-19 20:08:28 +01:00
normalize include guards
some fell out of sync after:
668e1dd4
src/{dec,enc,utils}: give filenames a unique suffix
Change-Id: I280d3b3f44797f3bfb4835784add50a41cdd3793
This commit is contained in:
parent
f433205ee3
commit
5cfb3b0f6c
@ -11,8 +11,8 @@
|
||||
//
|
||||
// Author: Urvang (urvang@google.com)
|
||||
|
||||
#ifndef WEBP_DEC_ALPHAI_H_
|
||||
#define WEBP_DEC_ALPHAI_H_
|
||||
#ifndef WEBP_DEC_ALPHAI_DEC_H_
|
||||
#define WEBP_DEC_ALPHAI_DEC_H_
|
||||
|
||||
#include "src/dec/webpi_dec.h"
|
||||
#include "src/utils/filters_utils.h"
|
||||
@ -51,4 +51,4 @@ void WebPDeallocateAlphaMemory(VP8Decoder* const dec);
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#endif /* WEBP_DEC_ALPHAI_H_ */
|
||||
#endif /* WEBP_DEC_ALPHAI_DEC_H_ */
|
||||
|
@ -11,8 +11,8 @@
|
||||
//
|
||||
// Author: Skal (pascal.massimino@gmail.com)
|
||||
|
||||
#ifndef WEBP_DEC_COMMON_H_
|
||||
#define WEBP_DEC_COMMON_H_
|
||||
#ifndef WEBP_DEC_COMMON_DEC_H_
|
||||
#define WEBP_DEC_COMMON_DEC_H_
|
||||
|
||||
// intra prediction modes
|
||||
enum { B_DC_PRED = 0, // 4x4 modes
|
||||
@ -51,4 +51,4 @@ enum { MB_FEATURE_TREE_PROBS = 3,
|
||||
NUM_PROBAS = 11
|
||||
};
|
||||
|
||||
#endif // WEBP_DEC_COMMON_H_
|
||||
#endif // WEBP_DEC_COMMON_DEC_H_
|
||||
|
@ -11,8 +11,8 @@
|
||||
//
|
||||
// Author: Skal (pascal.massimino@gmail.com)
|
||||
|
||||
#ifndef WEBP_WEBP_DECODE_VP8_H_
|
||||
#define WEBP_WEBP_DECODE_VP8_H_
|
||||
#ifndef WEBP_DEC_VP8_DEC_H_
|
||||
#define WEBP_DEC_VP8_DEC_H_
|
||||
|
||||
#include "src/webp/decode.h"
|
||||
|
||||
@ -182,4 +182,4 @@ WEBP_EXTERN int VP8LGetInfo(
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#endif /* WEBP_WEBP_DECODE_VP8_H_ */
|
||||
#endif /* WEBP_DEC_VP8_DEC_H_ */
|
||||
|
@ -11,8 +11,8 @@
|
||||
//
|
||||
// Author: Skal (pascal.massimino@gmail.com)
|
||||
|
||||
#ifndef WEBP_DEC_VP8I_H_
|
||||
#define WEBP_DEC_VP8I_H_
|
||||
#ifndef WEBP_DEC_VP8I_DEC_H_
|
||||
#define WEBP_DEC_VP8I_DEC_H_
|
||||
|
||||
#include <string.h> // for memcpy()
|
||||
#include "src/dec/common_dec.h"
|
||||
@ -317,4 +317,4 @@ const uint8_t* VP8DecompressAlphaRows(VP8Decoder* const dec,
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#endif /* WEBP_DEC_VP8I_H_ */
|
||||
#endif /* WEBP_DEC_VP8I_DEC_H_ */
|
||||
|
@ -12,8 +12,8 @@
|
||||
// Author: Skal (pascal.massimino@gmail.com)
|
||||
// Vikas Arora(vikaas.arora@gmail.com)
|
||||
|
||||
#ifndef WEBP_DEC_VP8LI_H_
|
||||
#define WEBP_DEC_VP8LI_H_
|
||||
#ifndef WEBP_DEC_VP8LI_DEC_H_
|
||||
#define WEBP_DEC_VP8LI_DEC_H_
|
||||
|
||||
#include <string.h> // for memcpy()
|
||||
#include "src/dec/webpi_dec.h"
|
||||
@ -132,4 +132,4 @@ void VP8LDelete(VP8LDecoder* const dec);
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#endif /* WEBP_DEC_VP8LI_H_ */
|
||||
#endif /* WEBP_DEC_VP8LI_DEC_H_ */
|
||||
|
@ -11,8 +11,8 @@
|
||||
//
|
||||
// Author: somnath@google.com (Somnath Banerjee)
|
||||
|
||||
#ifndef WEBP_DEC_WEBPI_H_
|
||||
#define WEBP_DEC_WEBPI_H_
|
||||
#ifndef WEBP_DEC_WEBPI_DEC_H_
|
||||
#define WEBP_DEC_WEBPI_DEC_H_
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
@ -130,4 +130,4 @@ int WebPAvoidSlowMemory(const WebPDecBuffer* const output,
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#endif /* WEBP_DEC_WEBPI_H_ */
|
||||
#endif /* WEBP_DEC_WEBPI_DEC_H_ */
|
||||
|
@ -10,8 +10,8 @@
|
||||
// Author: Jyrki Alakuijala (jyrki@google.com)
|
||||
//
|
||||
|
||||
#ifndef WEBP_ENC_BACKWARD_REFERENCES_H_
|
||||
#define WEBP_ENC_BACKWARD_REFERENCES_H_
|
||||
#ifndef WEBP_ENC_BACKWARD_REFERENCES_ENC_H_
|
||||
#define WEBP_ENC_BACKWARD_REFERENCES_ENC_H_
|
||||
|
||||
#include <assert.h>
|
||||
#include <stdlib.h>
|
||||
@ -236,4 +236,4 @@ VP8LBackwardRefs* VP8LGetBackwardReferences(
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif // WEBP_ENC_BACKWARD_REFERENCES_H_
|
||||
#endif // WEBP_ENC_BACKWARD_REFERENCES_ENC_H_
|
||||
|
@ -11,8 +11,8 @@
|
||||
//
|
||||
// Author: Skal (pascal.massimino@gmail.com)
|
||||
|
||||
#ifndef WEBP_ENC_COST_H_
|
||||
#define WEBP_ENC_COST_H_
|
||||
#ifndef WEBP_ENC_COST_ENC_H_
|
||||
#define WEBP_ENC_COST_ENC_H_
|
||||
|
||||
#include <assert.h>
|
||||
#include <stdlib.h>
|
||||
@ -79,4 +79,4 @@ extern const uint16_t VP8FixedCostsI4[NUM_BMODES][NUM_BMODES][NUM_BMODES];
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#endif /* WEBP_ENC_COST_H_ */
|
||||
#endif /* WEBP_ENC_COST_ENC_H_ */
|
||||
|
@ -10,8 +10,8 @@
|
||||
// Author: Mislav Bradac (mislavm@google.com)
|
||||
//
|
||||
|
||||
#ifndef WEBP_ENC_DELTA_PALETTIZATION_H_
|
||||
#define WEBP_ENC_DELTA_PALETTIZATION_H_
|
||||
#ifndef WEBP_ENC_DELTA_PALETTIZATION_ENC_H_
|
||||
#define WEBP_ENC_DELTA_PALETTIZATION_ENC_H_
|
||||
|
||||
#include "src/webp/encode.h"
|
||||
#include "src/enc/vp8li_enc.h"
|
||||
@ -22,4 +22,4 @@
|
||||
// if delta-palettization is not producing expected saving.
|
||||
WebPEncodingError WebPSearchOptimalDeltaPalette(VP8LEncoder* const enc);
|
||||
|
||||
#endif // WEBP_ENC_DELTA_PALETTIZATION_H_
|
||||
#endif // WEBP_ENC_DELTA_PALETTIZATION_ENC_H_
|
||||
|
@ -11,8 +11,8 @@
|
||||
//
|
||||
// Models the histograms of literal and distance codes.
|
||||
|
||||
#ifndef WEBP_ENC_HISTOGRAM_H_
|
||||
#define WEBP_ENC_HISTOGRAM_H_
|
||||
#ifndef WEBP_ENC_HISTOGRAM_ENC_H_
|
||||
#define WEBP_ENC_HISTOGRAM_ENC_H_
|
||||
|
||||
#include <string.h>
|
||||
|
||||
@ -122,4 +122,4 @@ double VP8LHistogramEstimateBits(const VP8LHistogram* const p);
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif // WEBP_ENC_HISTOGRAM_H_
|
||||
#endif // WEBP_ENC_HISTOGRAM_ENC_H_
|
||||
|
@ -11,8 +11,8 @@
|
||||
//
|
||||
// Author: Skal (pascal.massimino@gmail.com)
|
||||
|
||||
#ifndef WEBP_ENC_VP8ENCI_H_
|
||||
#define WEBP_ENC_VP8ENCI_H_
|
||||
#ifndef WEBP_ENC_VP8I_ENC_H_
|
||||
#define WEBP_ENC_VP8I_ENC_H_
|
||||
|
||||
#include <string.h> // for memcpy()
|
||||
#include "src/dec/common_dec.h"
|
||||
@ -505,4 +505,4 @@ void WebPCleanupTransparentAreaLossless(WebPPicture* const pic);
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#endif /* WEBP_ENC_VP8ENCI_H_ */
|
||||
#endif /* WEBP_ENC_VP8I_ENC_H_ */
|
||||
|
@ -11,8 +11,8 @@
|
||||
//
|
||||
// Author: Vikas Arora (vikaas.arora@gmail.com)
|
||||
|
||||
#ifndef WEBP_ENC_VP8LI_H_
|
||||
#define WEBP_ENC_VP8LI_H_
|
||||
#ifndef WEBP_ENC_VP8LI_ENC_H_
|
||||
#define WEBP_ENC_VP8LI_ENC_H_
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "src/webp/config.h"
|
||||
@ -115,4 +115,4 @@ void VP8LColorSpaceTransform(int width, int height, int bits, int quality,
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#endif /* WEBP_ENC_VP8LI_H_ */
|
||||
#endif /* WEBP_ENC_VP8LI_ENC_H_ */
|
||||
|
@ -13,8 +13,8 @@
|
||||
//
|
||||
// Author: Skal (pascal.massimino@gmail.com)
|
||||
|
||||
#ifndef WEBP_UTILS_BIT_READER_INL_H_
|
||||
#define WEBP_UTILS_BIT_READER_INL_H_
|
||||
#ifndef WEBP_UTILS_BIT_READER_INL_UTILS_H_
|
||||
#define WEBP_UTILS_BIT_READER_INL_UTILS_H_
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "src/webp/config.h"
|
||||
@ -187,4 +187,4 @@ static WEBP_INLINE int VP8GetBitAlt(VP8BitReader* const br, int prob) {
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#endif // WEBP_UTILS_BIT_READER_INL_H_
|
||||
#endif // WEBP_UTILS_BIT_READER_INL_UTILS_H_
|
||||
|
@ -12,8 +12,8 @@
|
||||
// Author: Skal (pascal.massimino@gmail.com)
|
||||
// Vikas Arora (vikaas.arora@gmail.com)
|
||||
|
||||
#ifndef WEBP_UTILS_BIT_READER_H_
|
||||
#define WEBP_UTILS_BIT_READER_H_
|
||||
#ifndef WEBP_UTILS_BIT_READER_UTILS_H_
|
||||
#define WEBP_UTILS_BIT_READER_UTILS_H_
|
||||
|
||||
#include <assert.h>
|
||||
#ifdef _MSC_VER
|
||||
@ -172,4 +172,4 @@ static WEBP_INLINE void VP8LFillBitWindow(VP8LBitReader* const br) {
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#endif /* WEBP_UTILS_BIT_READER_H_ */
|
||||
#endif /* WEBP_UTILS_BIT_READER_UTILS_H_ */
|
||||
|
@ -11,8 +11,8 @@
|
||||
//
|
||||
// Author: Skal (pascal.massimino@gmail.com)
|
||||
|
||||
#ifndef WEBP_UTILS_BIT_WRITER_H_
|
||||
#define WEBP_UTILS_BIT_WRITER_H_
|
||||
#ifndef WEBP_UTILS_BIT_WRITER_UTILS_H_
|
||||
#define WEBP_UTILS_BIT_WRITER_UTILS_H_
|
||||
|
||||
#include "src/webp/types.h"
|
||||
|
||||
@ -151,4 +151,4 @@ static WEBP_INLINE void VP8LPutBits(VP8LBitWriter* const bw,
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#endif /* WEBP_UTILS_BIT_WRITER_H_ */
|
||||
#endif /* WEBP_UTILS_BIT_WRITER_UTILS_H_ */
|
||||
|
@ -12,8 +12,8 @@
|
||||
// Authors: Jyrki Alakuijala (jyrki@google.com)
|
||||
// Urvang Joshi (urvang@google.com)
|
||||
|
||||
#ifndef WEBP_UTILS_COLOR_CACHE_H_
|
||||
#define WEBP_UTILS_COLOR_CACHE_H_
|
||||
#ifndef WEBP_UTILS_COLOR_CACHE_UTILS_H_
|
||||
#define WEBP_UTILS_COLOR_CACHE_UTILS_H_
|
||||
|
||||
#include <assert.h>
|
||||
|
||||
@ -84,4 +84,4 @@ void VP8LColorCacheClear(VP8LColorCache* const color_cache);
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif // WEBP_UTILS_COLOR_CACHE_H_
|
||||
#endif // WEBP_UTILS_COLOR_CACHE_UTILS_H_
|
||||
|
@ -9,8 +9,8 @@
|
||||
//
|
||||
// Endian related functions.
|
||||
|
||||
#ifndef WEBP_UTILS_ENDIAN_INL_H_
|
||||
#define WEBP_UTILS_ENDIAN_INL_H_
|
||||
#ifndef WEBP_UTILS_ENDIAN_INL_UTILS_H_
|
||||
#define WEBP_UTILS_ENDIAN_INL_UTILS_H_
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "src/webp/config.h"
|
||||
@ -97,4 +97,4 @@ static WEBP_INLINE uint64_t BSwap64(uint64_t x) {
|
||||
#endif // HAVE_BUILTIN_BSWAP64
|
||||
}
|
||||
|
||||
#endif // WEBP_UTILS_ENDIAN_INL_H_
|
||||
#endif // WEBP_UTILS_ENDIAN_INL_UTILS_H_
|
||||
|
@ -11,8 +11,8 @@
|
||||
//
|
||||
// Author: Urvang (urvang@google.com)
|
||||
|
||||
#ifndef WEBP_UTILS_FILTERS_H_
|
||||
#define WEBP_UTILS_FILTERS_H_
|
||||
#ifndef WEBP_UTILS_FILTERS_UTILS_H_
|
||||
#define WEBP_UTILS_FILTERS_UTILS_H_
|
||||
|
||||
#include "src/webp/types.h"
|
||||
#include "src/dsp/dsp.h"
|
||||
@ -29,4 +29,4 @@ WEBP_FILTER_TYPE WebPEstimateBestFilter(const uint8_t* data,
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#endif /* WEBP_UTILS_FILTERS_H_ */
|
||||
#endif /* WEBP_UTILS_FILTERS_UTILS_H_ */
|
||||
|
@ -11,8 +11,8 @@
|
||||
//
|
||||
// Entropy encoding (Huffman) for webp lossless
|
||||
|
||||
#ifndef WEBP_UTILS_HUFFMAN_ENCODE_H_
|
||||
#define WEBP_UTILS_HUFFMAN_ENCODE_H_
|
||||
#ifndef WEBP_UTILS_HUFFMAN_ENCODE_UTILS_H_
|
||||
#define WEBP_UTILS_HUFFMAN_ENCODE_UTILS_H_
|
||||
|
||||
#include "src/webp/types.h"
|
||||
|
||||
@ -57,4 +57,4 @@ void VP8LCreateHuffmanTree(uint32_t* const histogram, int tree_depth_limit,
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif // WEBP_UTILS_HUFFMAN_ENCODE_H_
|
||||
#endif // WEBP_UTILS_HUFFMAN_ENCODE_UTILS_H_
|
||||
|
@ -11,8 +11,8 @@
|
||||
//
|
||||
// Author: Urvang Joshi (urvang@google.com)
|
||||
|
||||
#ifndef WEBP_UTILS_HUFFMAN_H_
|
||||
#define WEBP_UTILS_HUFFMAN_H_
|
||||
#ifndef WEBP_UTILS_HUFFMAN_UTILS_H_
|
||||
#define WEBP_UTILS_HUFFMAN_UTILS_H_
|
||||
|
||||
#include <assert.h>
|
||||
#include "src/webp/format_constants.h"
|
||||
@ -85,4 +85,4 @@ int VP8LBuildHuffmanTable(HuffmanCode* const root_table, int root_bits,
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#endif // WEBP_UTILS_HUFFMAN_H_
|
||||
#endif // WEBP_UTILS_HUFFMAN_UTILS_H_
|
||||
|
@ -11,8 +11,8 @@
|
||||
//
|
||||
// Author: Vikas Arora (vikasa@google.com)
|
||||
|
||||
#ifndef WEBP_UTILS_QUANT_LEVELS_DEC_H_
|
||||
#define WEBP_UTILS_QUANT_LEVELS_DEC_H_
|
||||
#ifndef WEBP_UTILS_QUANT_LEVELS_DEC_UTILS_H_
|
||||
#define WEBP_UTILS_QUANT_LEVELS_DEC_UTILS_H_
|
||||
|
||||
#include "src/webp/types.h"
|
||||
|
||||
@ -32,4 +32,4 @@ int WebPDequantizeLevels(uint8_t* const data, int width, int height, int stride,
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#endif /* WEBP_UTILS_QUANT_LEVELS_DEC_H_ */
|
||||
#endif /* WEBP_UTILS_QUANT_LEVELS_DEC_UTILS_H_ */
|
||||
|
@ -11,8 +11,8 @@
|
||||
//
|
||||
// Author: Vikas Arora (vikasa@google.com)
|
||||
|
||||
#ifndef WEBP_UTILS_QUANT_LEVELS_H_
|
||||
#define WEBP_UTILS_QUANT_LEVELS_H_
|
||||
#ifndef WEBP_UTILS_QUANT_LEVELS_UTILS_H_
|
||||
#define WEBP_UTILS_QUANT_LEVELS_UTILS_H_
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
@ -33,4 +33,4 @@ int QuantizeLevels(uint8_t* const data, int width, int height, int num_levels,
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#endif /* WEBP_UTILS_QUANT_LEVELS_H_ */
|
||||
#endif /* WEBP_UTILS_QUANT_LEVELS_UTILS_H_ */
|
||||
|
@ -11,8 +11,8 @@
|
||||
//
|
||||
// Author: Skal (pascal.massimino@gmail.com)
|
||||
|
||||
#ifndef WEBP_UTILS_RANDOM_H_
|
||||
#define WEBP_UTILS_RANDOM_H_
|
||||
#ifndef WEBP_UTILS_RANDOM_UTILS_H_
|
||||
#define WEBP_UTILS_RANDOM_UTILS_H_
|
||||
|
||||
#include <assert.h>
|
||||
#include "src/webp/types.h"
|
||||
@ -60,4 +60,4 @@ static WEBP_INLINE int VP8RandomBits(VP8Random* const rg, int num_bits) {
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#endif /* WEBP_UTILS_RANDOM_H_ */
|
||||
#endif /* WEBP_UTILS_RANDOM_UTILS_H_ */
|
||||
|
@ -11,8 +11,8 @@
|
||||
//
|
||||
// Author: Skal (pascal.massimino@gmail.com)
|
||||
|
||||
#ifndef WEBP_UTILS_RESCALER_H_
|
||||
#define WEBP_UTILS_RESCALER_H_
|
||||
#ifndef WEBP_UTILS_RESCALER_UTILS_H_
|
||||
#define WEBP_UTILS_RESCALER_UTILS_H_
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
@ -98,4 +98,4 @@ int WebPRescalerHasPendingOutput(const WebPRescaler* const rescaler) {
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#endif /* WEBP_UTILS_RESCALER_H_ */
|
||||
#endif /* WEBP_UTILS_RESCALER_UTILS_H_ */
|
||||
|
@ -11,8 +11,8 @@
|
||||
//
|
||||
// Author: Skal (pascal.massimino@gmail.com)
|
||||
|
||||
#ifndef WEBP_UTILS_THREAD_H_
|
||||
#define WEBP_UTILS_THREAD_H_
|
||||
#ifndef WEBP_UTILS_THREAD_UTILS_H_
|
||||
#define WEBP_UTILS_THREAD_UTILS_H_
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "src/webp/config.h"
|
||||
@ -90,4 +90,4 @@ WEBP_EXTERN const WebPWorkerInterface* WebPGetWorkerInterface(void);
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#endif /* WEBP_UTILS_THREAD_H_ */
|
||||
#endif /* WEBP_UTILS_THREAD_UTILS_H_ */
|
||||
|
Loading…
Reference in New Issue
Block a user