equal
deleted
inserted
replaced
1099 TBool volatileBitmapOrMask = EFalse; |
1099 TBool volatileBitmapOrMask = EFalse; |
1100 #else |
1100 #else |
1101 TBool volatileBitmapOrMask = ETrue; |
1101 TBool volatileBitmapOrMask = ETrue; |
1102 #endif |
1102 #endif |
1103 |
1103 |
1104 TBool originalMaskUsed = ETrue; |
|
1105 |
|
1106 |
1104 |
1107 TInt bitmapHandle = aImage.iBitmapHandle; |
1105 TInt bitmapHandle = aImage.iBitmapHandle; |
1108 TInt maskHandle = aImage.iMaskHandle; |
1106 TInt maskHandle = aImage.iMaskHandle; |
1109 TBool invertMask = aImage.iInvertedMask; |
1107 TBool invertMask = aImage.iInvertedMask; |
1110 TPoint maskOriginPoint = aImage.iMaskOriginPoint; |
1108 TPoint maskOriginPoint = aImage.iMaskOriginPoint; |
1199 CleanupStack::PopAndDestroy(mask); |
1197 CleanupStack::PopAndDestroy(mask); |
1200 } |
1198 } |
1201 |
1199 |
1202 mask = invertedMask; |
1200 mask = invertedMask; |
1203 CleanupStack::PushL(mask); |
1201 CleanupStack::PushL(mask); |
1204 originalMaskUsed = EFalse; |
|
1205 } |
1202 } |
1206 |
1203 |
1207 // Upload expects mask to begin always at TPoint(0,0), so if mask |
1204 // Upload expects mask to begin always at TPoint(0,0), so if mask |
1208 // offset is defined we re-create mask with the given new |
1205 // offset is defined we re-create mask with the given new |
1209 // offset. Note that it might be a good idea to combine this op |
1206 // offset. Note that it might be a good idea to combine this op |
1218 { |
1215 { |
1219 CleanupStack::PopAndDestroy(mask); |
1216 CleanupStack::PopAndDestroy(mask); |
1220 } |
1217 } |
1221 mask = movedMask; |
1218 mask = movedMask; |
1222 CleanupStack::PushL(mask); |
1219 CleanupStack::PushL(mask); |
1223 originalMaskUsed = EFalse; |
|
1224 } |
1220 } |
1225 #ifdef __NVG |
1221 #ifdef __NVG |
1226 } |
1222 } |
1227 #endif |
1223 #endif |
1228 } |
1224 } |