--- old/src/java.desktop/share/native/libawt/awt/image/imageInitIDs.h	2015-06-10 20:49:32.000000000 +0300
+++ new/src/java.desktop/share/native/libawt/awt/image/imageInitIDs.h	2015-06-10 20:49:32.000000000 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,6 @@
 /* Raster ids */
 IMGEXTERN jfieldID g_RasterWidthID;
 IMGEXTERN jfieldID g_RasterHeightID;
-IMGEXTERN jfieldID g_RasterNumBandsID;
 IMGEXTERN jfieldID g_RasterBaseRasterID;
 IMGEXTERN jfieldID g_RasterMinXID;
 IMGEXTERN jfieldID g_RasterMinYID;
@@ -52,12 +51,10 @@
 IMGEXTERN jfieldID g_RasterDataBufferID;
 IMGEXTERN jfieldID g_RasterNumDataElementsID;
 IMGEXTERN jfieldID g_RasterNumBandsID;
-IMGEXTERN jmethodID g_RasterGetDataMID;
 
 IMGEXTERN jfieldID g_BCRdataID;
 IMGEXTERN jfieldID g_BCRscanstrID;
 IMGEXTERN jfieldID g_BCRpixstrID;
-IMGEXTERN jfieldID g_BCRbandoffsID;
 IMGEXTERN jfieldID g_BCRdataOffsetsID;
 IMGEXTERN jfieldID g_BCRtypeID;
 IMGEXTERN jfieldID g_BPRdataID;
@@ -68,16 +65,13 @@
 IMGEXTERN jfieldID g_SCRdataID;
 IMGEXTERN jfieldID g_SCRscanstrID;
 IMGEXTERN jfieldID g_SCRpixstrID;
-IMGEXTERN jfieldID g_SCRbandoffsID;
 IMGEXTERN jfieldID g_SCRdataOffsetsID;
 IMGEXTERN jfieldID g_SCRtypeID;
 IMGEXTERN jfieldID g_ICRdataID;
 IMGEXTERN jfieldID g_ICRscanstrID;
 IMGEXTERN jfieldID g_ICRpixstrID;
-IMGEXTERN jfieldID g_ICRbandoffsID;
 IMGEXTERN jfieldID g_ICRdataOffsetsID;
 IMGEXTERN jfieldID g_ICRtypeID;
-IMGEXTERN jmethodID g_ICRputDataMID;
 
 /* Color Model ids */
 IMGEXTERN jfieldID g_CMpDataID;
@@ -87,7 +81,6 @@
 IMGEXTERN jfieldID g_CMsuppAlphaID;
 IMGEXTERN jfieldID g_CMisAlphaPreID;
 IMGEXTERN jfieldID g_CMtransparencyID;
-IMGEXTERN jmethodID g_CMgetRGBMID;
 IMGEXTERN jfieldID g_CMcsTypeID;
 IMGEXTERN jfieldID g_CMis_sRGBID;
 IMGEXTERN jmethodID g_CMgetRGBdefaultMID;
@@ -108,19 +101,9 @@
 IMGEXTERN jfieldID g_SPPSMnBitsID;
 IMGEXTERN jfieldID g_SPPSMmaxBitID;
 
-/* Component Sample Model ids */
-IMGEXTERN jfieldID g_CSMPixStrideID;
-IMGEXTERN jfieldID g_CSMScanStrideID;
-IMGEXTERN jfieldID g_CSMBandOffsetsID;
-
 /* Kernel ids */
 IMGEXTERN jfieldID g_KernelWidthID;
 IMGEXTERN jfieldID g_KernelHeightID;
-IMGEXTERN jfieldID g_KernelXOriginID;
-IMGEXTERN jfieldID g_KernelYOriginD;
 IMGEXTERN jfieldID g_KernelDataID;
 
-/* DataBufferInt ids */
-IMGEXTERN jfieldID g_DataBufferIntPdataID;
-
 #endif /* IMAGEINITIDS_H */