diff options
| author | Narayan Kamath <narayan@google.com> | 2014-03-07 16:11:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 16:11:35 +0000 |
| commit | 214c3d9b064c35437cfbab1ea3b82a7fb343ca6b (patch) | |
| tree | faebea12c5675e8035906307e409a6461c91e338 /media | |
| parent | ca35c18a374c143831cc282987c762507c0ffc34 (diff) | |
| parent | 6ac6263dcc55a4a93647cc1307c901a01c06d89c (diff) | |
| download | frameworks_base-214c3d9b064c35437cfbab1ea3b82a7fb343ca6b.zip frameworks_base-214c3d9b064c35437cfbab1ea3b82a7fb343ca6b.tar.gz frameworks_base-214c3d9b064c35437cfbab1ea3b82a7fb343ca6b.tar.bz2 | |
am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t for variables that store uint32_t value"
* commit '6ac6263dcc55a4a93647cc1307c901a01c06d89c':
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 a52b24d..6176f0f 100644 --- a/media/jni/android_media_MediaMetadataRetriever.cpp +++ b/media/jni/android_media_MediaMetadataRetriever.cpp @@ -245,7 +245,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; @@ -276,8 +276,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; |