Kaydet (Commit) 590d851f authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Avoid pointless ifdef for iOS inside code not compiled for iOS anyway

The whole of svpbmp.cxx and svpvd.cxx are nowadays ifdeffed out for iOS.

Change-Id: Iac1f66457dc315ea86f86d12e1f6eb5bf4bcbb8c
üst b49e42f3
...@@ -53,7 +53,7 @@ bool SvpSalBitmap::Create( const Size& rSize, ...@@ -53,7 +53,7 @@ bool SvpSalBitmap::Create( const Size& rSize,
case 16: nFormat = FORMAT_SIXTEEN_BIT_LSB_TC_MASK; break; case 16: nFormat = FORMAT_SIXTEEN_BIT_LSB_TC_MASK; break;
#endif #endif
case 24: nFormat = FORMAT_TWENTYFOUR_BIT_TC_MASK; break; case 24: nFormat = FORMAT_TWENTYFOUR_BIT_TC_MASK; break;
#if defined(ANDROID) || defined(IOS) #ifdef ANDROID
case 32: nFormat = FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA; break; case 32: nFormat = FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA; break;
#else #else
case 32: nFormat = FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA; break; case 32: nFormat = FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA; break;
......
...@@ -81,7 +81,7 @@ bool SvpSalVirtualDevice::SetSizeUsingBuffer( long nNewDX, long nNewDY, const ba ...@@ -81,7 +81,7 @@ bool SvpSalVirtualDevice::SetSizeUsingBuffer( long nNewDX, long nNewDY, const ba
#endif #endif
case 24: nFormat = FORMAT_TWENTYFOUR_BIT_TC_MASK; break; case 24: nFormat = FORMAT_TWENTYFOUR_BIT_TC_MASK; break;
case 32: nFormat = FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA; break; case 32: nFormat = FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA; break;
#if defined(ANDROID) || defined(IOS) #ifdef ANDROID
case 0: nFormat = FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA; break; case 0: nFormat = FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA; break;
#else #else
case 0: nFormat = FORMAT_TWENTYFOUR_BIT_TC_MASK; break; case 0: nFormat = FORMAT_TWENTYFOUR_BIT_TC_MASK; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment