diff --git a/src/share/native/sun/java2d/loops/AnyByteBinary.h b/src/share/native/sun/java2d/loops/AnyByteBinary.h index abe7f230beeb7551ae9c7d888fad6c8ed7567a46..3b1fa03b06a21a3d3b9030704dffcdb1d45bf331 100644 --- a/src/share/native/sun/java2d/loops/AnyByteBinary.h +++ b/src/share/native/sun/java2d/loops/AnyByteBinary.h @@ -153,7 +153,10 @@ jint PREFIX ## rgb; #define InitByteBinaryAlphaLoadData(TYPE, PREFIX, pRasInfo) \ - PREFIX ## Lut = (pRasInfo)->lutBase + do { \ + PREFIX ## Lut = (pRasInfo)->lutBase; \ + PREFIX ## rgb = 0; \ + } while (0) #define LoadAlphaFromByteBinaryFor4ByteArgb(TYPE, pRas, PREFIX, COMP_PREFIX) \ do { \ diff --git a/src/share/native/sun/java2d/loops/ByteIndexed.h b/src/share/native/sun/java2d/loops/ByteIndexed.h index 3917c238e486a106ce01368a6cb3482c010dbdc0..215cfc0e1115a5abbcd9a4c8fdc8d96be87944e8 100644 --- a/src/share/native/sun/java2d/loops/ByteIndexed.h +++ b/src/share/native/sun/java2d/loops/ByteIndexed.h @@ -202,7 +202,10 @@ typedef jubyte ByteIndexedBmDataType; jint PREFIX ## rgb; #define InitByteIndexedAlphaLoadData(PREFIX, pRasInfo) \ - PREFIX ## Lut = (pRasInfo)->lutBase + do { \ + PREFIX ## Lut = (pRasInfo)->lutBase; \ + PREFIX ## rgb = 0; \ + } while (0) #define LoadAlphaFromByteIndexedFor4ByteArgb(pRas, PREFIX, COMP_PREFIX) \ do { \ diff --git a/src/share/native/sun/java2d/loops/IntArgb.h b/src/share/native/sun/java2d/loops/IntArgb.h index aec63431cb1015b6dd6e04ca8c52474bacd27028..f4ec00524cc4dbdbe8b2f0a0aef19a9e885fa013 100644 --- a/src/share/native/sun/java2d/loops/IntArgb.h +++ b/src/share/native/sun/java2d/loops/IntArgb.h @@ -122,7 +122,8 @@ typedef jint IntArgbDataType; #define DeclareIntArgbAlphaLoadData(PREFIX) \ jint PREFIX; -#define InitIntArgbAlphaLoadData(PREFIX, pRasInfo) +#define InitIntArgbAlphaLoadData(PREFIX, pRasInfo) \ + PREFIX = 0 #define LoadAlphaFromIntArgbFor4ByteArgb(pRas, PREFIX, COMP_PREFIX) \ do { \ diff --git a/src/share/native/sun/java2d/loops/IntArgbBm.h b/src/share/native/sun/java2d/loops/IntArgbBm.h index 81d551820a841157d9032c3613c9e2d3e4189493..675fba1d228a294683d973903649b49a38eb90b8 100644 --- a/src/share/native/sun/java2d/loops/IntArgbBm.h +++ b/src/share/native/sun/java2d/loops/IntArgbBm.h @@ -133,7 +133,8 @@ typedef jint IntArgbBmDataType; #define DeclareIntArgbBmAlphaLoadData(PREFIX) \ jint PREFIX; -#define InitIntArgbBmAlphaLoadData(PREFIX, pRasInfo) +#define InitIntArgbBmAlphaLoadData(PREFIX, pRasInfo) \ + PREFIX = 0 #define LoadAlphaFromIntArgbBmFor4ByteArgb(pRas, PREFIX, COMP_PREFIX) \ do { \ diff --git a/src/share/native/sun/java2d/loops/IntArgbPre.h b/src/share/native/sun/java2d/loops/IntArgbPre.h index 5ffb9dacb0bd1ea0f98b71b698b4c4ed409cc288..c45013d0e004b1c5199be089fae0e09dcd0afb08 100644 --- a/src/share/native/sun/java2d/loops/IntArgbPre.h +++ b/src/share/native/sun/java2d/loops/IntArgbPre.h @@ -153,7 +153,8 @@ typedef jint IntArgbPreDataType; #define DeclareIntArgbPreAlphaLoadData(PREFIX) \ jint PREFIX; -#define InitIntArgbPreAlphaLoadData(PREFIX, pRasInfo) +#define InitIntArgbPreAlphaLoadData(PREFIX, pRasInfo) \ + PREFIX = 0 #define LoadAlphaFromIntArgbPreFor4ByteArgb(pRas, PREFIX, COMP_PREFIX) \ do { \ diff --git a/src/share/native/sun/java2d/loops/Ushort4444Argb.h b/src/share/native/sun/java2d/loops/Ushort4444Argb.h index 348e03b7df427438d3528c874d7272495f1b37b2..aa50d8b0ff32e3365ae564892f868eaef50ebcfd 100644 --- a/src/share/native/sun/java2d/loops/Ushort4444Argb.h +++ b/src/share/native/sun/java2d/loops/Ushort4444Argb.h @@ -120,7 +120,8 @@ typedef jushort Ushort4444ArgbDataType; #define DeclareUshort4444ArgbAlphaLoadData(PREFIX) \ jint PREFIX; -#define InitUshort4444ArgbAlphaLoadData(PREFIX, pRasInfo) +#define InitUshort4444ArgbAlphaLoadData(PREFIX, pRasInfo) \ + PREFIX = 0 #define LoadAlphaFromUshort4444ArgbFor4ByteArgb(pRas, PREFIX, COMP_PREFIX) \ do { \ diff --git a/src/share/native/sun/java2d/loops/UshortIndexed.h b/src/share/native/sun/java2d/loops/UshortIndexed.h index 7786bda38290abf0c0e4a5e3e604a24de4aed108..6a4b5b13e5d148372c7429518ae1aaa0fa9e0944 100644 --- a/src/share/native/sun/java2d/loops/UshortIndexed.h +++ b/src/share/native/sun/java2d/loops/UshortIndexed.h @@ -170,7 +170,10 @@ typedef jushort UshortIndexedBmDataType; jint PREFIX ## rgb; #define InitUshortIndexedAlphaLoadData(PREFIX, pRasInfo) \ - PREFIX ## Lut = (pRasInfo)->lutBase + do { \ + PREFIX ## Lut = (pRasInfo)->lutBase; \ + PREFIX ## rgb = 0; \ + } while (0) #define LoadAlphaFromUshortIndexedFor4ByteArgb(pRas, PREFIX, COMP_PREFIX) \ do { \