# HG changeset patch
# User lana
# Date 1361603566 28800
# Node ID 8eaecbafd49ddbbec52d708a06fd7eb37bdd750e
# Parent  b3be1ca43be293de65d7549de2e4d49d7caf3be5# Parent  068f2b5c2145a5482af91df324e75ec7a9593d17
Merge

diff -r b3be1ca43be2 -r 8eaecbafd49d jdk/src/share/native/sun/java2d/loops/AnyByteBinary.h
--- a/jdk/src/share/native/sun/java2d/loops/AnyByteBinary.h	Fri Feb 22 11:37:40 2013 -0800
+++ b/jdk/src/share/native/sun/java2d/loops/AnyByteBinary.h	Fri Feb 22 23:12:46 2013 -0800
@@ -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 -r b3be1ca43be2 -r 8eaecbafd49d jdk/src/share/native/sun/java2d/loops/ByteIndexed.h
--- a/jdk/src/share/native/sun/java2d/loops/ByteIndexed.h	Fri Feb 22 11:37:40 2013 -0800
+++ b/jdk/src/share/native/sun/java2d/loops/ByteIndexed.h	Fri Feb 22 23:12:46 2013 -0800
@@ -202,7 +202,10 @@
     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 -r b3be1ca43be2 -r 8eaecbafd49d jdk/src/share/native/sun/java2d/loops/IntArgb.h
--- a/jdk/src/share/native/sun/java2d/loops/IntArgb.h	Fri Feb 22 11:37:40 2013 -0800
+++ b/jdk/src/share/native/sun/java2d/loops/IntArgb.h	Fri Feb 22 23:12:46 2013 -0800
@@ -122,7 +122,8 @@
 #define DeclareIntArgbAlphaLoadData(PREFIX) \
     jint PREFIX;
 
-#define InitIntArgbAlphaLoadData(PREFIX, pRasInfo)
+#define InitIntArgbAlphaLoadData(PREFIX, pRasInfo) \
+    PREFIX = 0
 
 #define LoadAlphaFromIntArgbFor4ByteArgb(pRas, PREFIX, COMP_PREFIX) \
     do { \
diff -r b3be1ca43be2 -r 8eaecbafd49d jdk/src/share/native/sun/java2d/loops/IntArgbBm.h
--- a/jdk/src/share/native/sun/java2d/loops/IntArgbBm.h	Fri Feb 22 11:37:40 2013 -0800
+++ b/jdk/src/share/native/sun/java2d/loops/IntArgbBm.h	Fri Feb 22 23:12:46 2013 -0800
@@ -133,7 +133,8 @@
 #define DeclareIntArgbBmAlphaLoadData(PREFIX) \
     jint PREFIX;
 
-#define InitIntArgbBmAlphaLoadData(PREFIX, pRasInfo)
+#define InitIntArgbBmAlphaLoadData(PREFIX, pRasInfo) \
+    PREFIX = 0
 
 #define LoadAlphaFromIntArgbBmFor4ByteArgb(pRas, PREFIX, COMP_PREFIX) \
     do { \
diff -r b3be1ca43be2 -r 8eaecbafd49d jdk/src/share/native/sun/java2d/loops/IntArgbPre.h
--- a/jdk/src/share/native/sun/java2d/loops/IntArgbPre.h	Fri Feb 22 11:37:40 2013 -0800
+++ b/jdk/src/share/native/sun/java2d/loops/IntArgbPre.h	Fri Feb 22 23:12:46 2013 -0800
@@ -153,7 +153,8 @@
 #define DeclareIntArgbPreAlphaLoadData(PREFIX) \
     jint PREFIX;
 
-#define InitIntArgbPreAlphaLoadData(PREFIX, pRasInfo)
+#define InitIntArgbPreAlphaLoadData(PREFIX, pRasInfo) \
+    PREFIX = 0
 
 #define LoadAlphaFromIntArgbPreFor4ByteArgb(pRas, PREFIX, COMP_PREFIX) \
     do { \
diff -r b3be1ca43be2 -r 8eaecbafd49d jdk/src/share/native/sun/java2d/loops/Ushort4444Argb.h
--- a/jdk/src/share/native/sun/java2d/loops/Ushort4444Argb.h	Fri Feb 22 11:37:40 2013 -0800
+++ b/jdk/src/share/native/sun/java2d/loops/Ushort4444Argb.h	Fri Feb 22 23:12:46 2013 -0800
@@ -120,7 +120,8 @@
 #define DeclareUshort4444ArgbAlphaLoadData(PREFIX) \
     jint PREFIX;
 
-#define InitUshort4444ArgbAlphaLoadData(PREFIX, pRasInfo)
+#define InitUshort4444ArgbAlphaLoadData(PREFIX, pRasInfo) \
+    PREFIX = 0
 
 #define LoadAlphaFromUshort4444ArgbFor4ByteArgb(pRas, PREFIX, COMP_PREFIX) \
     do { \
diff -r b3be1ca43be2 -r 8eaecbafd49d jdk/src/share/native/sun/java2d/loops/UshortIndexed.h
--- a/jdk/src/share/native/sun/java2d/loops/UshortIndexed.h	Fri Feb 22 11:37:40 2013 -0800
+++ b/jdk/src/share/native/sun/java2d/loops/UshortIndexed.h	Fri Feb 22 23:12:46 2013 -0800
@@ -170,7 +170,10 @@
     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 { \