Merge "cosmetics: fix indent"

This commit is contained in:
pascal massimino 2013-08-19 17:56:21 -07:00 committed by Gerrit Code Review
commit ede3602e5d
3 changed files with 5 additions and 6 deletions

View File

@ -437,7 +437,7 @@ static int WritePGMOrYUV(FILE* fout, const WebPDecBuffer* const buffer,
} }
static int SaveOutput(const WebPDecBuffer* const buffer, static int SaveOutput(const WebPDecBuffer* const buffer,
OutputFileFormat format, const char* const out_file) { OutputFileFormat format, const char* const out_file) {
FILE* fout = NULL; FILE* fout = NULL;
int needs_open_file = 1; int needs_open_file = 1;
int use_stdout = !strcmp(out_file, "-"); int use_stdout = !strcmp(out_file, "-");
@ -694,12 +694,12 @@ int main(int argc, const char *argv[]) {
if (out_file != NULL) { if (out_file != NULL) {
fprintf(stderr, "Decoded %s. Dimensions: %d x %d%s. Now saving...\n", fprintf(stderr, "Decoded %s. Dimensions: %d x %d%s. Now saving...\n",
in_file, output_buffer->width, output_buffer->height, in_file, output_buffer->width, output_buffer->height,
bitstream->has_alpha ? " (with alpha)" : ""); bitstream->has_alpha ? " (with alpha)" : "");
ok = SaveOutput(output_buffer, format, out_file); ok = SaveOutput(output_buffer, format, out_file);
} else { } else {
fprintf(stderr, "File %s can be decoded (dimensions: %d x %d)%s.\n", fprintf(stderr, "File %s can be decoded (dimensions: %d x %d)%s.\n",
in_file, output_buffer->width, output_buffer->height, in_file, output_buffer->width, output_buffer->height,
bitstream->has_alpha ? " (with alpha)" : ""); bitstream->has_alpha ? " (with alpha)" : "");
fprintf(stderr, "Nothing written; " fprintf(stderr, "Nothing written; "
"use -o flag to save the result as e.g. PNG.\n"); "use -o flag to save the result as e.g. PNG.\n");
} }

View File

@ -267,7 +267,6 @@ void WebPInitPremultiplyNEON(void) {}
#endif // FANCY_UPSAMPLING #endif // FANCY_UPSAMPLING
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)
} // extern "C" } // extern "C"
#endif #endif

View File

@ -100,7 +100,7 @@ static WEBP_INLINE uint8_t VP8YUVToG(int y, int u, int v) {
} }
static WEBP_INLINE uint8_t VP8YUVToB(int y, int u) { static WEBP_INLINE uint8_t VP8YUVToB(int y, int u) {
return VP8Clip8(kYScale * y + kUToB * u + kBCst); return VP8Clip8(kYScale * y + kUToB * u + kBCst);
} }
static WEBP_INLINE void VP8YuvToRgb(uint8_t y, uint8_t u, uint8_t v, static WEBP_INLINE void VP8YuvToRgb(uint8_t y, uint8_t u, uint8_t v,