Merge branch 'master' of https://github.com/openfl/lime into fix_openfl_635

This commit is contained in:
MrCdK
2015-04-28 01:21:27 +02:00

View File

@@ -171,7 +171,7 @@ namespace lime {
sourceOffset = (row * sourceStride) + (column * 4); sourceOffset = (row * sourceStride) + (column * 4);
offset = ((row + rowOffset) * stride) + ((column + columnOffset) * 4); offset = ((row + rowOffset) * stride) + ((column + columnOffset) * 4);
sourceAlpha = sourceData[sourceOffset + 3] / 255; sourceAlpha = sourceData[sourceOffset + 3] / 255.0;
oneMinusSourceAlpha = (1 - sourceAlpha); oneMinusSourceAlpha = (1 - sourceAlpha);
data[offset] = __clamp[int (sourceData[sourceOffset] * sourceAlpha)] + __clamp[int(data[offset] * oneMinusSourceAlpha)]; data[offset] = __clamp[int (sourceData[sourceOffset] * sourceAlpha)] + __clamp[int(data[offset] * oneMinusSourceAlpha)];