diff options
| author | Andreas Huber <andih@google.com> | 2014-02-12 16:52:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-12 16:52:49 +0000 |
| commit | 2f6c2e06a13e81b36365f60181189b6ce5f87c9b (patch) | |
| tree | 664921391f9d6461dea2c40eaeb1824cba18d6bc | |
| parent | dc3b8b5ae07a6d7f42822b6215f4090b0ed185d2 (diff) | |
| parent | e59b77ab4c6b4ee8b7338d7eccd4a6c5fac834e7 (diff) | |
| download | frameworks_av-2f6c2e06a13e81b36365f60181189b6ce5f87c9b.zip frameworks_av-2f6c2e06a13e81b36365f60181189b6ce5f87c9b.tar.gz frameworks_av-2f6c2e06a13e81b36365f60181189b6ce5f87c9b.tar.bz2 | |
Merge "Fix warnings (now errors) in YUVImage.cpp"
| -rw-r--r-- | media/libstagefright/yuv/YUVImage.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/media/libstagefright/yuv/YUVImage.cpp b/media/libstagefright/yuv/YUVImage.cpp index 7b9000b..bb3e2fd 100644 --- a/media/libstagefright/yuv/YUVImage.cpp +++ b/media/libstagefright/yuv/YUVImage.cpp @@ -226,8 +226,8 @@ void YUVImage::fastCopyRectangle420Planar( &ySrcOffsetIncrement, &uSrcOffsetIncrement, &vSrcOffsetIncrement); int32_t yDestOffsetIncrement; - int32_t uDestOffsetIncrement; - int32_t vDestOffsetIncrement; + int32_t uDestOffsetIncrement = 0; + int32_t vDestOffsetIncrement = 0; destImage.getOffsetIncrementsPerDataRow( &yDestOffsetIncrement, &uDestOffsetIncrement, &vDestOffsetIncrement); @@ -309,7 +309,7 @@ void YUVImage::fastCopyRectangle420SemiPlanar( int32_t yDestOffsetIncrement; int32_t uDestOffsetIncrement; - int32_t vDestOffsetIncrement; + int32_t vDestOffsetIncrement = 0; destImage.getOffsetIncrementsPerDataRow( &yDestOffsetIncrement, &uDestOffsetIncrement, &vDestOffsetIncrement); @@ -393,9 +393,9 @@ bool YUVImage::writeToPPM(const char *filename) const { fprintf(fp, "255\n"); for (int32_t y = 0; y < mHeight; ++y) { for (int32_t x = 0; x < mWidth; ++x) { - uint8_t yValue; - uint8_t uValue; - uint8_t vValue; + uint8_t yValue = 0u; + uint8_t uValue = 0u; + uint8_t vValue = 0u; getPixelValue(x, y, &yValue, &uValue, & vValue); uint8_t rValue; |