Modified:
websites/production/commons/content/proper/commons-imaging/apidocs/src-html/org/apache/commons/imaging/formats/ico/IcoImageParser.html
==============================================================================
---
websites/production/commons/content/proper/commons-imaging/apidocs/src-html/org/apache/commons/imaging/formats/ico/IcoImageParser.html
(original)
+++
websites/production/commons/content/proper/commons-imaging/apidocs/src-html/org/apache/commons/imaging/formats/ico/IcoImageParser.html
Sun Jan 11 12:33:25 2015
@@ -86,757 +86,761 @@
<span class="sourceLineNo">078</span> };<a name="line.78"></a>
<span class="sourceLineNo">079</span> }<a name="line.79"></a>
<span class="sourceLineNo">080</span><a name="line.80"></a>
-<span class="sourceLineNo">081</span> @Override<a name="line.81"></a>
-<span class="sourceLineNo">082</span> public ImageMetadata
getMetadata(final ByteSource byteSource, final Map<String, Object>
params)<a name="line.82"></a>
-<span class="sourceLineNo">083</span> throws ImageReadException,
IOException {<a name="line.83"></a>
-<span class="sourceLineNo">084</span> return null;<a name="line.84"></a>
-<span class="sourceLineNo">085</span> }<a name="line.85"></a>
-<span class="sourceLineNo">086</span><a name="line.86"></a>
-<span class="sourceLineNo">087</span> @Override<a name="line.87"></a>
-<span class="sourceLineNo">088</span> public ImageInfo getImageInfo(final
ByteSource byteSource, final Map<String, Object> params)<a
name="line.88"></a>
-<span class="sourceLineNo">089</span> throws ImageReadException,
IOException {<a name="line.89"></a>
-<span class="sourceLineNo">090</span> return null;<a name="line.90"></a>
-<span class="sourceLineNo">091</span> }<a name="line.91"></a>
-<span class="sourceLineNo">092</span><a name="line.92"></a>
-<span class="sourceLineNo">093</span> @Override<a name="line.93"></a>
-<span class="sourceLineNo">094</span> public Dimension getImageSize(final
ByteSource byteSource, final Map<String, Object> params)<a
name="line.94"></a>
-<span class="sourceLineNo">095</span> throws ImageReadException,
IOException {<a name="line.95"></a>
-<span class="sourceLineNo">096</span> return null;<a name="line.96"></a>
-<span class="sourceLineNo">097</span> }<a name="line.97"></a>
-<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span> @Override<a name="line.99"></a>
-<span class="sourceLineNo">100</span> public byte[]
getICCProfileBytes(final ByteSource byteSource, final Map<String, Object>
params)<a name="line.100"></a>
-<span class="sourceLineNo">101</span> throws ImageReadException,
IOException {<a name="line.101"></a>
-<span class="sourceLineNo">102</span> return null;<a
name="line.102"></a>
-<span class="sourceLineNo">103</span> }<a name="line.103"></a>
-<span class="sourceLineNo">104</span><a name="line.104"></a>
-<span class="sourceLineNo">105</span> private static class FileHeader {<a
name="line.105"></a>
-<span class="sourceLineNo">106</span> public final int reserved; //
Reserved (2 bytes), always 0<a name="line.106"></a>
-<span class="sourceLineNo">107</span> public final int iconType; //
IconType (2 bytes), if the image is an<a name="line.107"></a>
-<span class="sourceLineNo">108</span> //
icon it?s 1, for cursors the value is 2.<a name="line.108"></a>
-<span class="sourceLineNo">109</span> public final int iconCount; //
IconCount (2 bytes), number of icons in<a name="line.109"></a>
-<span class="sourceLineNo">110</span> //
this file.<a name="line.110"></a>
-<span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span> public FileHeader(final int
reserved, final int iconType, final int iconCount) {<a name="line.112"></a>
-<span class="sourceLineNo">113</span> this.reserved = reserved;<a
name="line.113"></a>
-<span class="sourceLineNo">114</span> this.iconType = iconType;<a
name="line.114"></a>
-<span class="sourceLineNo">115</span> this.iconCount = iconCount;<a
name="line.115"></a>
-<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span> public void dump(final
PrintWriter pw) {<a name="line.118"></a>
-<span class="sourceLineNo">119</span> pw.println("FileHeader");<a
name="line.119"></a>
-<span class="sourceLineNo">120</span> pw.println("Reserved: " +
reserved);<a name="line.120"></a>
-<span class="sourceLineNo">121</span> pw.println("IconType: " +
iconType);<a name="line.121"></a>
-<span class="sourceLineNo">122</span> pw.println("IconCount: " +
iconCount);<a name="line.122"></a>
-<span class="sourceLineNo">123</span> pw.println();<a
name="line.123"></a>
-<span class="sourceLineNo">124</span> }<a name="line.124"></a>
-<span class="sourceLineNo">125</span> }<a name="line.125"></a>
-<span class="sourceLineNo">126</span><a name="line.126"></a>
-<span class="sourceLineNo">127</span> private FileHeader
readFileHeader(final InputStream is) throws ImageReadException, IOException {<a
name="line.127"></a>
-<span class="sourceLineNo">128</span> final int reserved =
read2Bytes("Reserved", is, "Not a Valid ICO File", getByteOrder());<a
name="line.128"></a>
-<span class="sourceLineNo">129</span> final int iconType =
read2Bytes("IconType", is, "Not a Valid ICO File", getByteOrder());<a
name="line.129"></a>
-<span class="sourceLineNo">130</span> final int iconCount =
read2Bytes("IconCount", is, "Not a Valid ICO File", getByteOrder());<a
name="line.130"></a>
-<span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span> if (reserved != 0) {<a
name="line.132"></a>
-<span class="sourceLineNo">133</span> throw new
ImageReadException("Not a Valid ICO File: reserved is " + reserved);<a
name="line.133"></a>
-<span class="sourceLineNo">134</span> }<a name="line.134"></a>
-<span class="sourceLineNo">135</span> if (iconType != 1 &&
iconType != 2) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span> throw new
ImageReadException("Not a Valid ICO File: icon type is " + iconType);<a
name="line.136"></a>
-<span class="sourceLineNo">137</span> }<a name="line.137"></a>
-<span class="sourceLineNo">138</span><a name="line.138"></a>
-<span class="sourceLineNo">139</span> return new FileHeader(reserved,
iconType, iconCount);<a name="line.139"></a>
-<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span> }<a name="line.141"></a>
+<span class="sourceLineNo">081</span> // TODO should throw UOE<a
name="line.81"></a>
+<span class="sourceLineNo">082</span> @Override<a name="line.82"></a>
+<span class="sourceLineNo">083</span> public ImageMetadata
getMetadata(final ByteSource byteSource, final Map<String, Object>
params)<a name="line.83"></a>
+<span class="sourceLineNo">084</span> throws ImageReadException,
IOException {<a name="line.84"></a>
+<span class="sourceLineNo">085</span> return null;<a name="line.85"></a>
+<span class="sourceLineNo">086</span> }<a name="line.86"></a>
+<span class="sourceLineNo">087</span><a name="line.87"></a>
+<span class="sourceLineNo">088</span> // TODO should throw UOE<a
name="line.88"></a>
+<span class="sourceLineNo">089</span> @Override<a name="line.89"></a>
+<span class="sourceLineNo">090</span> public ImageInfo getImageInfo(final
ByteSource byteSource, final Map<String, Object> params)<a
name="line.90"></a>
+<span class="sourceLineNo">091</span> throws ImageReadException,
IOException {<a name="line.91"></a>
+<span class="sourceLineNo">092</span> return null;<a name="line.92"></a>
+<span class="sourceLineNo">093</span> }<a name="line.93"></a>
+<span class="sourceLineNo">094</span><a name="line.94"></a>
+<span class="sourceLineNo">095</span> // TODO should throw UOE<a
name="line.95"></a>
+<span class="sourceLineNo">096</span> @Override<a name="line.96"></a>
+<span class="sourceLineNo">097</span> public Dimension getImageSize(final
ByteSource byteSource, final Map<String, Object> params)<a
name="line.97"></a>
+<span class="sourceLineNo">098</span> throws ImageReadException,
IOException {<a name="line.98"></a>
+<span class="sourceLineNo">099</span> return null;<a name="line.99"></a>
+<span class="sourceLineNo">100</span> }<a name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span> // TODO should throw UOE<a
name="line.102"></a>
+<span class="sourceLineNo">103</span> @Override<a name="line.103"></a>
+<span class="sourceLineNo">104</span> public byte[]
getICCProfileBytes(final ByteSource byteSource, final Map<String, Object>
params)<a name="line.104"></a>
+<span class="sourceLineNo">105</span> throws ImageReadException,
IOException {<a name="line.105"></a>
+<span class="sourceLineNo">106</span> return null;<a
name="line.106"></a>
+<span class="sourceLineNo">107</span> }<a name="line.107"></a>
+<span class="sourceLineNo">108</span><a name="line.108"></a>
+<span class="sourceLineNo">109</span> private static class FileHeader {<a
name="line.109"></a>
+<span class="sourceLineNo">110</span> public final int reserved; //
Reserved (2 bytes), always 0<a name="line.110"></a>
+<span class="sourceLineNo">111</span> public final int iconType; //
IconType (2 bytes), if the image is an<a name="line.111"></a>
+<span class="sourceLineNo">112</span> //
icon it?s 1, for cursors the value is 2.<a name="line.112"></a>
+<span class="sourceLineNo">113</span> public final int iconCount; //
IconCount (2 bytes), number of icons in<a name="line.113"></a>
+<span class="sourceLineNo">114</span> //
this file.<a name="line.114"></a>
+<span class="sourceLineNo">115</span><a name="line.115"></a>
+<span class="sourceLineNo">116</span> public FileHeader(final int
reserved, final int iconType, final int iconCount) {<a name="line.116"></a>
+<span class="sourceLineNo">117</span> this.reserved = reserved;<a
name="line.117"></a>
+<span class="sourceLineNo">118</span> this.iconType = iconType;<a
name="line.118"></a>
+<span class="sourceLineNo">119</span> this.iconCount = iconCount;<a
name="line.119"></a>
+<span class="sourceLineNo">120</span> }<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span> public void dump(final
PrintWriter pw) {<a name="line.122"></a>
+<span class="sourceLineNo">123</span> pw.println("FileHeader");<a
name="line.123"></a>
+<span class="sourceLineNo">124</span> pw.println("Reserved: " +
reserved);<a name="line.124"></a>
+<span class="sourceLineNo">125</span> pw.println("IconType: " +
iconType);<a name="line.125"></a>
+<span class="sourceLineNo">126</span> pw.println("IconCount: " +
iconCount);<a name="line.126"></a>
+<span class="sourceLineNo">127</span> pw.println();<a
name="line.127"></a>
+<span class="sourceLineNo">128</span> }<a name="line.128"></a>
+<span class="sourceLineNo">129</span> }<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span> private FileHeader
readFileHeader(final InputStream is) throws ImageReadException, IOException {<a
name="line.131"></a>
+<span class="sourceLineNo">132</span> final int reserved =
read2Bytes("Reserved", is, "Not a Valid ICO File", getByteOrder());<a
name="line.132"></a>
+<span class="sourceLineNo">133</span> final int iconType =
read2Bytes("IconType", is, "Not a Valid ICO File", getByteOrder());<a
name="line.133"></a>
+<span class="sourceLineNo">134</span> final int iconCount =
read2Bytes("IconCount", is, "Not a Valid ICO File", getByteOrder());<a
name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span> if (reserved != 0) {<a
name="line.136"></a>
+<span class="sourceLineNo">137</span> throw new
ImageReadException("Not a Valid ICO File: reserved is " + reserved);<a
name="line.137"></a>
+<span class="sourceLineNo">138</span> }<a name="line.138"></a>
+<span class="sourceLineNo">139</span> if (iconType != 1 &&
iconType != 2) {<a name="line.139"></a>
+<span class="sourceLineNo">140</span> throw new
ImageReadException("Not a Valid ICO File: icon type is " + iconType);<a
name="line.140"></a>
+<span class="sourceLineNo">141</span> }<a name="line.141"></a>
<span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span> private static class IconInfo {<a
name="line.143"></a>
-<span class="sourceLineNo">144</span> public final byte width;<a
name="line.144"></a>
-<span class="sourceLineNo">145</span> public final byte height;<a
name="line.145"></a>
-<span class="sourceLineNo">146</span> public final byte colorCount;<a
name="line.146"></a>
-<span class="sourceLineNo">147</span> public final byte reserved;<a
name="line.147"></a>
-<span class="sourceLineNo">148</span> public final int planes;<a
name="line.148"></a>
-<span class="sourceLineNo">149</span> public final int bitCount;<a
name="line.149"></a>
-<span class="sourceLineNo">150</span> public final int imageSize;<a
name="line.150"></a>
-<span class="sourceLineNo">151</span> public final int imageOffset;<a
name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span> public IconInfo(final byte width,
final byte height,<a name="line.153"></a>
-<span class="sourceLineNo">154</span> final byte colorCount,
final byte reserved, final int planes,<a name="line.154"></a>
-<span class="sourceLineNo">155</span> final int bitCount, final
int imageSize, final int imageOffset) {<a name="line.155"></a>
-<span class="sourceLineNo">156</span> this.width = width;<a
name="line.156"></a>
-<span class="sourceLineNo">157</span> this.height = height;<a
name="line.157"></a>
-<span class="sourceLineNo">158</span> this.colorCount =
colorCount;<a name="line.158"></a>
-<span class="sourceLineNo">159</span> this.reserved = reserved;<a
name="line.159"></a>
-<span class="sourceLineNo">160</span> this.planes = planes;<a
name="line.160"></a>
-<span class="sourceLineNo">161</span> this.bitCount = bitCount;<a
name="line.161"></a>
-<span class="sourceLineNo">162</span> this.imageSize = imageSize;<a
name="line.162"></a>
-<span class="sourceLineNo">163</span> this.imageOffset =
imageOffset;<a name="line.163"></a>
-<span class="sourceLineNo">164</span> }<a name="line.164"></a>
-<span class="sourceLineNo">165</span><a name="line.165"></a>
-<span class="sourceLineNo">166</span> public void dump(final
PrintWriter pw) {<a name="line.166"></a>
-<span class="sourceLineNo">167</span> pw.println("IconInfo");<a
name="line.167"></a>
-<span class="sourceLineNo">168</span> pw.println("Width: " +
width);<a name="line.168"></a>
-<span class="sourceLineNo">169</span> pw.println("Height: " +
height);<a name="line.169"></a>
-<span class="sourceLineNo">170</span> pw.println("ColorCount: " +
colorCount);<a name="line.170"></a>
-<span class="sourceLineNo">171</span> pw.println("Reserved: " +
reserved);<a name="line.171"></a>
-<span class="sourceLineNo">172</span> pw.println("Planes: " +
planes);<a name="line.172"></a>
-<span class="sourceLineNo">173</span> pw.println("BitCount: " +
bitCount);<a name="line.173"></a>
-<span class="sourceLineNo">174</span> pw.println("ImageSize: " +
imageSize);<a name="line.174"></a>
-<span class="sourceLineNo">175</span> pw.println("ImageOffset: " +
imageOffset);<a name="line.175"></a>
-<span class="sourceLineNo">176</span> }<a name="line.176"></a>
-<span class="sourceLineNo">177</span> }<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span> private IconInfo readIconInfo(final
InputStream is) throws IOException {<a name="line.179"></a>
-<span class="sourceLineNo">180</span> // Width (1 byte), Width of Icon
(1 to 255)<a name="line.180"></a>
-<span class="sourceLineNo">181</span> final byte width =
readByte("Width", is, "Not a Valid ICO File");<a name="line.181"></a>
-<span class="sourceLineNo">182</span> // Height (1 byte), Height of
Icon (1 to 255)<a name="line.182"></a>
-<span class="sourceLineNo">183</span> final byte height =
readByte("Height", is, "Not a Valid ICO File");<a name="line.183"></a>
-<span class="sourceLineNo">184</span> // ColorCount (1 byte), Number of
colors, either<a name="line.184"></a>
-<span class="sourceLineNo">185</span> // 0 for 24 bit or higher,<a
name="line.185"></a>
-<span class="sourceLineNo">186</span> // 2 for monochrome or 16 for 16
color images.<a name="line.186"></a>
-<span class="sourceLineNo">187</span> final byte colorCount =
readByte("ColorCount", is, "Not a Valid ICO File");<a name="line.187"></a>
-<span class="sourceLineNo">188</span> // Reserved (1 byte), Not used
(always 0)<a name="line.188"></a>
-<span class="sourceLineNo">189</span> final byte reserved =
readByte("Reserved", is, "Not a Valid ICO File");<a name="line.189"></a>
-<span class="sourceLineNo">190</span> // Planes (2 bytes), always 1<a
name="line.190"></a>
-<span class="sourceLineNo">191</span> final int planes =
read2Bytes("Planes", is, "Not a Valid ICO File", getByteOrder());<a
name="line.191"></a>
-<span class="sourceLineNo">192</span> // BitCount (2 bytes), number of
bits per pixel (1 for monchrome,<a name="line.192"></a>
-<span class="sourceLineNo">193</span> // 4 for 16 colors, 8 for 256
colors, 24 for true colors,<a name="line.193"></a>
-<span class="sourceLineNo">194</span> // 32 for true colors + alpha
channel)<a name="line.194"></a>
-<span class="sourceLineNo">195</span> final int bitCount =
read2Bytes("BitCount", is, "Not a Valid ICO File", getByteOrder());<a
name="line.195"></a>
-<span class="sourceLineNo">196</span> // ImageSize (4 bytes), Length of
resource in bytes<a name="line.196"></a>
-<span class="sourceLineNo">197</span> final int imageSize =
read4Bytes("ImageSize", is, "Not a Valid ICO File", getByteOrder());<a
name="line.197"></a>
-<span class="sourceLineNo">198</span> // ImageOffset (4 bytes), start
of the image in the file<a name="line.198"></a>
-<span class="sourceLineNo">199</span> final int imageOffset =
read4Bytes("ImageOffset", is, "Not a Valid ICO File", getByteOrder());<a
name="line.199"></a>
-<span class="sourceLineNo">200</span><a name="line.200"></a>
-<span class="sourceLineNo">201</span> return new IconInfo(width,
height, colorCount, reserved, planes, bitCount, imageSize, imageOffset);<a
name="line.201"></a>
-<span class="sourceLineNo">202</span> }<a name="line.202"></a>
-<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span> private static class BitmapHeader {<a
name="line.204"></a>
-<span class="sourceLineNo">205</span> public final int size;<a
name="line.205"></a>
-<span class="sourceLineNo">206</span> public final int width;<a
name="line.206"></a>
-<span class="sourceLineNo">207</span> public final int height;<a
name="line.207"></a>
-<span class="sourceLineNo">208</span> public final int planes;<a
name="line.208"></a>
-<span class="sourceLineNo">209</span> public final int bitCount;<a
name="line.209"></a>
-<span class="sourceLineNo">210</span> public final int compression;<a
name="line.210"></a>
-<span class="sourceLineNo">211</span> public final int sizeImage;<a
name="line.211"></a>
-<span class="sourceLineNo">212</span> public final int xPelsPerMeter;<a
name="line.212"></a>
-<span class="sourceLineNo">213</span> public final int yPelsPerMeter;<a
name="line.213"></a>
-<span class="sourceLineNo">214</span> public final int colorsUsed;<a
name="line.214"></a>
-<span class="sourceLineNo">215</span> public final int
colorsImportant;<a name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span> public BitmapHeader(final int
size, final int width, final int height,<a name="line.217"></a>
-<span class="sourceLineNo">218</span> final int planes, final
int bitCount, final int compression,<a name="line.218"></a>
-<span class="sourceLineNo">219</span> final int sizeImage,
final int pelsPerMeter,<a name="line.219"></a>
-<span class="sourceLineNo">220</span> final int pelsPerMeter2,
final int colorsUsed,<a name="line.220"></a>
-<span class="sourceLineNo">221</span> final int
colorsImportant) {<a name="line.221"></a>
-<span class="sourceLineNo">222</span> this.size = size;<a
name="line.222"></a>
-<span class="sourceLineNo">223</span> this.width = width;<a
name="line.223"></a>
-<span class="sourceLineNo">224</span> this.height = height;<a
name="line.224"></a>
-<span class="sourceLineNo">225</span> this.planes = planes;<a
name="line.225"></a>
-<span class="sourceLineNo">226</span> this.bitCount = bitCount;<a
name="line.226"></a>
-<span class="sourceLineNo">227</span> this.compression =
compression;<a name="line.227"></a>
-<span class="sourceLineNo">228</span> this.sizeImage = sizeImage;<a
name="line.228"></a>
-<span class="sourceLineNo">229</span> xPelsPerMeter =
pelsPerMeter;<a name="line.229"></a>
-<span class="sourceLineNo">230</span> yPelsPerMeter =
pelsPerMeter2;<a name="line.230"></a>
-<span class="sourceLineNo">231</span> this.colorsUsed =
colorsUsed;<a name="line.231"></a>
-<span class="sourceLineNo">232</span> this.colorsImportant =
colorsImportant;<a name="line.232"></a>
-<span class="sourceLineNo">233</span> }<a name="line.233"></a>
-<span class="sourceLineNo">234</span><a name="line.234"></a>
-<span class="sourceLineNo">235</span> public void dump(final
PrintWriter pw) {<a name="line.235"></a>
-<span class="sourceLineNo">236</span> pw.println("BitmapHeader");<a
name="line.236"></a>
-<span class="sourceLineNo">237</span><a name="line.237"></a>
-<span class="sourceLineNo">238</span> pw.println("Size: " +
size);<a name="line.238"></a>
-<span class="sourceLineNo">239</span> pw.println("Width: " +
width);<a name="line.239"></a>
-<span class="sourceLineNo">240</span> pw.println("Height: " +
height);<a name="line.240"></a>
-<span class="sourceLineNo">241</span> pw.println("Planes: " +
planes);<a name="line.241"></a>
-<span class="sourceLineNo">242</span> pw.println("BitCount: " +
bitCount);<a name="line.242"></a>
-<span class="sourceLineNo">243</span> pw.println("Compression: " +
compression);<a name="line.243"></a>
-<span class="sourceLineNo">244</span> pw.println("SizeImage: " +
sizeImage);<a name="line.244"></a>
-<span class="sourceLineNo">245</span> pw.println("XPelsPerMeter: "
+ xPelsPerMeter);<a name="line.245"></a>
-<span class="sourceLineNo">246</span> pw.println("YPelsPerMeter: "
+ yPelsPerMeter);<a name="line.246"></a>
-<span class="sourceLineNo">247</span> pw.println("ColorsUsed: " +
colorsUsed);<a name="line.247"></a>
-<span class="sourceLineNo">248</span> pw.println("ColorsImportant:
" + colorsImportant);<a name="line.248"></a>
-<span class="sourceLineNo">249</span> }<a name="line.249"></a>
-<span class="sourceLineNo">250</span> }<a name="line.250"></a>
-<span class="sourceLineNo">251</span><a name="line.251"></a>
-<span class="sourceLineNo">252</span> private static abstract class
IconData {<a name="line.252"></a>
-<span class="sourceLineNo">253</span> public final IconInfo iconInfo;<a
name="line.253"></a>
-<span class="sourceLineNo">254</span><a name="line.254"></a>
-<span class="sourceLineNo">255</span> public IconData(final IconInfo
iconInfo) {<a name="line.255"></a>
-<span class="sourceLineNo">256</span> this.iconInfo = iconInfo;<a
name="line.256"></a>
-<span class="sourceLineNo">257</span> }<a name="line.257"></a>
+<span class="sourceLineNo">143</span> return new FileHeader(reserved,
iconType, iconCount);<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span> }<a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span> private static class IconInfo {<a
name="line.147"></a>
+<span class="sourceLineNo">148</span> public final byte width;<a
name="line.148"></a>
+<span class="sourceLineNo">149</span> public final byte height;<a
name="line.149"></a>
+<span class="sourceLineNo">150</span> public final byte colorCount;<a
name="line.150"></a>
+<span class="sourceLineNo">151</span> public final byte reserved;<a
name="line.151"></a>
+<span class="sourceLineNo">152</span> public final int planes;<a
name="line.152"></a>
+<span class="sourceLineNo">153</span> public final int bitCount;<a
name="line.153"></a>
+<span class="sourceLineNo">154</span> public final int imageSize;<a
name="line.154"></a>
+<span class="sourceLineNo">155</span> public final int imageOffset;<a
name="line.155"></a>
+<span class="sourceLineNo">156</span><a name="line.156"></a>
+<span class="sourceLineNo">157</span> public IconInfo(final byte width,
final byte height,<a name="line.157"></a>
+<span class="sourceLineNo">158</span> final byte colorCount,
final byte reserved, final int planes,<a name="line.158"></a>
+<span class="sourceLineNo">159</span> final int bitCount, final
int imageSize, final int imageOffset) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span> this.width = width;<a
name="line.160"></a>
+<span class="sourceLineNo">161</span> this.height = height;<a
name="line.161"></a>
+<span class="sourceLineNo">162</span> this.colorCount =
colorCount;<a name="line.162"></a>
+<span class="sourceLineNo">163</span> this.reserved = reserved;<a
name="line.163"></a>
+<span class="sourceLineNo">164</span> this.planes = planes;<a
name="line.164"></a>
+<span class="sourceLineNo">165</span> this.bitCount = bitCount;<a
name="line.165"></a>
+<span class="sourceLineNo">166</span> this.imageSize = imageSize;<a
name="line.166"></a>
+<span class="sourceLineNo">167</span> this.imageOffset =
imageOffset;<a name="line.167"></a>
+<span class="sourceLineNo">168</span> }<a name="line.168"></a>
+<span class="sourceLineNo">169</span><a name="line.169"></a>
+<span class="sourceLineNo">170</span> public void dump(final
PrintWriter pw) {<a name="line.170"></a>
+<span class="sourceLineNo">171</span> pw.println("IconInfo");<a
name="line.171"></a>
+<span class="sourceLineNo">172</span> pw.println("Width: " +
width);<a name="line.172"></a>
+<span class="sourceLineNo">173</span> pw.println("Height: " +
height);<a name="line.173"></a>
+<span class="sourceLineNo">174</span> pw.println("ColorCount: " +
colorCount);<a name="line.174"></a>
+<span class="sourceLineNo">175</span> pw.println("Reserved: " +
reserved);<a name="line.175"></a>
+<span class="sourceLineNo">176</span> pw.println("Planes: " +
planes);<a name="line.176"></a>
+<span class="sourceLineNo">177</span> pw.println("BitCount: " +
bitCount);<a name="line.177"></a>
+<span class="sourceLineNo">178</span> pw.println("ImageSize: " +
imageSize);<a name="line.178"></a>
+<span class="sourceLineNo">179</span> pw.println("ImageOffset: " +
imageOffset);<a name="line.179"></a>
+<span class="sourceLineNo">180</span> }<a name="line.180"></a>
+<span class="sourceLineNo">181</span> }<a name="line.181"></a>
+<span class="sourceLineNo">182</span><a name="line.182"></a>
+<span class="sourceLineNo">183</span> private IconInfo readIconInfo(final
InputStream is) throws IOException {<a name="line.183"></a>
+<span class="sourceLineNo">184</span> // Width (1 byte), Width of Icon
(1 to 255)<a name="line.184"></a>
+<span class="sourceLineNo">185</span> final byte width =
readByte("Width", is, "Not a Valid ICO File");<a name="line.185"></a>
+<span class="sourceLineNo">186</span> // Height (1 byte), Height of
Icon (1 to 255)<a name="line.186"></a>
+<span class="sourceLineNo">187</span> final byte height =
readByte("Height", is, "Not a Valid ICO File");<a name="line.187"></a>
+<span class="sourceLineNo">188</span> // ColorCount (1 byte), Number of
colors, either<a name="line.188"></a>
+<span class="sourceLineNo">189</span> // 0 for 24 bit or higher,<a
name="line.189"></a>
+<span class="sourceLineNo">190</span> // 2 for monochrome or 16 for 16
color images.<a name="line.190"></a>
+<span class="sourceLineNo">191</span> final byte colorCount =
readByte("ColorCount", is, "Not a Valid ICO File");<a name="line.191"></a>
+<span class="sourceLineNo">192</span> // Reserved (1 byte), Not used
(always 0)<a name="line.192"></a>
+<span class="sourceLineNo">193</span> final byte reserved =
readByte("Reserved", is, "Not a Valid ICO File");<a name="line.193"></a>
+<span class="sourceLineNo">194</span> // Planes (2 bytes), always 1<a
name="line.194"></a>
+<span class="sourceLineNo">195</span> final int planes =
read2Bytes("Planes", is, "Not a Valid ICO File", getByteOrder());<a
name="line.195"></a>
+<span class="sourceLineNo">196</span> // BitCount (2 bytes), number of
bits per pixel (1 for monchrome,<a name="line.196"></a>
+<span class="sourceLineNo">197</span> // 4 for 16 colors, 8 for 256
colors, 24 for true colors,<a name="line.197"></a>
+<span class="sourceLineNo">198</span> // 32 for true colors + alpha
channel)<a name="line.198"></a>
+<span class="sourceLineNo">199</span> final int bitCount =
read2Bytes("BitCount", is, "Not a Valid ICO File", getByteOrder());<a
name="line.199"></a>
+<span class="sourceLineNo">200</span> // ImageSize (4 bytes), Length of
resource in bytes<a name="line.200"></a>
+<span class="sourceLineNo">201</span> final int imageSize =
read4Bytes("ImageSize", is, "Not a Valid ICO File", getByteOrder());<a
name="line.201"></a>
+<span class="sourceLineNo">202</span> // ImageOffset (4 bytes), start
of the image in the file<a name="line.202"></a>
+<span class="sourceLineNo">203</span> final int imageOffset =
read4Bytes("ImageOffset", is, "Not a Valid ICO File", getByteOrder());<a
name="line.203"></a>
+<span class="sourceLineNo">204</span><a name="line.204"></a>
+<span class="sourceLineNo">205</span> return new IconInfo(width,
height, colorCount, reserved, planes, bitCount, imageSize, imageOffset);<a
name="line.205"></a>
+<span class="sourceLineNo">206</span> }<a name="line.206"></a>
+<span class="sourceLineNo">207</span><a name="line.207"></a>
+<span class="sourceLineNo">208</span> private static class BitmapHeader {<a
name="line.208"></a>
+<span class="sourceLineNo">209</span> public final int size;<a
name="line.209"></a>
+<span class="sourceLineNo">210</span> public final int width;<a
name="line.210"></a>
+<span class="sourceLineNo">211</span> public final int height;<a
name="line.211"></a>
+<span class="sourceLineNo">212</span> public final int planes;<a
name="line.212"></a>
+<span class="sourceLineNo">213</span> public final int bitCount;<a
name="line.213"></a>
+<span class="sourceLineNo">214</span> public final int compression;<a
name="line.214"></a>
+<span class="sourceLineNo">215</span> public final int sizeImage;<a
name="line.215"></a>
+<span class="sourceLineNo">216</span> public final int xPelsPerMeter;<a
name="line.216"></a>
+<span class="sourceLineNo">217</span> public final int yPelsPerMeter;<a
name="line.217"></a>
+<span class="sourceLineNo">218</span> public final int colorsUsed;<a
name="line.218"></a>
+<span class="sourceLineNo">219</span> public final int
colorsImportant;<a name="line.219"></a>
+<span class="sourceLineNo">220</span><a name="line.220"></a>
+<span class="sourceLineNo">221</span> public BitmapHeader(final int
size, final int width, final int height,<a name="line.221"></a>
+<span class="sourceLineNo">222</span> final int planes, final
int bitCount, final int compression,<a name="line.222"></a>
+<span class="sourceLineNo">223</span> final int sizeImage,
final int pelsPerMeter,<a name="line.223"></a>
+<span class="sourceLineNo">224</span> final int pelsPerMeter2,
final int colorsUsed,<a name="line.224"></a>
+<span class="sourceLineNo">225</span> final int
colorsImportant) {<a name="line.225"></a>
+<span class="sourceLineNo">226</span> this.size = size;<a
name="line.226"></a>
+<span class="sourceLineNo">227</span> this.width = width;<a
name="line.227"></a>
+<span class="sourceLineNo">228</span> this.height = height;<a
name="line.228"></a>
+<span class="sourceLineNo">229</span> this.planes = planes;<a
name="line.229"></a>
+<span class="sourceLineNo">230</span> this.bitCount = bitCount;<a
name="line.230"></a>
+<span class="sourceLineNo">231</span> this.compression =
compression;<a name="line.231"></a>
+<span class="sourceLineNo">232</span> this.sizeImage = sizeImage;<a
name="line.232"></a>
+<span class="sourceLineNo">233</span> xPelsPerMeter =
pelsPerMeter;<a name="line.233"></a>
+<span class="sourceLineNo">234</span> yPelsPerMeter =
pelsPerMeter2;<a name="line.234"></a>
+<span class="sourceLineNo">235</span> this.colorsUsed =
colorsUsed;<a name="line.235"></a>
+<span class="sourceLineNo">236</span> this.colorsImportant =
colorsImportant;<a name="line.236"></a>
+<span class="sourceLineNo">237</span> }<a name="line.237"></a>
+<span class="sourceLineNo">238</span><a name="line.238"></a>
+<span class="sourceLineNo">239</span> public void dump(final
PrintWriter pw) {<a name="line.239"></a>
+<span class="sourceLineNo">240</span> pw.println("BitmapHeader");<a
name="line.240"></a>
+<span class="sourceLineNo">241</span><a name="line.241"></a>
+<span class="sourceLineNo">242</span> pw.println("Size: " +
size);<a name="line.242"></a>
+<span class="sourceLineNo">243</span> pw.println("Width: " +
width);<a name="line.243"></a>
+<span class="sourceLineNo">244</span> pw.println("Height: " +
height);<a name="line.244"></a>
+<span class="sourceLineNo">245</span> pw.println("Planes: " +
planes);<a name="line.245"></a>
+<span class="sourceLineNo">246</span> pw.println("BitCount: " +
bitCount);<a name="line.246"></a>
+<span class="sourceLineNo">247</span> pw.println("Compression: " +
compression);<a name="line.247"></a>
+<span class="sourceLineNo">248</span> pw.println("SizeImage: " +
sizeImage);<a name="line.248"></a>
+<span class="sourceLineNo">249</span> pw.println("XPelsPerMeter: "
+ xPelsPerMeter);<a name="line.249"></a>
+<span class="sourceLineNo">250</span> pw.println("YPelsPerMeter: "
+ yPelsPerMeter);<a name="line.250"></a>
+<span class="sourceLineNo">251</span> pw.println("ColorsUsed: " +
colorsUsed);<a name="line.251"></a>
+<span class="sourceLineNo">252</span> pw.println("ColorsImportant:
" + colorsImportant);<a name="line.252"></a>
+<span class="sourceLineNo">253</span> }<a name="line.253"></a>
+<span class="sourceLineNo">254</span> }<a name="line.254"></a>
+<span class="sourceLineNo">255</span><a name="line.255"></a>
+<span class="sourceLineNo">256</span> private static abstract class
IconData {<a name="line.256"></a>
+<span class="sourceLineNo">257</span> public final IconInfo iconInfo;<a
name="line.257"></a>
<span class="sourceLineNo">258</span><a name="line.258"></a>
-<span class="sourceLineNo">259</span> public void dump(final
PrintWriter pw) {<a name="line.259"></a>
-<span class="sourceLineNo">260</span> iconInfo.dump(pw);<a
name="line.260"></a>
-<span class="sourceLineNo">261</span> pw.println();<a
name="line.261"></a>
-<span class="sourceLineNo">262</span> dumpSubclass(pw);<a
name="line.262"></a>
-<span class="sourceLineNo">263</span> }<a name="line.263"></a>
-<span class="sourceLineNo">264</span><a name="line.264"></a>
-<span class="sourceLineNo">265</span> protected abstract void
dumpSubclass(PrintWriter pw);<a name="line.265"></a>
-<span class="sourceLineNo">266</span><a name="line.266"></a>
-<span class="sourceLineNo">267</span> public abstract BufferedImage
readBufferedImage()<a name="line.267"></a>
-<span class="sourceLineNo">268</span> throws
ImageReadException;<a name="line.268"></a>
-<span class="sourceLineNo">269</span> }<a name="line.269"></a>
+<span class="sourceLineNo">259</span> public IconData(final IconInfo
iconInfo) {<a name="line.259"></a>
+<span class="sourceLineNo">260</span> this.iconInfo = iconInfo;<a
name="line.260"></a>
+<span class="sourceLineNo">261</span> }<a name="line.261"></a>
+<span class="sourceLineNo">262</span><a name="line.262"></a>
+<span class="sourceLineNo">263</span> public void dump(final
PrintWriter pw) {<a name="line.263"></a>
+<span class="sourceLineNo">264</span> iconInfo.dump(pw);<a
name="line.264"></a>
+<span class="sourceLineNo">265</span> pw.println();<a
name="line.265"></a>
+<span class="sourceLineNo">266</span> dumpSubclass(pw);<a
name="line.266"></a>
+<span class="sourceLineNo">267</span> }<a name="line.267"></a>
+<span class="sourceLineNo">268</span><a name="line.268"></a>
+<span class="sourceLineNo">269</span> protected abstract void
dumpSubclass(PrintWriter pw);<a name="line.269"></a>
<span class="sourceLineNo">270</span><a name="line.270"></a>
-<span class="sourceLineNo">271</span> private static class BitmapIconData
extends IconData {<a name="line.271"></a>
-<span class="sourceLineNo">272</span> public final BitmapHeader
header;<a name="line.272"></a>
-<span class="sourceLineNo">273</span> public final BufferedImage
bufferedImage;<a name="line.273"></a>
+<span class="sourceLineNo">271</span> public abstract BufferedImage
readBufferedImage()<a name="line.271"></a>
+<span class="sourceLineNo">272</span> throws
ImageReadException;<a name="line.272"></a>
+<span class="sourceLineNo">273</span> }<a name="line.273"></a>
<span class="sourceLineNo">274</span><a name="line.274"></a>
-<span class="sourceLineNo">275</span> public BitmapIconData(final
IconInfo iconInfo,<a name="line.275"></a>
-<span class="sourceLineNo">276</span> final BitmapHeader
header, final BufferedImage bufferedImage) {<a name="line.276"></a>
-<span class="sourceLineNo">277</span> super(iconInfo);<a
name="line.277"></a>
-<span class="sourceLineNo">278</span> this.header = header;<a
name="line.278"></a>
-<span class="sourceLineNo">279</span> this.bufferedImage =
bufferedImage;<a name="line.279"></a>
-<span class="sourceLineNo">280</span> }<a name="line.280"></a>
-<span class="sourceLineNo">281</span><a name="line.281"></a>
-<span class="sourceLineNo">282</span> @Override<a name="line.282"></a>
-<span class="sourceLineNo">283</span> public BufferedImage
readBufferedImage() throws ImageReadException {<a name="line.283"></a>
-<span class="sourceLineNo">284</span> return bufferedImage;<a
name="line.284"></a>
-<span class="sourceLineNo">285</span> }<a name="line.285"></a>
-<span class="sourceLineNo">286</span><a name="line.286"></a>
-<span class="sourceLineNo">287</span> @Override<a name="line.287"></a>
-<span class="sourceLineNo">288</span> protected void dumpSubclass(final
PrintWriter pw) {<a name="line.288"></a>
-<span class="sourceLineNo">289</span>
pw.println("BitmapIconData");<a name="line.289"></a>
-<span class="sourceLineNo">290</span> header.dump(pw);<a
name="line.290"></a>
-<span class="sourceLineNo">291</span> pw.println();<a
name="line.291"></a>
-<span class="sourceLineNo">292</span> }<a name="line.292"></a>
-<span class="sourceLineNo">293</span> }<a name="line.293"></a>
-<span class="sourceLineNo">294</span><a name="line.294"></a>
-<span class="sourceLineNo">295</span> private static class PNGIconData
extends IconData {<a name="line.295"></a>
-<span class="sourceLineNo">296</span> public final BufferedImage
bufferedImage;<a name="line.296"></a>
-<span class="sourceLineNo">297</span><a name="line.297"></a>
-<span class="sourceLineNo">298</span> public PNGIconData(final IconInfo
iconInfo,<a name="line.298"></a>
-<span class="sourceLineNo">299</span> final BufferedImage
bufferedImage) {<a name="line.299"></a>
-<span class="sourceLineNo">300</span> super(iconInfo);<a
name="line.300"></a>
-<span class="sourceLineNo">301</span> this.bufferedImage =
bufferedImage;<a name="line.301"></a>
-<span class="sourceLineNo">302</span> }<a name="line.302"></a>
-<span class="sourceLineNo">303</span><a name="line.303"></a>
-<span class="sourceLineNo">304</span> @Override<a name="line.304"></a>
-<span class="sourceLineNo">305</span> public BufferedImage
readBufferedImage() {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> return bufferedImage;<a
name="line.306"></a>
-<span class="sourceLineNo">307</span> }<a name="line.307"></a>
-<span class="sourceLineNo">308</span><a name="line.308"></a>
-<span class="sourceLineNo">309</span> @Override<a name="line.309"></a>
-<span class="sourceLineNo">310</span> protected void dumpSubclass(final
PrintWriter pw) {<a name="line.310"></a>
-<span class="sourceLineNo">311</span> pw.println("PNGIconData");<a
name="line.311"></a>
-<span class="sourceLineNo">312</span> pw.println();<a
name="line.312"></a>
-<span class="sourceLineNo">313</span> }<a name="line.313"></a>
-<span class="sourceLineNo">314</span> }<a name="line.314"></a>
-<span class="sourceLineNo">315</span><a name="line.315"></a>
-<span class="sourceLineNo">316</span> private IconData
readBitmapIconData(final byte[] iconData, final IconInfo fIconInfo)<a
name="line.316"></a>
-<span class="sourceLineNo">317</span> throws ImageReadException,
IOException {<a name="line.317"></a>
-<span class="sourceLineNo">318</span> final ByteArrayInputStream is =
new ByteArrayInputStream(iconData);<a name="line.318"></a>
-<span class="sourceLineNo">319</span> final int size =
read4Bytes("size", is, "Not a Valid ICO File", getByteOrder()); // Size (4<a
name="line.319"></a>
-<span class="sourceLineNo">320</span>
// bytes),<a name="line.320"></a>
-<span class="sourceLineNo">321</span>
// size of<a name="line.321"></a>
-<span class="sourceLineNo">322</span>
// this<a name="line.322"></a>
-<span class="sourceLineNo">323</span>
// structure<a name="line.323"></a>
-<span class="sourceLineNo">324</span>
// (always<a name="line.324"></a>
-<span class="sourceLineNo">325</span>
// 40)<a name="line.325"></a>
-<span class="sourceLineNo">326</span> final int width =
read4Bytes("width", is, "Not a Valid ICO File", getByteOrder()); // Width (4<a
name="line.326"></a>
-<span class="sourceLineNo">327</span>
// bytes),<a name="line.327"></a>
-<span class="sourceLineNo">328</span>
// width of<a name="line.328"></a>
-<span class="sourceLineNo">329</span>
// the<a name="line.329"></a>
-<span class="sourceLineNo">330</span>
// image<a name="line.330"></a>
-<span class="sourceLineNo">331</span>
// (same as<a name="line.331"></a>
-<span class="sourceLineNo">332</span>
// iconinfo.width)<a name="line.332"></a>
-<span class="sourceLineNo">333</span> final int height =
read4Bytes("height", is, "Not a Valid ICO File", getByteOrder()); // Height<a
name="line.333"></a>
-<span class="sourceLineNo">334</span>
// (4<a name="line.334"></a>
-<span class="sourceLineNo">335</span>
// bytes),<a name="line.335"></a>
-<span class="sourceLineNo">336</span>
// scanlines<a name="line.336"></a>
-<span class="sourceLineNo">337</span>
// in the<a name="line.337"></a>
-<span class="sourceLineNo">338</span>
// color<a name="line.338"></a>
-<span class="sourceLineNo">339</span>
// map +<a name="line.339"></a>
-<span class="sourceLineNo">340</span>
// transparent<a name="line.340"></a>
-<span class="sourceLineNo">341</span>
// map<a name="line.341"></a>
-<span class="sourceLineNo">342</span>
// (iconinfo.height<a name="line.342"></a>
-<span class="sourceLineNo">343</span>
// * 2)<a name="line.343"></a>
-<span class="sourceLineNo">344</span> final int planes =
read2Bytes("planes", is, "Not a Valid ICO File", getByteOrder()); // Planes<a
name="line.344"></a>
-<span class="sourceLineNo">345</span>
// (2<a name="line.345"></a>
-<span class="sourceLineNo">346</span>
// bytes),<a name="line.346"></a>
-<span class="sourceLineNo">347</span>
// always<a name="line.347"></a>
-<span class="sourceLineNo">348</span>
// 1<a name="line.348"></a>
-<span class="sourceLineNo">349</span> final int bitCount =
read2Bytes("bitCount", is, "Not a Valid ICO File", getByteOrder()); //
BitCount<a name="line.349"></a>
-<span class="sourceLineNo">350</span>
// (2<a name="line.350"></a>
-<span class="sourceLineNo">351</span>
// bytes),<a name="line.351"></a>
-<span class="sourceLineNo">352</span>
// 1,4,8,16,24,32<a name="line.352"></a>
-<span class="sourceLineNo">353</span>
// (see<a name="line.353"></a>
-<span class="sourceLineNo">354</span>
// iconinfo<a name="line.354"></a>
-<span class="sourceLineNo">355</span>
// for<a name="line.355"></a>
-<span class="sourceLineNo">356</span>
// details)<a name="line.356"></a>
-<span class="sourceLineNo">357</span> int compression =
read4Bytes("compression", is, "Not a Valid ICO File", getByteOrder()); //
Compression<a name="line.357"></a>
-<span class="sourceLineNo">358</span>
// (4<a name="line.358"></a>
-<span class="sourceLineNo">359</span>
// bytes),<a name="line.359"></a>
-<span class="sourceLineNo">360</span>
// we<a name="line.360"></a>
-<span class="sourceLineNo">361</span>
// don?t<a name="line.361"></a>
-<span class="sourceLineNo">362</span>
// use<a name="line.362"></a>
-<span class="sourceLineNo">363</span>
// this<a name="line.363"></a>
-<span class="sourceLineNo">364</span>
// (0)<a name="line.364"></a>
-<span class="sourceLineNo">365</span> final int sizeImage =
read4Bytes("sizeImage", is, "Not a Valid ICO File", getByteOrder()); //
SizeImage<a name="line.365"></a>
-<span class="sourceLineNo">366</span>
// (4<a name="line.366"></a>
-<span class="sourceLineNo">367</span>
// bytes),<a name="line.367"></a>
-<span class="sourceLineNo">368</span>
// we<a name="line.368"></a>
-<span class="sourceLineNo">369</span>
// don?t<a name="line.369"></a>
-<span class="sourceLineNo">370</span>
// use<a name="line.370"></a>
-<span class="sourceLineNo">371</span>
// this<a name="line.371"></a>
-<span class="sourceLineNo">372</span>
// (0)<a name="line.372"></a>
-<span class="sourceLineNo">373</span> final int xPelsPerMeter =
read4Bytes("xPelsPerMeter", is,<a name="line.373"></a>
-<span class="sourceLineNo">374</span> "Not a Valid ICO File",
getByteOrder()); // XPelsPerMeter (4 bytes), we don?t<a name="line.374"></a>
-<span class="sourceLineNo">375</span>
// use this (0)<a name="line.375"></a>
-<span class="sourceLineNo">376</span> final int yPelsPerMeter =
read4Bytes("yPelsPerMeter", is, <a name="line.376"></a>
-<span class="sourceLineNo">377</span> "Not a Valid ICO File",
getByteOrder()); // YPelsPerMeter (4 bytes), we don?t<a name="line.377"></a>
-<span class="sourceLineNo">378</span>
// use this (0)<a name="line.378"></a>
-<span class="sourceLineNo">379</span> final int colorsUsed =
read4Bytes("colorsUsed", is, "Not a Valid ICO File", getByteOrder()); //
ColorsUsed<a name="line.379"></a>
-<span class="sourceLineNo">380</span>
// (4<a name="line.380"></a>
-<span class="sourceLineNo">381</span>
// bytes),<a name="line.381"></a>
-<span class="sourceLineNo">382</span>
// we<a name="line.382"></a>
-<span class="sourceLineNo">383</span>
// don?t<a name="line.383"></a>
-<span class="sourceLineNo">384</span>
// use<a name="line.384"></a>
-<span class="sourceLineNo">385</span>
// this<a name="line.385"></a>
-<span class="sourceLineNo">386</span>
// (0)<a name="line.386"></a>
-<span class="sourceLineNo">387</span> final int colorsImportant =
read4Bytes("ColorsImportant", is,<a name="line.387"></a>
-<span class="sourceLineNo">388</span> "Not a Valid ICO File",
getByteOrder()); // ColorsImportant (4 bytes), we don?t<a name="line.388"></a>
-<span class="sourceLineNo">389</span>
// use this (0)<a name="line.389"></a>
-<span class="sourceLineNo">390</span> int redMask = 0;<a
name="line.390"></a>
-<span class="sourceLineNo">391</span> int greenMask = 0;<a
name="line.391"></a>
-<span class="sourceLineNo">392</span> int blueMask = 0;<a
name="line.392"></a>
-<span class="sourceLineNo">393</span> int alphaMask = 0;<a
name="line.393"></a>
-<span class="sourceLineNo">394</span> if (compression == 3) {<a
name="line.394"></a>
-<span class="sourceLineNo">395</span> redMask =
read4Bytes("redMask", is, "Not a Valid ICO File", getByteOrder());<a
name="line.395"></a>
-<span class="sourceLineNo">396</span> greenMask =
read4Bytes("greenMask", is, "Not a Valid ICO File", getByteOrder());<a
name="line.396"></a>
-<span class="sourceLineNo">397</span> blueMask =
read4Bytes("blueMask", is, "Not a Valid ICO File", getByteOrder());<a
name="line.397"></a>
-<span class="sourceLineNo">398</span> }<a name="line.398"></a>
-<span class="sourceLineNo">399</span> final byte[] restOfFile =
readBytes("RestOfFile", is, is.available());<a name="line.399"></a>
-<span class="sourceLineNo">400</span><a name="line.400"></a>
-<span class="sourceLineNo">401</span> if (size != 40) {<a
name="line.401"></a>
-<span class="sourceLineNo">402</span> throw new
ImageReadException("Not a Valid ICO File: Wrong bitmap header size " + size);<a
name="line.402"></a>
-<span class="sourceLineNo">403</span> }<a name="line.403"></a>
-<span class="sourceLineNo">404</span> if (planes != 1) {<a
name="line.404"></a>
-<span class="sourceLineNo">405</span> throw new
ImageReadException("Not a Valid ICO File: Planes can't be " + planes);<a
name="line.405"></a>
-<span class="sourceLineNo">406</span> }<a name="line.406"></a>
-<span class="sourceLineNo">407</span><a name="line.407"></a>
-<span class="sourceLineNo">408</span> if (compression == 0 &&
bitCount == 32) {<a name="line.408"></a>
-<span class="sourceLineNo">409</span> // 32 BPP RGB icons need an
alpha channel, but BMP files don't have<a name="line.409"></a>
-<span class="sourceLineNo">410</span> // one unless BI_BITFIELDS is
used...<a name="line.410"></a>
-<span class="sourceLineNo">411</span> compression = 3;<a
name="line.411"></a>
-<span class="sourceLineNo">412</span> redMask = 0x00ff0000;<a
name="line.412"></a>
-<span class="sourceLineNo">413</span> greenMask = 0x0000ff00;<a
name="line.413"></a>
-<span class="sourceLineNo">414</span> blueMask = 0x000000ff;<a
name="line.414"></a>
-<span class="sourceLineNo">415</span> alphaMask = 0xff000000;<a
name="line.415"></a>
-<span class="sourceLineNo">416</span> }<a name="line.416"></a>
-<span class="sourceLineNo">417</span><a name="line.417"></a>
-<span class="sourceLineNo">418</span> final BitmapHeader header = new
BitmapHeader(size, width, height, planes,<a name="line.418"></a>
-<span class="sourceLineNo">419</span> bitCount, compression,
sizeImage, xPelsPerMeter, yPelsPerMeter,<a name="line.419"></a>
-<span class="sourceLineNo">420</span> colorsUsed,
colorsImportant);<a name="line.420"></a>
+<span class="sourceLineNo">275</span> private static class BitmapIconData
extends IconData {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> public final BitmapHeader
header;<a name="line.276"></a>
+<span class="sourceLineNo">277</span> public final BufferedImage
bufferedImage;<a name="line.277"></a>
+<span class="sourceLineNo">278</span><a name="line.278"></a>
+<span class="sourceLineNo">279</span> public BitmapIconData(final
IconInfo iconInfo,<a name="line.279"></a>
+<span class="sourceLineNo">280</span> final BitmapHeader
header, final BufferedImage bufferedImage) {<a name="line.280"></a>
+<span class="sourceLineNo">281</span> super(iconInfo);<a
name="line.281"></a>
+<span class="sourceLineNo">282</span> this.header = header;<a
name="line.282"></a>
+<span class="sourceLineNo">283</span> this.bufferedImage =
bufferedImage;<a name="line.283"></a>
+<span class="sourceLineNo">284</span> }<a name="line.284"></a>
+<span class="sourceLineNo">285</span><a name="line.285"></a>
+<span class="sourceLineNo">286</span> @Override<a name="line.286"></a>
+<span class="sourceLineNo">287</span> public BufferedImage
readBufferedImage() throws ImageReadException {<a name="line.287"></a>
+<span class="sourceLineNo">288</span> return bufferedImage;<a
name="line.288"></a>
+<span class="sourceLineNo">289</span> }<a name="line.289"></a>
+<span class="sourceLineNo">290</span><a name="line.290"></a>
+<span class="sourceLineNo">291</span> @Override<a name="line.291"></a>
+<span class="sourceLineNo">292</span> protected void dumpSubclass(final
PrintWriter pw) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span>
pw.println("BitmapIconData");<a name="line.293"></a>
+<span class="sourceLineNo">294</span> header.dump(pw);<a
name="line.294"></a>
+<span class="sourceLineNo">295</span> pw.println();<a
name="line.295"></a>
+<span class="sourceLineNo">296</span> }<a name="line.296"></a>
+<span class="sourceLineNo">297</span> }<a name="line.297"></a>
+<span class="sourceLineNo">298</span><a name="line.298"></a>
+<span class="sourceLineNo">299</span> private static class PNGIconData
extends IconData {<a name="line.299"></a>
+<span class="sourceLineNo">300</span> public final BufferedImage
bufferedImage;<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span> public PNGIconData(final IconInfo
iconInfo,<a name="line.302"></a>
+<span class="sourceLineNo">303</span> final BufferedImage
bufferedImage) {<a name="line.303"></a>
+<span class="sourceLineNo">304</span> super(iconInfo);<a
name="line.304"></a>
+<span class="sourceLineNo">305</span> this.bufferedImage =
bufferedImage;<a name="line.305"></a>
+<span class="sourceLineNo">306</span> }<a name="line.306"></a>
+<span class="sourceLineNo">307</span><a name="line.307"></a>
+<span class="sourceLineNo">308</span> @Override<a name="line.308"></a>
+<span class="sourceLineNo">309</span> public BufferedImage
readBufferedImage() {<a name="line.309"></a>
+<span class="sourceLineNo">310</span> return bufferedImage;<a
name="line.310"></a>
+<span class="sourceLineNo">311</span> }<a name="line.311"></a>
+<span class="sourceLineNo">312</span><a name="line.312"></a>
+<span class="sourceLineNo">313</span> @Override<a name="line.313"></a>
+<span class="sourceLineNo">314</span> protected void dumpSubclass(final
PrintWriter pw) {<a name="line.314"></a>
+<span class="sourceLineNo">315</span> pw.println("PNGIconData");<a
name="line.315"></a>
+<span class="sourceLineNo">316</span> pw.println();<a
name="line.316"></a>
+<span class="sourceLineNo">317</span> }<a name="line.317"></a>
+<span class="sourceLineNo">318</span> }<a name="line.318"></a>
+<span class="sourceLineNo">319</span><a name="line.319"></a>
+<span class="sourceLineNo">320</span> private IconData
readBitmapIconData(final byte[] iconData, final IconInfo fIconInfo)<a
name="line.320"></a>
+<span class="sourceLineNo">321</span> throws ImageReadException,
IOException {<a name="line.321"></a>
+<span class="sourceLineNo">322</span> final ByteArrayInputStream is =
new ByteArrayInputStream(iconData);<a name="line.322"></a>
+<span class="sourceLineNo">323</span> final int size =
read4Bytes("size", is, "Not a Valid ICO File", getByteOrder()); // Size (4<a
name="line.323"></a>
+<span class="sourceLineNo">324</span>
// bytes),<a name="line.324"></a>
+<span class="sourceLineNo">325</span>
// size of<a name="line.325"></a>
+<span class="sourceLineNo">326</span>
// this<a name="line.326"></a>
+<span class="sourceLineNo">327</span>
// structure<a name="line.327"></a>
+<span class="sourceLineNo">328</span>
// (always<a name="line.328"></a>
+<span class="sourceLineNo">329</span>
// 40)<a name="line.329"></a>
+<span class="sourceLineNo">330</span> final int width =
read4Bytes("width", is, "Not a Valid ICO File", getByteOrder()); // Width (4<a
name="line.330"></a>
+<span class="sourceLineNo">331</span>
// bytes),<a name="line.331"></a>
+<span class="sourceLineNo">332</span>
// width of<a name="line.332"></a>
+<span class="sourceLineNo">333</span>
// the<a name="line.333"></a>
+<span class="sourceLineNo">334</span>
// image<a name="line.334"></a>
+<span class="sourceLineNo">335</span>
// (same as<a name="line.335"></a>
+<span class="sourceLineNo">336</span>
// iconinfo.width)<a name="line.336"></a>
+<span class="sourceLineNo">337</span> final int height =
read4Bytes("height", is, "Not a Valid ICO File", getByteOrder()); // Height<a
name="line.337"></a>
+<span class="sourceLineNo">338</span>
// (4<a name="line.338"></a>
+<span class="sourceLineNo">339</span>
// bytes),<a name="line.339"></a>
+<span class="sourceLineNo">340</span>
// scanlines<a name="line.340"></a>
+<span class="sourceLineNo">341</span>
// in the<a name="line.341"></a>
+<span class="sourceLineNo">342</span>
// color<a name="line.342"></a>
+<span class="sourceLineNo">343</span>
// map +<a name="line.343"></a>
+<span class="sourceLineNo">344</span>
// transparent<a name="line.344"></a>
+<span class="sourceLineNo">345</span>
// map<a name="line.345"></a>
+<span class="sourceLineNo">346</span>
// (iconinfo.height<a name="line.346"></a>
+<span class="sourceLineNo">347</span>
// * 2)<a name="line.347"></a>
+<span class="sourceLineNo">348</span> final int planes =
read2Bytes("planes", is, "Not a Valid ICO File", getByteOrder()); // Planes<a
name="line.348"></a>
+<span class="sourceLineNo">349</span>
// (2<a name="line.349"></a>
+<span class="sourceLineNo">350</span>
// bytes),<a name="line.350"></a>
+<span class="sourceLineNo">351</span>
// always<a name="line.351"></a>
+<span class="sourceLineNo">352</span>
// 1<a name="line.352"></a>
+<span class="sourceLineNo">353</span> final int bitCount =
read2Bytes("bitCount", is, "Not a Valid ICO File", getByteOrder()); //
BitCount<a name="line.353"></a>
+<span class="sourceLineNo">354</span>
// (2<a name="line.354"></a>
+<span class="sourceLineNo">355</span>
// bytes),<a name="line.355"></a>
+<span class="sourceLineNo">356</span>
// 1,4,8,16,24,32<a name="line.356"></a>
+<span class="sourceLineNo">357</span>
// (see<a name="line.357"></a>
+<span class="sourceLineNo">358</span>
// iconinfo<a name="line.358"></a>
+<span class="sourceLineNo">359</span>
// for<a name="line.359"></a>
+<span class="sourceLineNo">360</span>
// details)<a name="line.360"></a>
+<span class="sourceLineNo">361</span> int compression =
read4Bytes("compression", is, "Not a Valid ICO File", getByteOrder()); //
Compression<a name="line.361"></a>
+<span class="sourceLineNo">362</span>
// (4<a name="line.362"></a>
+<span class="sourceLineNo">363</span>
// bytes),<a name="line.363"></a>
+<span class="sourceLineNo">364</span>
// we<a name="line.364"></a>
+<span class="sourceLineNo">365</span>
// don?t<a name="line.365"></a>
+<span class="sourceLineNo">366</span>
// use<a name="line.366"></a>
+<span class="sourceLineNo">367</span>
// this<a name="line.367"></a>
+<span class="sourceLineNo">368</span>
// (0)<a name="line.368"></a>
+<span class="sourceLineNo">369</span> final int sizeImage =
read4Bytes("sizeImage", is, "Not a Valid ICO File", getByteOrder()); //
SizeImage<a name="line.369"></a>
+<span class="sourceLineNo">370</span>
// (4<a name="line.370"></a>
+<span class="sourceLineNo">371</span>
// bytes),<a name="line.371"></a>
+<span class="sourceLineNo">372</span>
// we<a name="line.372"></a>
+<span class="sourceLineNo">373</span>
// don?t<a name="line.373"></a>
+<span class="sourceLineNo">374</span>
// use<a name="line.374"></a>
+<span class="sourceLineNo">375</span>
// this<a name="line.375"></a>
+<span class="sourceLineNo">376</span>
// (0)<a name="line.376"></a>
+<span class="sourceLineNo">377</span> final int xPelsPerMeter =
read4Bytes("xPelsPerMeter", is,<a name="line.377"></a>
+<span class="sourceLineNo">378</span> "Not a Valid ICO File",
getByteOrder()); // XPelsPerMeter (4 bytes), we don?t<a name="line.378"></a>
+<span class="sourceLineNo">379</span>
// use this (0)<a name="line.379"></a>
+<span class="sourceLineNo">380</span> final int yPelsPerMeter =
read4Bytes("yPelsPerMeter", is, <a name="line.380"></a>
+<span class="sourceLineNo">381</span> "Not a Valid ICO File",
getByteOrder()); // YPelsPerMeter (4 bytes), we don?t<a name="line.381"></a>
+<span class="sourceLineNo">382</span>
// use this (0)<a name="line.382"></a>
+<span class="sourceLineNo">383</span> final int colorsUsed =
read4Bytes("colorsUsed", is, "Not a Valid ICO File", getByteOrder()); //
ColorsUsed<a name="line.383"></a>
+<span class="sourceLineNo">384</span>
// (4<a name="line.384"></a>
+<span class="sourceLineNo">385</span>
// bytes),<a name="line.385"></a>
+<span class="sourceLineNo">386</span>
// we<a name="line.386"></a>
+<span class="sourceLineNo">387</span>
// don?t<a name="line.387"></a>
+<span class="sourceLineNo">388</span>
// use<a name="line.388"></a>
+<span class="sourceLineNo">389</span>
// this<a name="line.389"></a>
+<span class="sourceLineNo">390</span>
// (0)<a name="line.390"></a>
+<span class="sourceLineNo">391</span> final int colorsImportant =
read4Bytes("ColorsImportant", is,<a name="line.391"></a>
+<span class="sourceLineNo">392</span> "Not a Valid ICO File",
getByteOrder()); // ColorsImportant (4 bytes), we don?t<a name="line.392"></a>
+<span class="sourceLineNo">393</span>
// use this (0)<a name="line.393"></a>
+<span class="sourceLineNo">394</span> int redMask = 0;<a
name="line.394"></a>
+<span class="sourceLineNo">395</span> int greenMask = 0;<a
name="line.395"></a>
+<span class="sourceLineNo">396</span> int blueMask = 0;<a
name="line.396"></a>
+<span class="sourceLineNo">397</span> int alphaMask = 0;<a
name="line.397"></a>
+<span class="sourceLineNo">398</span> if (compression == 3) {<a
name="line.398"></a>
+<span class="sourceLineNo">399</span> redMask =
read4Bytes("redMask", is, "Not a Valid ICO File", getByteOrder());<a
name="line.399"></a>
+<span class="sourceLineNo">400</span> greenMask =
read4Bytes("greenMask", is, "Not a Valid ICO File", getByteOrder());<a
name="line.400"></a>
+<span class="sourceLineNo">401</span> blueMask =
read4Bytes("blueMask", is, "Not a Valid ICO File", getByteOrder());<a
name="line.401"></a>
+<span class="sourceLineNo">402</span> }<a name="line.402"></a>
+<span class="sourceLineNo">403</span> final byte[] restOfFile =
readBytes("RestOfFile", is, is.available());<a name="line.403"></a>
+<span class="sourceLineNo">404</span><a name="line.404"></a>
+<span class="sourceLineNo">405</span> if (size != 40) {<a
name="line.405"></a>
+<span class="sourceLineNo">406</span> throw new
ImageReadException("Not a Valid ICO File: Wrong bitmap header size " + size);<a
name="line.406"></a>
+<span class="sourceLineNo">407</span> }<a name="line.407"></a>
+<span class="sourceLineNo">408</span> if (planes != 1) {<a
name="line.408"></a>
+<span class="sourceLineNo">409</span> throw new
ImageReadException("Not a Valid ICO File: Planes can't be " + planes);<a
name="line.409"></a>
+<span class="sourceLineNo">410</span> }<a name="line.410"></a>
+<span class="sourceLineNo">411</span><a name="line.411"></a>
+<span class="sourceLineNo">412</span> if (compression == 0 &&
bitCount == 32) {<a name="line.412"></a>
+<span class="sourceLineNo">413</span> // 32 BPP RGB icons need an
alpha channel, but BMP files don't have<a name="line.413"></a>
+<span class="sourceLineNo">414</span> // one unless BI_BITFIELDS is
used...<a name="line.414"></a>
+<span class="sourceLineNo">415</span> compression = 3;<a
name="line.415"></a>
+<span class="sourceLineNo">416</span> redMask = 0x00ff0000;<a
name="line.416"></a>
+<span class="sourceLineNo">417</span> greenMask = 0x0000ff00;<a
name="line.417"></a>
+<span class="sourceLineNo">418</span> blueMask = 0x000000ff;<a
name="line.418"></a>
+<span class="sourceLineNo">419</span> alphaMask = 0xff000000;<a
name="line.419"></a>
+<span class="sourceLineNo">420</span> }<a name="line.420"></a>
<span class="sourceLineNo">421</span><a name="line.421"></a>
-<span class="sourceLineNo">422</span> final int bitmapPixelsOffset = 14
+ 56 + 4 * ((colorsUsed == 0 && bitCount <= 8) ? (1 <<
bitCount)<a name="line.422"></a>
-<span class="sourceLineNo">423</span> : colorsUsed);<a
name="line.423"></a>
-<span class="sourceLineNo">424</span> final int bitmapSize = 14 + 56 +
restOfFile.length;<a name="line.424"></a>
+<span class="sourceLineNo">422</span> final BitmapHeader header = new
BitmapHeader(size, width, height, planes,<a name="line.422"></a>
+<span class="sourceLineNo">423</span> bitCount, compression,
sizeImage, xPelsPerMeter, yPelsPerMeter,<a name="line.423"></a>
+<span class="sourceLineNo">424</span> colorsUsed,
colorsImportant);<a name="line.424"></a>
<span class="sourceLineNo">425</span><a name="line.425"></a>
-<span class="sourceLineNo">426</span> final ByteArrayOutputStream baos
= new ByteArrayOutputStream(bitmapSize);<a name="line.426"></a>
-<span class="sourceLineNo">427</span> BinaryOutputStream bos = null;<a
name="line.427"></a>
-<span class="sourceLineNo">428</span> boolean canThrow = false;<a
name="line.428"></a>
-<span class="sourceLineNo">429</span> try {<a name="line.429"></a>
-<span class="sourceLineNo">430</span> bos = new
BinaryOutputStream(baos,<a name="line.430"></a>
-<span class="sourceLineNo">431</span>
ByteOrder.LITTLE_ENDIAN);<a name="line.431"></a>
-<span class="sourceLineNo">432</span> <a name="line.432"></a>
-<span class="sourceLineNo">433</span> bos.write('B');<a
name="line.433"></a>
-<span class="sourceLineNo">434</span> bos.write('M');<a
name="line.434"></a>
-<span class="sourceLineNo">435</span>
bos.write4Bytes(bitmapSize);<a name="line.435"></a>
-<span class="sourceLineNo">436</span> bos.write4Bytes(0);<a
name="line.436"></a>
-<span class="sourceLineNo">437</span>
bos.write4Bytes(bitmapPixelsOffset);<a name="line.437"></a>
-<span class="sourceLineNo">438</span> <a name="line.438"></a>
-<span class="sourceLineNo">439</span> bos.write4Bytes(56);<a
name="line.439"></a>
-<span class="sourceLineNo">440</span> bos.write4Bytes(width);<a
name="line.440"></a>
-<span class="sourceLineNo">441</span> bos.write4Bytes(height /
2);<a name="line.441"></a>
-<span class="sourceLineNo">442</span> bos.write2Bytes(planes);<a
name="line.442"></a>
-<span class="sourceLineNo">443</span> bos.write2Bytes(bitCount);<a
name="line.443"></a>
-<span class="sourceLineNo">444</span>
bos.write4Bytes(compression);<a name="line.444"></a>
-<span class="sourceLineNo">445</span> bos.write4Bytes(sizeImage);<a
name="line.445"></a>
-<span class="sourceLineNo">446</span>
bos.write4Bytes(xPelsPerMeter);<a name="line.446"></a>
-<span class="sourceLineNo">447</span>
bos.write4Bytes(yPelsPerMeter);<a name="line.447"></a>
-<span class="sourceLineNo">448</span>
bos.write4Bytes(colorsUsed);<a name="line.448"></a>
-<span class="sourceLineNo">449</span>
bos.write4Bytes(colorsImportant);<a name="line.449"></a>
-<span class="sourceLineNo">450</span> bos.write4Bytes(redMask);<a
name="line.450"></a>
-<span class="sourceLineNo">451</span> bos.write4Bytes(greenMask);<a
name="line.451"></a>
-<span class="sourceLineNo">452</span> bos.write4Bytes(blueMask);<a
name="line.452"></a>
-<span class="sourceLineNo">453</span> bos.write4Bytes(alphaMask);<a
name="line.453"></a>
-<span class="sourceLineNo">454</span> bos.write(restOfFile);<a
name="line.454"></a>
-<span class="sourceLineNo">455</span> bos.flush();<a
name="line.455"></a>
-<span class="sourceLineNo">456</span> canThrow = true;<a
name="line.456"></a>
-<span class="sourceLineNo">457</span> } finally {<a name="line.457"></a>
-<span class="sourceLineNo">458</span>
IoUtils.closeQuietly(canThrow, bos);<a name="line.458"></a>
-<span class="sourceLineNo">459</span> }<a name="line.459"></a>
-<span class="sourceLineNo">460</span><a name="line.460"></a>
-<span class="sourceLineNo">461</span> final ByteArrayInputStream
bmpInputStream = new ByteArrayInputStream(baos.toByteArray());<a
name="line.461"></a>
-<span class="sourceLineNo">462</span> final BufferedImage bmpImage =
new BmpImageParser().getBufferedImage(bmpInputStream, null);<a
name="line.462"></a>
-<span class="sourceLineNo">463</span><a name="line.463"></a>
-<span class="sourceLineNo">464</span> // Transparency map is optional
with 32 BPP icons, because they already<a name="line.464"></a>
-<span class="sourceLineNo">465</span> // have<a name="line.465"></a>
-<span class="sourceLineNo">466</span> // an alpha channel, and Windows
only uses the transparency map when it<a name="line.466"></a>
-<span class="sourceLineNo">467</span> // has to<a name="line.467"></a>
-<span class="sourceLineNo">468</span> // display the icon on a < 32
BPP screen. But it's still used instead of<a name="line.468"></a>
-<span class="sourceLineNo">469</span> // alpha<a name="line.469"></a>
-<span class="sourceLineNo">470</span> // if the image would be
completely transparent with alpha...<a name="line.470"></a>
-<span class="sourceLineNo">471</span> int t_scanline_size = (width + 7)
/ 8;<a name="line.471"></a>
-<span class="sourceLineNo">472</span> if ((t_scanline_size % 4) != 0)
{<a name="line.472"></a>
-<span class="sourceLineNo">473</span> t_scanline_size += 4 -
(t_scanline_size % 4); // pad scanline to 4<a name="line.473"></a>
-<span class="sourceLineNo">474</span>
// byte size.<a name="line.474"></a>
-<span class="sourceLineNo">475</span> }<a name="line.475"></a>
-<span class="sourceLineNo">476</span> final int colorMapSizeBytes =
t_scanline_size * (height / 2);<a name="line.476"></a>
-<span class="sourceLineNo">477</span> byte[] transparencyMap = null;<a
name="line.477"></a>
-<span class="sourceLineNo">478</span> try {<a name="line.478"></a>
-<span class="sourceLineNo">479</span> transparencyMap =
readBytes("transparency_map",<a name="line.479"></a>
-<span class="sourceLineNo">480</span> bmpInputStream,
colorMapSizeBytes,<a name="line.480"></a>
-<span class="sourceLineNo">481</span> "Not a Valid ICO
File");<a name="line.481"></a>
-<span class="sourceLineNo">482</span> } catch (final IOException ioEx)
{<a name="line.482"></a>
-<span class="sourceLineNo">483</span> if (bitCount != 32) {<a
name="line.483"></a>
-<span class="sourceLineNo">484</span> throw ioEx;<a
name="line.484"></a>
-<span class="sourceLineNo">485</span> }<a name="line.485"></a>
-<span class="sourceLineNo">486</span> }<a name="line.486"></a>
-<span class="sourceLineNo">487</span><a name="line.487"></a>
-<span class="sourceLineNo">488</span> boolean allAlphasZero = true;<a
name="line.488"></a>
-<span class="sourceLineNo">489</span> if (bitCount == 32) {<a
name="line.489"></a>
-<span class="sourceLineNo">490</span> for (int y = 0; allAlphasZero
&& y < bmpImage.getHeight(); y++) {<a name="line.490"></a>
-<span class="sourceLineNo">491</span> for (int x = 0; x <
bmpImage.getWidth(); x++) {<a name="line.491"></a>
-<span class="sourceLineNo">492</span> if
((bmpImage.getRGB(x, y) & 0xff000000) != 0) {<a name="line.492"></a>
-<span class="sourceLineNo">493</span> allAlphasZero =
false;<a name="line.493"></a>
-<span class="sourceLineNo">494</span> break;<a
name="line.494"></a>
-<span class="sourceLineNo">495</span> }<a
name="line.495"></a>
-<span class="sourceLineNo">496</span> }<a name="line.496"></a>
-<span class="sourceLineNo">497</span> }<a name="line.497"></a>
-<span class="sourceLineNo">498</span> }<a name="line.498"></a>
-<span class="sourceLineNo">499</span> BufferedImage resultImage;<a
name="line.499"></a>
-<span class="sourceLineNo">500</span> if (allAlphasZero) {<a
name="line.500"></a>
-<span class="sourceLineNo">501</span> resultImage = new
BufferedImage(bmpImage.getWidth(),<a name="line.501"></a>
-<span class="sourceLineNo">502</span> bmpImage.getHeight(),
BufferedImage.TYPE_INT_ARGB);<a name="line.502"></a>
-<span class="sourceLineNo">503</span> for (int y = 0; y <
resultImage.getHeight(); y++) {<a name="line.503"></a>
-<span class="sourceLineNo">504</span> for (int x = 0; x <
resultImage.getWidth(); x++) {<a name="line.504"></a>
-<span class="sourceLineNo">505</span> int alpha = 0xff;<a
name="line.505"></a>
-<span class="sourceLineNo">506</span> if (transparencyMap
!= null) {<a name="line.506"></a>
-<span class="sourceLineNo">507</span> final int
alphaByte = 0xff & transparencyMap[t_scanline_size<a name="line.507"></a>
-<span class="sourceLineNo">508</span> *
(bmpImage.getHeight() - y - 1) + (x / 8)];<a name="line.508"></a>
-<span class="sourceLineNo">509</span> alpha = 0x01
& (alphaByte >> (7 - (x % 8)));<a name="line.509"></a>
-<span class="sourceLineNo">510</span> alpha = (alpha ==
0) ? 0xff : 0x00;<a name="line.510"></a>
-<span class="sourceLineNo">511</span> }<a
name="line.511"></a>
-<span class="sourceLineNo">512</span> resultImage.setRGB(x,
y, (alpha << 24)<a name="line.512"></a>
-<span class="sourceLineNo">513</span> | (0xffffff
& bmpImage.getRGB(x, y)));<a name="line.513"></a>
-<span class="sourceLineNo">514</span> }<a name="line.514"></a>
-<span class="sourceLineNo">515</span> }<a name="line.515"></a>
-<span class="sourceLineNo">516</span> } else {<a name="line.516"></a>
-<span class="sourceLineNo">517</span> resultImage = bmpImage;<a
name="line.517"></a>
-<span class="sourceLineNo">518</span> }<a name="line.518"></a>
-<span class="sourceLineNo">519</span> return new
BitmapIconData(fIconInfo, header, resultImage);<a name="line.519"></a>
-<span class="sourceLineNo">520</span> }<a name="line.520"></a>
-<span class="sourceLineNo">521</span><a name="line.521"></a>
-<span class="sourceLineNo">522</span> private IconData readIconData(final
byte[] iconData, final IconInfo fIconInfo)<a name="line.522"></a>
-<span class="sourceLineNo">523</span> throws ImageReadException,
IOException {<a name="line.523"></a>
-<span class="sourceLineNo">524</span> final ImageFormat imageFormat =
Imaging.guessFormat(iconData);<a name="line.524"></a>
-<span class="sourceLineNo">525</span> if
(imageFormat.equals(ImageFormats.PNG)) {<a name="line.525"></a>
-<span class="sourceLineNo">526</span> final BufferedImage
bufferedImage = Imaging.getBufferedImage(iconData);<a name="line.526"></a>
-<span class="sourceLineNo">527</span> return new
PNGIconData(fIconInfo, bufferedImage);<a name="line.527"></a>
-<span class="sourceLineNo">528</span> }<a name="line.528"></a>
-<span class="sourceLineNo">529</span> return
readBitmapIconData(iconData, fIconInfo);<a name="line.529"></a>
-<span class="sourceLineNo">530</span> }<a name="line.530"></a>
-<span class="sourceLineNo">531</span><a name="line.531"></a>
-<span class="sourceLineNo">532</span> private static class ImageContents
{<a name="line.532"></a>
-<span class="sourceLineNo">533</span> public final FileHeader
fileHeader;<a name="line.533"></a>
-<span class="sourceLineNo">534</span> public final IconData[]
iconDatas;<a name="line.534"></a>
+<span class="sourceLineNo">426</span> final int bitmapPixelsOffset = 14
+ 56 + 4 * ((colorsUsed == 0 && bitCount <= 8) ? (1 <<
bitCount)<a name="line.426"></a>
+<span class="sourceLineNo">427</span> : colorsUsed);<a
name="line.427"></a>
+<span class="sourceLineNo">428</span> final int bitmapSize = 14 + 56 +
restOfFile.length;<a name="line.428"></a>
+<span class="sourceLineNo">429</span><a name="line.429"></a>
+<span class="sourceLineNo">430</span> final ByteArrayOutputStream baos
= new ByteArrayOutputStream(bitmapSize);<a name="line.430"></a>
+<span class="sourceLineNo">431</span> BinaryOutputStream bos = null;<a
name="line.431"></a>
+<span class="sourceLineNo">432</span> boolean canThrow = false;<a
name="line.432"></a>
+<span class="sourceLineNo">433</span> try {<a name="line.433"></a>
+<span class="sourceLineNo">434</span> bos = new
BinaryOutputStream(baos,<a name="line.434"></a>
+<span class="sourceLineNo">435</span>
ByteOrder.LITTLE_ENDIAN);<a name="line.435"></a>
+<span class="sourceLineNo">436</span> <a name="line.436"></a>
+<span class="sourceLineNo">437</span> bos.write('B');<a
name="line.437"></a>
+<span class="sourceLineNo">438</span> bos.write('M');<a
name="line.438"></a>
+<span class="sourceLineNo">439</span>
bos.write4Bytes(bitmapSize);<a name="line.439"></a>
+<span class="sourceLineNo">440</span> bos.write4Bytes(0);<a
name="line.440"></a>
+<span class="sourceLineNo">441</span>
bos.write4Bytes(bitmapPixelsOffset);<a name="line.441"></a>
+<span class="sourceLineNo">442</span> <a name="line.442"></a>
+<span class="sourceLineNo">443</span> bos.write4Bytes(56);<a
name="line.443"></a>
+<span class="sourceLineNo">444</span> bos.write4Bytes(width);<a
name="line.444"></a>
+<span class="sourceLineNo">445</span> bos.write4Bytes(height /
2);<a name="line.445"></a>
+<span class="sourceLineNo">446</span> bos.write2Bytes(planes);<a
name="line.446"></a>
+<span class="sourceLineNo">447</span> bos.write2Bytes(bitCount);<a
name="line.447"></a>
+<span class="sourceLineNo">448</span>
bos.write4Bytes(compression);<a name="line.448"></a>
+<span class="sourceLineNo">449</span> bos.write4Bytes(sizeImage);<a
name="line.449"></a>
+<span class="sourceLineNo">450</span>
bos.write4Bytes(xPelsPerMeter);<a name="line.450"></a>
+<span class="sourceLineNo">451</span>
bos.write4Bytes(yPelsPerMeter);<a name="line.451"></a>
+<span class="sourceLineNo">452</span>
bos.write4Bytes(colorsUsed);<a name="line.452"></a>
+<span class="sourceLineNo">453</span>
bos.write4Bytes(colorsImportant);<a name="line.453"></a>
[... 675 lines stripped ...]
