diff options
Diffstat (limited to 'drivers/webp/utils/rescaler.h')
| -rw-r--r-- | drivers/webp/utils/rescaler.h | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/drivers/webp/utils/rescaler.h b/drivers/webp/utils/rescaler.h index 68e49cee55..ef93d465f0 100644 --- a/drivers/webp/utils/rescaler.h +++ b/drivers/webp/utils/rescaler.h @@ -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 @@ -14,7 +12,7 @@ #ifndef WEBP_UTILS_RESCALER_H_ #define WEBP_UTILS_RESCALER_H_ -#ifdef __cplusplus +#if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif @@ -38,8 +36,7 @@ typedef struct { } WebPRescaler; // Initialize a rescaler given scratch area 'work' and dimensions of src & dst. -void WebPRescalerInit(WebPRescaler* const rescaler, - int src_width, int src_height, +void WebPRescalerInit(WebPRescaler* const wrk, int src_width, int src_height, uint8_t* const dst, int dst_width, int dst_height, int dst_stride, int num_channels, @@ -47,11 +44,6 @@ void WebPRescalerInit(WebPRescaler* const rescaler, int y_add, int y_sub, int32_t* const work); -// Returns the number of input lines needed next to produce one output line, -// considering that the maximum available input lines are 'max_num_lines'. -int WebPRescaleNeededLines(const WebPRescaler* const rescaler, - int max_num_lines); - // Import a row of data and save its contribution in the rescaler. // 'channel' denotes the channel number to be imported. void WebPRescalerImportRow(WebPRescaler* const rescaler, @@ -70,14 +62,14 @@ int WebPRescalerHasPendingOutput(const WebPRescaler* const rescaler) { // Export one row from rescaler. Returns the pointer where output was written, // or NULL if no row was pending. -uint8_t* WebPRescalerExportRow(WebPRescaler* const rescaler); +uint8_t* WebPRescalerExportRow(WebPRescaler* const wrk); // Export as many rows as possible. Return the numbers of rows written. -int WebPRescalerExport(WebPRescaler* const rescaler); +int WebPRescalerExport(WebPRescaler* const wrk); //------------------------------------------------------------------------------ -#ifdef __cplusplus +#if defined(__cplusplus) || defined(c_plusplus) } // extern "C" #endif |