Commit 8647dd75 authored by fbarchard@google.com's avatar fbarchard@google.com

Pointer has * attached to type for consistency and lint

BUG=none
TEST=none
Review URL: https://webrtc-codereview.appspot.com/463002

git-svn-id: http://libyuv.googlecode.com/svn/trunk@228 16f28f9a-4ce2-e073-06de-1de4eb20be90
parent 0945c578
Name: libyuv
URL: http://code.google.com/p/libyuv/
Version: 227
Version: 228
License: BSD
License File: LICENSE
......
......@@ -24,7 +24,7 @@ static const uint32 kUnknownDataSize = 0xFFFFFFFF;
enum JpegSubsamplingType {
kJpegYuv420,
kJpegYuv422,
kJpegYuv411, // TODO(fbarchard): Test 411
kJpegYuv411,
kJpegYuv444,
kJpegYuv400,
kJpegUnknown
......@@ -42,7 +42,7 @@ struct SetJmpErrorMgr;
class MJpegDecoder {
public:
typedef void (*CallbackFunction)(void* opaque,
const uint8* const * data,
const uint8** data,
const int* strides,
int rows);
......@@ -140,13 +140,13 @@ class MJpegDecoder {
};
// Methods that are passed to jpeglib.
static int fill_input_buffer(jpeg_decompress_struct *cinfo);
static void init_source(jpeg_decompress_struct *cinfo);
static void skip_input_data(jpeg_decompress_struct *cinfo,
static int fill_input_buffer(jpeg_decompress_struct* cinfo);
static void init_source(jpeg_decompress_struct* cinfo);
static void skip_input_data(jpeg_decompress_struct* cinfo,
long num_bytes); // NOLINT
static void term_source(jpeg_decompress_struct *cinfo);
static void term_source(jpeg_decompress_struct* cinfo);
static void ErrorHandler(jpeg_common_struct *cinfo);
static void ErrorHandler(jpeg_common_struct* cinfo);
void AllocOutputBuffers(int num_outbufs);
void DestroyOutputBuffers();
......@@ -173,7 +173,7 @@ class MJpegDecoder {
// Temporaries used to point to scanline outputs.
int num_outbufs_; // Outermost size of all arrays below.
uint8** *scanlines_;
uint8*** scanlines_;
int* scanlines_sizes_;
// Temporary buffer used for decoding when we can't decode directly to the
// output buffers. Large enough for just one iMCU row.
......
......@@ -11,7 +11,7 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_
#define INCLUDE_LIBYUV_VERSION_H_
#define INCLUDE_LIBYUV_VERSION 227
#define INCLUDE_LIBYUV_VERSION 228
#endif // INCLUDE_LIBYUV_VERSION_H_
......@@ -8,9 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
/*
* Common definitions for video, including fourcc and VideoFormat
*/
// Common definitions for video, including fourcc and VideoFormat
#ifndef INCLUDE_LIBYUV_VIDEO_COMMON_H_
#define INCLUDE_LIBYUV_VIDEO_COMMON_H_
......
......@@ -1377,7 +1377,7 @@ struct I420Buffers {
};
static void JpegCopyI420(void* opaque,
const uint8* const* data,
const uint8** data,
const int* strides,
int rows) {
I420Buffers* dest = static_cast<I420Buffers*>(opaque);
......@@ -1395,7 +1395,7 @@ static void JpegCopyI420(void* opaque,
}
static void JpegI422ToI420(void* opaque,
const uint8* const* data,
const uint8** data,
const int* strides,
int rows) {
I420Buffers* dest = static_cast<I420Buffers*>(opaque);
......@@ -1413,7 +1413,7 @@ static void JpegI422ToI420(void* opaque,
}
static void JpegI444ToI420(void* opaque,
const uint8* const* data,
const uint8** data,
const int* strides,
int rows) {
I420Buffers* dest = static_cast<I420Buffers*>(opaque);
......@@ -1431,7 +1431,7 @@ static void JpegI444ToI420(void* opaque,
}
static void JpegI411ToI420(void* opaque,
const uint8* const* data,
const uint8** data,
const int* strides,
int rows) {
I420Buffers* dest = static_cast<I420Buffers*>(opaque);
......@@ -1449,7 +1449,7 @@ static void JpegI411ToI420(void* opaque,
}
static void JpegI400ToI420(void* opaque,
const uint8* const* data,
const uint8** data,
const int* strides,
int rows) {
I420Buffers* dest = static_cast<I420Buffers*>(opaque);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment