drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 28ccb4f7: Merge "Don\'t use size_t for variables that store uint32_t value"

Browse Source 
* commit '28ccb4f7d9bbea65c8cb1807e332a46ef37bc619':
  Don't use size_t for variables that store uint32_t value
This commit is contained in:
Narayan Kamath
2014-03-07 08:08:18 -08:00
committed by Android Git Automerger
parent cd4874cfdc 28ccb4f7d9
commit 6ac6263dcc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/jni/android_media_MediaMetadataRetriever.cpp
View File

@ -245,7 +245,7 @@ static jobject android_media_MediaMetadataRetriever_getFrameAtTime(JNIEnv *env,
fields.createConfigMethod, fields.createConfigMethod,
SkBitmap::kRGB_565_Config); SkBitmap::kRGB_565_Config);
size_t width, height; uint32_t width, height;
bool swapWidthAndHeight = false; bool swapWidthAndHeight = false;
if (videoFrame->mRotationAngle == 90 || videoFrame->mRotationAngle == 270) { if (videoFrame->mRotationAngle == 90 || videoFrame->mRotationAngle == 270) {
width = videoFrame->mHeight; width = videoFrame->mHeight;
@ -276,8 +276,8 @@ static jobject android_media_MediaMetadataRetriever_getFrameAtTime(JNIEnv *env,
if (videoFrame->mDisplayWidth != videoFrame->mWidth || if (videoFrame->mDisplayWidth != videoFrame->mWidth ||
videoFrame->mDisplayHeight != videoFrame->mHeight) { videoFrame->mDisplayHeight != videoFrame->mHeight) {
size_t displayWidth = videoFrame->mDisplayWidth; uint32_t displayWidth = videoFrame->mDisplayWidth;
size_t displayHeight = videoFrame->mDisplayHeight; uint32_t displayHeight = videoFrame->mDisplayHeight;
if (swapWidthAndHeight) { if (swapWidthAndHeight) {
displayWidth = videoFrame->mDisplayHeight; displayWidth = videoFrame->mDisplayHeight;
displayHeight = videoFrame->mDisplayWidth; displayHeight = videoFrame->mDisplayWidth;