changeset 8684:d865ed51c537 8u31-b04

Automated merge with http://closedjdk.us.oracle.com/openjfx/8u25/rt
author kcr
date Thu, 09 Oct 2014 10:47:36 -0700
parents 6007660c47cd 047916651267
children 8543f1c7f2b2
files .hgtags
diffstat 4 files changed, 11 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Oct 08 12:38:15 2014 -0700
+++ b/.hgtags	Thu Oct 09 10:47:36 2014 -0700
@@ -190,4 +190,7 @@
 1eb6f8e62d998b96a66293688e64c2240e26815d 8u25-b15
 2e197f8c8fb43526f2eefca5800a75d1d6374dc1 8u25-b16
 70a91719c7faf3cfed0faaaefb8a400159846f13 8u25-b17
+5dffaa5831fa18ae9376448c8aad7a6f5e5227ef 8u31-b01
 b2021af209c3329ab75d019adf93bf853f2963c2 8u25-b18
+005254e22af36cea855c584b4ae4cf09f285819b 8u31-b02
+cb1597094e0803aa56013d79bd26e54b08b98cef 8u31-b03
--- a/build.properties	Wed Oct 08 12:38:15 2014 -0700
+++ b/build.properties	Thu Oct 09 10:47:36 2014 -0700
@@ -30,13 +30,13 @@
 ##############################################################################
 
 # Note: The expected value for milestone are [alpha, beta, dev, ea, fcs]
-jfx.release.milestone=fcs
+jfx.release.milestone=ea
 # Note: For fcs builds the suffix should be blank
-jfx.release.suffix=
-jfx.release.name=8u25
+jfx.release.suffix=-ea
+jfx.release.name=8u31
 jfx.release.major.version=8
 jfx.release.minor.version=0
-jfx.release.micro.version=25
+jfx.release.micro.version=31
 
 ##############################################################################
 #
--- a/modules/graphics/src/main/java/com/sun/scenario/effect/impl/sw/sse/SSELinearConvolvePeer.java	Wed Oct 08 12:38:15 2014 -0700
+++ b/modules/graphics/src/main/java/com/sun/scenario/effect/impl/sw/sse/SSELinearConvolvePeer.java	Thu Oct 09 10:47:36 2014 -0700
@@ -155,7 +155,7 @@
         return new ImageData(getFilterContext(), dst, dstBounds);
     }
 
-    protected native void
+    native void
         filterVector(int dstPixels[], int dstw, int dsth, int dstscan,
                      int srcPixels[], int srcw, int srch, int srcscan,
                      float weights[], int count,
@@ -172,7 +172,7 @@
      * Rows are horizontal in the first pass and vertical in the second pass.
      * Cols are vice versa.
      */
-    protected native void
+    native void
         filterHV(int dstPixels[], int dstcols, int dstrows, int dcolinc, int drowinc,
                  int srcPixels[], int srccols, int srcrows, int scolinc, int srowinc,
                  float weights[]);
--- a/modules/graphics/src/main/java/com/sun/scenario/effect/impl/sw/sse/SSELinearConvolveShadowPeer.java	Wed Oct 08 12:38:15 2014 -0700
+++ b/modules/graphics/src/main/java/com/sun/scenario/effect/impl/sw/sse/SSELinearConvolveShadowPeer.java	Thu Oct 09 10:47:36 2014 -0700
@@ -53,7 +53,7 @@
                      float dxcol, float dycol, float dxrow, float dyrow);
 
     @Override
-    protected void
+    void
         filterVector(int dstPixels[], int dstw, int dsth, int dstscan,
                      int srcPixels[], int srcw, int srch, int srcscan,
                      float weights[], int count,
@@ -85,7 +85,7 @@
                  float weights[], float shadowColor[]);
 
     @Override
-    protected void
+    void
         filterHV(int dstPixels[], int dstcols, int dstrows, int dcolinc, int drowinc,
                  int srcPixels[], int srccols, int srcrows, int scolinc, int srowinc,
                  float weights[])