diff options
| author | ExMix <rahuba.youri@mapswithme.com> | 2015-08-18 20:16:04 +0300 |
|---|---|---|
| committer | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2015-11-30 16:10:00 +0300 |
| commit | 8d4886f66c96a843e40952ab93233f965acdd7e9 (patch) | |
| tree | 33bba95f5c956b891b6a4d1abb484aaec4eb7f17 /drape/hw_texture_ios.mm | |
| parent | c1f9b0cf5868159ce49176bb7c9929c642e75aca (diff) | |
review fixes
Diffstat (limited to 'drape/hw_texture_ios.mm')
| -rw-r--r-- | drape/hw_texture_ios.mm | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drape/hw_texture_ios.mm b/drape/hw_texture_ios.mm index 9113b45b61..884c35e203 100644 --- a/drape/hw_texture_ios.mm +++ b/drape/hw_texture_ios.mm @@ -59,7 +59,8 @@ CVPixelBufferRef HWTextureAllocatorApple::CVCreatePixelBuffer(uint32_t width, ui cvRetval = CVPixelBufferCreate(kCFAllocatorDefault, width, height, kCVPixelFormatType_32BGRA, attrsRef, &result); break; case dp::ALPHA: - cvRetval = CVPixelBufferCreate(kCFAllocatorDefault, width, height, kCVPixelFormatType_OneComponent8, attrsRef, &result); + cvRetval = CVPixelBufferCreate(kCFAllocatorDefault, width, height, kCVPixelFormatType_OneComponent8, + attrsRef, &result); break; default: ASSERT(false, ()); @@ -77,7 +78,7 @@ void HWTextureAllocatorApple::CVDestroyPixelBuffer(CVPixelBufferRef buffer) } CVOpenGLESTextureRef HWTextureAllocatorApple::CVCreateTexture(CVPixelBufferRef buffer, uint32_t width, uint32_t height, - glConst layout, glConst pixelType) + glConst layout, glConst pixelType) { CVOpenGLESTextureRef texture; CVReturn cvRetval = CVOpenGLESTextureCacheCreateTextureFromImage(kCFAllocatorDefault, m_textureCache, buffer, @@ -170,8 +171,12 @@ void HWTextureApple::UploadData(uint32_t x, uint32_t y, uint32_t width, uint32_t } else if (bytesPerPixel == 4) { - rgba8c_view_t srcView = interleaved_view(width, height, (rgba8c_pixel_t *)data.get(), width * bytesPerPixel); - rgba8_view_t dstView = interleaved_view(m_width, m_height, (rgba8_pixel_t *)m_directPointer, m_width * bytesPerPixel); + rgba8c_view_t srcView = interleaved_view(width, height, + (rgba8c_pixel_t *)data.get(), + width * bytesPerPixel); + rgba8_view_t dstView = interleaved_view(m_width, m_height, + (rgba8_pixel_t *)m_directPointer, + m_width * bytesPerPixel); rgba8_view_t subDstView = subimage_view(dstView, x, y, width, height); copy_pixels(srcView, subDstView); } |