From 427f9666452c57715601c335381f632fa5011276 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Wed, 28 Mar 2012 20:03:01 +0000 Subject: [PATCH] fix const correctness on mjpeg BUG=none TEST=none Review URL: https://webrtc-codereview.appspot.com/463003 git-svn-id: http://libyuv.googlecode.com/svn/trunk@229 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/mjpeg_decoder.h | 2 +- include/libyuv/version.h | 2 +- source/convert.cc | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.chromium b/README.chromium index 10790c155..207046502 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 228 +Version: 229 License: BSD License File: LICENSE diff --git a/include/libyuv/mjpeg_decoder.h b/include/libyuv/mjpeg_decoder.h index 957dfbb2b..a48f4656f 100644 --- a/include/libyuv/mjpeg_decoder.h +++ b/include/libyuv/mjpeg_decoder.h @@ -42,7 +42,7 @@ struct SetJmpErrorMgr; class MJpegDecoder { public: typedef void (*CallbackFunction)(void* opaque, - const uint8** data, + const uint8* const* data, const int* strides, int rows); diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 6881c35d5..58f9280b9 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,7 +11,7 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_ -#define INCLUDE_LIBYUV_VERSION 228 +#define INCLUDE_LIBYUV_VERSION 229 #endif // INCLUDE_LIBYUV_VERSION_H_ diff --git a/source/convert.cc b/source/convert.cc index 998f7cfe9..5ad3e3222 100644 --- a/source/convert.cc +++ b/source/convert.cc @@ -1377,7 +1377,7 @@ struct I420Buffers { }; static void JpegCopyI420(void* opaque, - const uint8** data, + const uint8* const* data, const int* strides, int rows) { I420Buffers* dest = static_cast(opaque); @@ -1395,7 +1395,7 @@ static void JpegCopyI420(void* opaque, } static void JpegI422ToI420(void* opaque, - const uint8** data, + const uint8* const* data, const int* strides, int rows) { I420Buffers* dest = static_cast(opaque); @@ -1413,7 +1413,7 @@ static void JpegI422ToI420(void* opaque, } static void JpegI444ToI420(void* opaque, - const uint8** data, + const uint8* const* data, const int* strides, int rows) { I420Buffers* dest = static_cast(opaque); @@ -1431,7 +1431,7 @@ static void JpegI444ToI420(void* opaque, } static void JpegI411ToI420(void* opaque, - const uint8** data, + const uint8* const* data, const int* strides, int rows) { I420Buffers* dest = static_cast(opaque); @@ -1449,7 +1449,7 @@ static void JpegI411ToI420(void* opaque, } static void JpegI400ToI420(void* opaque, - const uint8** data, + const uint8* const* data, const int* strides, int rows) { I420Buffers* dest = static_cast(opaque);