8008017: The fix for 8005129 does not build on Windows
Reviewed-by: prr, jgodinez
Contributed-by: jia-hong.chen@oracle.com
--- a/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c Wed Feb 13 13:01:16 2013 -0800
+++ b/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c Wed Feb 13 15:06:47 2013 -0800
@@ -1884,10 +1884,10 @@
mlib_s32 nchannel, chan1, chan2;
mlib_s32 i, j, c, swid;
d64_2x32 dd;
+ mlib_status status = MLIB_SUCCESS;
+
GET_SRC_DST_PARAMETERS(DTYPE);
- mlib_status status = MLIB_SUCCESS;
-
if (scale > 30) {
fscale *= 1.0/(1 << 30);
scale -= 30;
--- a/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c Wed Feb 13 13:01:16 2013 -0800
+++ b/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c Wed Feb 13 15:06:47 2013 -0800
@@ -1651,10 +1651,10 @@
DEF_VARS(DTYPE);
mlib_s32 chan2;
mlib_s32 *buffo, *buffi;
+ mlib_status status = MLIB_SUCCESS;
+
GET_SRC_DST_PARAMETERS(DTYPE);
- mlib_status status = MLIB_SUCCESS;
-
if (scale > 30) {
fscale *= 1.0/(1 << 30);
scale -= 30;
--- a/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c Wed Feb 13 13:01:16 2013 -0800
+++ b/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c Wed Feb 13 15:06:47 2013 -0800
@@ -1884,10 +1884,10 @@
mlib_s32 nchannel, chan1, chan2;
mlib_s32 i, j, c, swid;
d64_2x32 dd;
+ mlib_status status = MLIB_SUCCESS;
+
GET_SRC_DST_PARAMETERS(DTYPE);
- mlib_status status = MLIB_SUCCESS;
-
if (scale > 30) {
fscale *= 1.0/(1 << 30);
scale -= 30;
--- a/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c Wed Feb 13 13:01:16 2013 -0800
+++ b/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c Wed Feb 13 15:06:47 2013 -0800
@@ -1652,10 +1652,10 @@
DEF_VARS(DTYPE);
mlib_s32 chan2;
mlib_s32 *buffo, *buffi;
+ mlib_status status = MLIB_SUCCESS;
+
GET_SRC_DST_PARAMETERS(DTYPE);
- mlib_status status = MLIB_SUCCESS;
-
if (scale > 30) {
fscale *= 1.0/(1 << 30);
scale -= 30;
--- a/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c Wed Feb 13 13:01:16 2013 -0800
+++ b/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c Wed Feb 13 15:06:47 2013 -0800
@@ -1884,10 +1884,10 @@
mlib_s32 nchannel, chan1, chan2;
mlib_s32 i, j, c, swid;
d64_2x32 dd;
+ mlib_status status = MLIB_SUCCESS;
+
GET_SRC_DST_PARAMETERS(DTYPE);
- mlib_status status = MLIB_SUCCESS;
-
if (scale > 30) {
fscale *= 1.0/(1 << 30);
scale -= 30;
--- a/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c Wed Feb 13 13:01:16 2013 -0800
+++ b/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c Wed Feb 13 15:06:47 2013 -0800
@@ -1651,10 +1651,10 @@
DEF_VARS(DTYPE);
mlib_s32 chan2;
mlib_s32 *buffo, *buffi;
+ mlib_status status = MLIB_SUCCESS;
+
GET_SRC_DST_PARAMETERS(DTYPE);
- mlib_status status = MLIB_SUCCESS;
-
if (scale > 30) {
fscale *= 1.0/(1 << 30);
scale -= 30;