diff options
| author | Narayan Kamath <narayan@google.com> | 2014-03-07 20:22:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 20:22:13 +0000 |
| commit | 6ae7cd063b244ed53ad7dfa5515d59a8af859361 (patch) | |
| tree | 128f4e0df9a0ab62fd2c7fa5da357a487a9954a6 /media | |
| parent | 11d9e512ebc1f4d93d11eb24467fda69bd8bbac4 (diff) | |
| parent | f2c11c142975f1571a0e8606a3b274afcb987b83 (diff) | |
| download | frameworks_base-6ae7cd063b244ed53ad7dfa5515d59a8af859361.zip frameworks_base-6ae7cd063b244ed53ad7dfa5515d59a8af859361.tar.gz frameworks_base-6ae7cd063b244ed53ad7dfa5515d59a8af859361.tar.bz2 | |
am f2c11c14: am 214c3d9b: am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t for variables that store uint32_t value"
* commit 'f2c11c142975f1571a0e8606a3b274afcb987b83':
Don't use size_t for variables that store uint32_t value
Diffstat (limited to 'media')
| -rw-r--r-- | media/jni/android_media_MediaMetadataRetriever.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/jni/android_media_MediaMetadataRetriever.cpp b/media/jni/android_media_MediaMetadataRetriever.cpp index f3a7ff7..4e42ae3 100644 --- a/media/jni/android_media_MediaMetadataRetriever.cpp +++ b/media/jni/android_media_MediaMetadataRetriever.cpp @@ -256,7 +256,7 @@ static jobject android_media_MediaMetadataRetriever_getFrameAtTime(JNIEnv *env, fields.createConfigMethod, SkBitmap::kRGB_565_Config); - size_t width, height; + uint32_t width, height; bool swapWidthAndHeight = false; if (videoFrame->mRotationAngle == 90 || videoFrame->mRotationAngle == 270) { width = videoFrame->mHeight; @@ -287,8 +287,8 @@ static jobject android_media_MediaMetadataRetriever_getFrameAtTime(JNIEnv *env, if (videoFrame->mDisplayWidth != videoFrame->mWidth || videoFrame->mDisplayHeight != videoFrame->mHeight) { - size_t displayWidth = videoFrame->mDisplayWidth; - size_t displayHeight = videoFrame->mDisplayHeight; + uint32_t displayWidth = videoFrame->mDisplayWidth; + uint32_t displayHeight = videoFrame->mDisplayHeight; if (swapWidthAndHeight) { displayWidth = videoFrame->mDisplayHeight; displayHeight = videoFrame->mDisplayWidth; |