diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-02-10 22:37:07 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-02-10 22:37:07 -0300 |
| commit | abb985e755ccf858149294868eff8a9a9feca67e (patch) | |
| tree | 2a82fd9f87ddecfb14b08d8599bb2417b3cea7ff /drivers/webp/utils/rescaler.c | |
| parent | 1c7726820ec53b486e946bb42cac98a600c5bdb5 (diff) | |
| download | redot-engine-abb985e755ccf858149294868eff8a9a9feca67e.tar.gz | |
Reverted to older version of WebP, newer one crashed on Android.
Diffstat (limited to 'drivers/webp/utils/rescaler.c')
| -rw-r--r-- | drivers/webp/utils/rescaler.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/webp/utils/rescaler.c b/drivers/webp/utils/rescaler.c index 7061246024..9825dcbc5f 100644 --- a/drivers/webp/utils/rescaler.c +++ b/drivers/webp/utils/rescaler.c @@ -1,10 +1,8 @@ // Copyright 2012 Google Inc. All Rights Reserved. // -// Use of this source code is governed by a BSD-style license -// that can be found in the COPYING file in the root of the source -// tree. An additional intellectual property rights grant can be found -// in the file PATENTS. All contributing project authors may -// be found in the AUTHORS file in the root of the source tree. +// This code is licensed under the same terms as WebM: +// Software License Agreement: http://www.webmproject.org/license/software/ +// Additional IP Rights Grant: http://www.webmproject.org/license/additional/ // ----------------------------------------------------------------------------- // // Rescaling functions @@ -17,8 +15,12 @@ //------------------------------------------------------------------------------ +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + #define RFIX 30 -#define MULT_FIX(x, y) (((int64_t)(x) * (y) + (1 << (RFIX - 1))) >> RFIX) +#define MULT_FIX(x,y) (((int64_t)(x) * (y) + (1 << (RFIX - 1))) >> RFIX) void WebPRescalerInit(WebPRescaler* const wrk, int src_width, int src_height, uint8_t* const dst, int dst_width, int dst_height, @@ -119,11 +121,6 @@ uint8_t* WebPRescalerExportRow(WebPRescaler* const wrk) { //------------------------------------------------------------------------------ // all-in-one calls -int WebPRescaleNeededLines(const WebPRescaler* const wrk, int max_num_lines) { - const int num_lines = (wrk->y_accum + wrk->y_sub - 1) / wrk->y_sub; - return (num_lines > max_num_lines) ? max_num_lines : num_lines; -} - int WebPRescalerImport(WebPRescaler* const wrk, int num_lines, const uint8_t* src, int src_stride) { int total_imported = 0; @@ -150,3 +147,6 @@ int WebPRescalerExport(WebPRescaler* const rescaler) { //------------------------------------------------------------------------------ +#if defined(__cplusplus) || defined(c_plusplus) +} // extern "C" +#endif |