commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brit...@apache.org
Subject svn commit: r935812 [37/46] - in /websites/production/commons/content/proper/commons-imaging: ./ apidocs/ apidocs/org/apache/commons/imaging/ apidocs/org/apache/commons/imaging/class-use/ apidocs/org/apache/commons/imaging/color/ apidocs/org/apache/com...
Date Sun, 11 Jan 2015 12:33:28 GMT
Modified: websites/production/commons/content/proper/commons-imaging/xref/org/apache/commons/imaging/formats/ico/IcoImageParser.html
==============================================================================
--- websites/production/commons/content/proper/commons-imaging/xref/org/apache/commons/imaging/formats/ico/IcoImageParser.html (original)
+++ websites/production/commons/content/proper/commons-imaging/xref/org/apache/commons/imaging/formats/ico/IcoImageParser.html Sun Jan 11 12:33:25 2015
@@ -86,757 +86,761 @@
 <a class="jxr_linenumber" name="L78" href="#L78">78</a>          };
 <a class="jxr_linenumber" name="L79" href="#L79">79</a>      }
 <a class="jxr_linenumber" name="L80" href="#L80">80</a>  
-<a class="jxr_linenumber" name="L81" href="#L81">81</a>      @Override
-<a class="jxr_linenumber" name="L82" href="#L82">82</a>      <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/imaging/common/ImageMetadata.html">ImageMetadata</a> getMetadata(<strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/commons/imaging/common/bytesource/ByteSource.html">ByteSource</a> byteSource, <strong class="jxr_keyword">final</strong> Map&lt;String, Object&gt; params)
-<a class="jxr_linenumber" name="L83" href="#L83">83</a>              <strong class="jxr_keyword">throws</strong> ImageReadException, IOException {
-<a class="jxr_linenumber" name="L84" href="#L84">84</a>          <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L85" href="#L85">85</a>      }
-<a class="jxr_linenumber" name="L86" href="#L86">86</a>  
-<a class="jxr_linenumber" name="L87" href="#L87">87</a>      @Override
-<a class="jxr_linenumber" name="L88" href="#L88">88</a>      <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/imaging/ImageInfo.html">ImageInfo</a> getImageInfo(<strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/commons/imaging/common/bytesource/ByteSource.html">ByteSource</a> byteSource, <strong class="jxr_keyword">final</strong> Map&lt;String, Object&gt; params)
-<a class="jxr_linenumber" name="L89" href="#L89">89</a>              <strong class="jxr_keyword">throws</strong> ImageReadException, IOException {
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>          <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L91" href="#L91">91</a>      }
-<a class="jxr_linenumber" name="L92" href="#L92">92</a>  
-<a class="jxr_linenumber" name="L93" href="#L93">93</a>      @Override
-<a class="jxr_linenumber" name="L94" href="#L94">94</a>      <strong class="jxr_keyword">public</strong> Dimension getImageSize(<strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/commons/imaging/common/bytesource/ByteSource.html">ByteSource</a> byteSource, <strong class="jxr_keyword">final</strong> Map&lt;String, Object&gt; params)
-<a class="jxr_linenumber" name="L95" href="#L95">95</a>              <strong class="jxr_keyword">throws</strong> ImageReadException, IOException {
-<a class="jxr_linenumber" name="L96" href="#L96">96</a>          <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L97" href="#L97">97</a>      }
-<a class="jxr_linenumber" name="L98" href="#L98">98</a>  
-<a class="jxr_linenumber" name="L99" href="#L99">99</a>      @Override
-<a class="jxr_linenumber" name="L100" href="#L100">100</a>     <strong class="jxr_keyword">public</strong> byte[] getICCProfileBytes(<strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/commons/imaging/common/bytesource/ByteSource.html">ByteSource</a> byteSource, <strong class="jxr_keyword">final</strong> Map&lt;String, Object&gt; params)
-<a class="jxr_linenumber" name="L101" href="#L101">101</a>             <strong class="jxr_keyword">throws</strong> ImageReadException, IOException {
-<a class="jxr_linenumber" name="L102" href="#L102">102</a>         <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L103" href="#L103">103</a>     }
-<a class="jxr_linenumber" name="L104" href="#L104">104</a> 
-<a class="jxr_linenumber" name="L105" href="#L105">105</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">FileHeader</a> {
-<a class="jxr_linenumber" name="L106" href="#L106">106</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> reserved; <em class="jxr_comment">// Reserved (2 bytes), always 0</em>
-<a class="jxr_linenumber" name="L107" href="#L107">107</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> iconType; <em class="jxr_comment">// IconType (2 bytes), if the image is an</em>
-<a class="jxr_linenumber" name="L108" href="#L108">108</a>                                    <em class="jxr_comment">// icon it?s 1, for cursors the value is 2.</em>
-<a class="jxr_linenumber" name="L109" href="#L109">109</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> iconCount; <em class="jxr_comment">// IconCount (2 bytes), number of icons in</em>
-<a class="jxr_linenumber" name="L110" href="#L110">110</a>                                     <em class="jxr_comment">// this file.</em>
-<a class="jxr_linenumber" name="L111" href="#L111">111</a> 
-<a class="jxr_linenumber" name="L112" href="#L112">112</a>         <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">FileHeader</a>(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> reserved, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> iconType, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> iconCount) {
-<a class="jxr_linenumber" name="L113" href="#L113">113</a>             <strong class="jxr_keyword">this</strong>.reserved = reserved;
-<a class="jxr_linenumber" name="L114" href="#L114">114</a>             <strong class="jxr_keyword">this</strong>.iconType = iconType;
-<a class="jxr_linenumber" name="L115" href="#L115">115</a>             <strong class="jxr_keyword">this</strong>.iconCount = iconCount;
-<a class="jxr_linenumber" name="L116" href="#L116">116</a>         }
-<a class="jxr_linenumber" name="L117" href="#L117">117</a> 
-<a class="jxr_linenumber" name="L118" href="#L118">118</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> dump(<strong class="jxr_keyword">final</strong> PrintWriter pw) {
-<a class="jxr_linenumber" name="L119" href="#L119">119</a>             pw.println(<span class="jxr_string">"FileHeader"</span>);
-<a class="jxr_linenumber" name="L120" href="#L120">120</a>             pw.println(<span class="jxr_string">"Reserved: "</span> + reserved);
-<a class="jxr_linenumber" name="L121" href="#L121">121</a>             pw.println(<span class="jxr_string">"IconType: "</span> + iconType);
-<a class="jxr_linenumber" name="L122" href="#L122">122</a>             pw.println(<span class="jxr_string">"IconCount: "</span> + iconCount);
-<a class="jxr_linenumber" name="L123" href="#L123">123</a>             pw.println();
-<a class="jxr_linenumber" name="L124" href="#L124">124</a>         }
-<a class="jxr_linenumber" name="L125" href="#L125">125</a>     }
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> 
-<a class="jxr_linenumber" name="L127" href="#L127">127</a>     <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">FileHeader</a> readFileHeader(<strong class="jxr_keyword">final</strong> InputStream is) <strong class="jxr_keyword">throws</strong> ImageReadException, IOException {
-<a class="jxr_linenumber" name="L128" href="#L128">128</a>         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> reserved = read2Bytes(<span class="jxr_string">"Reserved"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>, getByteOrder());
-<a class="jxr_linenumber" name="L129" href="#L129">129</a>         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> iconType = read2Bytes(<span class="jxr_string">"IconType"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>, getByteOrder());
-<a class="jxr_linenumber" name="L130" href="#L130">130</a>         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> iconCount = read2Bytes(<span class="jxr_string">"IconCount"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>, getByteOrder());
-<a class="jxr_linenumber" name="L131" href="#L131">131</a> 
-<a class="jxr_linenumber" name="L132" href="#L132">132</a>         <strong class="jxr_keyword">if</strong> (reserved != 0) {
-<a class="jxr_linenumber" name="L133" href="#L133">133</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/imaging/ImageReadException.html">ImageReadException</a>(<span class="jxr_string">"Not a Valid ICO File: reserved is "</span> + reserved);
-<a class="jxr_linenumber" name="L134" href="#L134">134</a>         }
-<a class="jxr_linenumber" name="L135" href="#L135">135</a>         <strong class="jxr_keyword">if</strong> (iconType != 1 &amp;&amp; iconType != 2) {
-<a class="jxr_linenumber" name="L136" href="#L136">136</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/imaging/ImageReadException.html">ImageReadException</a>(<span class="jxr_string">"Not a Valid ICO File: icon type is "</span> + iconType);
-<a class="jxr_linenumber" name="L137" href="#L137">137</a>         }
-<a class="jxr_linenumber" name="L138" href="#L138">138</a> 
-<a class="jxr_linenumber" name="L139" href="#L139">139</a>         <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">FileHeader</a>(reserved, iconType, iconCount);
-<a class="jxr_linenumber" name="L140" href="#L140">140</a> 
-<a class="jxr_linenumber" name="L141" href="#L141">141</a>     }
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>      <em class="jxr_comment">// TODO should throw UOE</em>
+<a class="jxr_linenumber" name="L82" href="#L82">82</a>      @Override
+<a class="jxr_linenumber" name="L83" href="#L83">83</a>      <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/imaging/common/ImageMetadata.html">ImageMetadata</a> getMetadata(<strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/commons/imaging/common/bytesource/ByteSource.html">ByteSource</a> byteSource, <strong class="jxr_keyword">final</strong> Map&lt;String, Object&gt; params)
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>              <strong class="jxr_keyword">throws</strong> ImageReadException, IOException {
+<a class="jxr_linenumber" name="L85" href="#L85">85</a>          <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L86" href="#L86">86</a>      }
+<a class="jxr_linenumber" name="L87" href="#L87">87</a>  
+<a class="jxr_linenumber" name="L88" href="#L88">88</a>      <em class="jxr_comment">// TODO should throw UOE</em>
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>      @Override
+<a class="jxr_linenumber" name="L90" href="#L90">90</a>      <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/imaging/ImageInfo.html">ImageInfo</a> getImageInfo(<strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/commons/imaging/common/bytesource/ByteSource.html">ByteSource</a> byteSource, <strong class="jxr_keyword">final</strong> Map&lt;String, Object&gt; params)
+<a class="jxr_linenumber" name="L91" href="#L91">91</a>              <strong class="jxr_keyword">throws</strong> ImageReadException, IOException {
+<a class="jxr_linenumber" name="L92" href="#L92">92</a>          <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L93" href="#L93">93</a>      }
+<a class="jxr_linenumber" name="L94" href="#L94">94</a>  
+<a class="jxr_linenumber" name="L95" href="#L95">95</a>      <em class="jxr_comment">// TODO should throw UOE</em>
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>      @Override
+<a class="jxr_linenumber" name="L97" href="#L97">97</a>      <strong class="jxr_keyword">public</strong> Dimension getImageSize(<strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/commons/imaging/common/bytesource/ByteSource.html">ByteSource</a> byteSource, <strong class="jxr_keyword">final</strong> Map&lt;String, Object&gt; params)
+<a class="jxr_linenumber" name="L98" href="#L98">98</a>              <strong class="jxr_keyword">throws</strong> ImageReadException, IOException {
+<a class="jxr_linenumber" name="L99" href="#L99">99</a>          <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L100" href="#L100">100</a>     }
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> 
+<a class="jxr_linenumber" name="L102" href="#L102">102</a>     <em class="jxr_comment">// TODO should throw UOE</em>
+<a class="jxr_linenumber" name="L103" href="#L103">103</a>     @Override
+<a class="jxr_linenumber" name="L104" href="#L104">104</a>     <strong class="jxr_keyword">public</strong> byte[] getICCProfileBytes(<strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/commons/imaging/common/bytesource/ByteSource.html">ByteSource</a> byteSource, <strong class="jxr_keyword">final</strong> Map&lt;String, Object&gt; params)
+<a class="jxr_linenumber" name="L105" href="#L105">105</a>             <strong class="jxr_keyword">throws</strong> ImageReadException, IOException {
+<a class="jxr_linenumber" name="L106" href="#L106">106</a>         <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L107" href="#L107">107</a>     }
+<a class="jxr_linenumber" name="L108" href="#L108">108</a> 
+<a class="jxr_linenumber" name="L109" href="#L109">109</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">FileHeader</a> {
+<a class="jxr_linenumber" name="L110" href="#L110">110</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> reserved; <em class="jxr_comment">// Reserved (2 bytes), always 0</em>
+<a class="jxr_linenumber" name="L111" href="#L111">111</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> iconType; <em class="jxr_comment">// IconType (2 bytes), if the image is an</em>
+<a class="jxr_linenumber" name="L112" href="#L112">112</a>                                    <em class="jxr_comment">// icon it?s 1, for cursors the value is 2.</em>
+<a class="jxr_linenumber" name="L113" href="#L113">113</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> iconCount; <em class="jxr_comment">// IconCount (2 bytes), number of icons in</em>
+<a class="jxr_linenumber" name="L114" href="#L114">114</a>                                     <em class="jxr_comment">// this file.</em>
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> 
+<a class="jxr_linenumber" name="L116" href="#L116">116</a>         <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">FileHeader</a>(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> reserved, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> iconType, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> iconCount) {
+<a class="jxr_linenumber" name="L117" href="#L117">117</a>             <strong class="jxr_keyword">this</strong>.reserved = reserved;
+<a class="jxr_linenumber" name="L118" href="#L118">118</a>             <strong class="jxr_keyword">this</strong>.iconType = iconType;
+<a class="jxr_linenumber" name="L119" href="#L119">119</a>             <strong class="jxr_keyword">this</strong>.iconCount = iconCount;
+<a class="jxr_linenumber" name="L120" href="#L120">120</a>         }
+<a class="jxr_linenumber" name="L121" href="#L121">121</a> 
+<a class="jxr_linenumber" name="L122" href="#L122">122</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> dump(<strong class="jxr_keyword">final</strong> PrintWriter pw) {
+<a class="jxr_linenumber" name="L123" href="#L123">123</a>             pw.println(<span class="jxr_string">"FileHeader"</span>);
+<a class="jxr_linenumber" name="L124" href="#L124">124</a>             pw.println(<span class="jxr_string">"Reserved: "</span> + reserved);
+<a class="jxr_linenumber" name="L125" href="#L125">125</a>             pw.println(<span class="jxr_string">"IconType: "</span> + iconType);
+<a class="jxr_linenumber" name="L126" href="#L126">126</a>             pw.println(<span class="jxr_string">"IconCount: "</span> + iconCount);
+<a class="jxr_linenumber" name="L127" href="#L127">127</a>             pw.println();
+<a class="jxr_linenumber" name="L128" href="#L128">128</a>         }
+<a class="jxr_linenumber" name="L129" href="#L129">129</a>     }
+<a class="jxr_linenumber" name="L130" href="#L130">130</a> 
+<a class="jxr_linenumber" name="L131" href="#L131">131</a>     <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">FileHeader</a> readFileHeader(<strong class="jxr_keyword">final</strong> InputStream is) <strong class="jxr_keyword">throws</strong> ImageReadException, IOException {
+<a class="jxr_linenumber" name="L132" href="#L132">132</a>         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> reserved = read2Bytes(<span class="jxr_string">"Reserved"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>, getByteOrder());
+<a class="jxr_linenumber" name="L133" href="#L133">133</a>         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> iconType = read2Bytes(<span class="jxr_string">"IconType"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>, getByteOrder());
+<a class="jxr_linenumber" name="L134" href="#L134">134</a>         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> iconCount = read2Bytes(<span class="jxr_string">"IconCount"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>, getByteOrder());
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> 
+<a class="jxr_linenumber" name="L136" href="#L136">136</a>         <strong class="jxr_keyword">if</strong> (reserved != 0) {
+<a class="jxr_linenumber" name="L137" href="#L137">137</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/imaging/ImageReadException.html">ImageReadException</a>(<span class="jxr_string">"Not a Valid ICO File: reserved is "</span> + reserved);
+<a class="jxr_linenumber" name="L138" href="#L138">138</a>         }
+<a class="jxr_linenumber" name="L139" href="#L139">139</a>         <strong class="jxr_keyword">if</strong> (iconType != 1 &amp;&amp; iconType != 2) {
+<a class="jxr_linenumber" name="L140" href="#L140">140</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/imaging/ImageReadException.html">ImageReadException</a>(<span class="jxr_string">"Not a Valid ICO File: icon type is "</span> + iconType);
+<a class="jxr_linenumber" name="L141" href="#L141">141</a>         }
 <a class="jxr_linenumber" name="L142" href="#L142">142</a> 
-<a class="jxr_linenumber" name="L143" href="#L143">143</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">IconInfo</a> {
-<a class="jxr_linenumber" name="L144" href="#L144">144</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> byte width;
-<a class="jxr_linenumber" name="L145" href="#L145">145</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> byte height;
-<a class="jxr_linenumber" name="L146" href="#L146">146</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> byte colorCount;
-<a class="jxr_linenumber" name="L147" href="#L147">147</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> byte reserved;
-<a class="jxr_linenumber" name="L148" href="#L148">148</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> planes;
-<a class="jxr_linenumber" name="L149" href="#L149">149</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> bitCount;
-<a class="jxr_linenumber" name="L150" href="#L150">150</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> imageSize;
-<a class="jxr_linenumber" name="L151" href="#L151">151</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> imageOffset;
-<a class="jxr_linenumber" name="L152" href="#L152">152</a> 
-<a class="jxr_linenumber" name="L153" href="#L153">153</a>         <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">IconInfo</a>(<strong class="jxr_keyword">final</strong> byte width, <strong class="jxr_keyword">final</strong> byte height,
-<a class="jxr_linenumber" name="L154" href="#L154">154</a>                 <strong class="jxr_keyword">final</strong> byte colorCount, <strong class="jxr_keyword">final</strong> byte reserved, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> planes,
-<a class="jxr_linenumber" name="L155" href="#L155">155</a>                 <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> bitCount, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> imageSize, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> imageOffset) {
-<a class="jxr_linenumber" name="L156" href="#L156">156</a>             <strong class="jxr_keyword">this</strong>.width = width;
-<a class="jxr_linenumber" name="L157" href="#L157">157</a>             <strong class="jxr_keyword">this</strong>.height = height;
-<a class="jxr_linenumber" name="L158" href="#L158">158</a>             <strong class="jxr_keyword">this</strong>.colorCount = colorCount;
-<a class="jxr_linenumber" name="L159" href="#L159">159</a>             <strong class="jxr_keyword">this</strong>.reserved = reserved;
-<a class="jxr_linenumber" name="L160" href="#L160">160</a>             <strong class="jxr_keyword">this</strong>.planes = planes;
-<a class="jxr_linenumber" name="L161" href="#L161">161</a>             <strong class="jxr_keyword">this</strong>.bitCount = bitCount;
-<a class="jxr_linenumber" name="L162" href="#L162">162</a>             <strong class="jxr_keyword">this</strong>.imageSize = imageSize;
-<a class="jxr_linenumber" name="L163" href="#L163">163</a>             <strong class="jxr_keyword">this</strong>.imageOffset = imageOffset;
-<a class="jxr_linenumber" name="L164" href="#L164">164</a>         }
-<a class="jxr_linenumber" name="L165" href="#L165">165</a> 
-<a class="jxr_linenumber" name="L166" href="#L166">166</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> dump(<strong class="jxr_keyword">final</strong> PrintWriter pw) {
-<a class="jxr_linenumber" name="L167" href="#L167">167</a>             pw.println(<span class="jxr_string">"IconInfo"</span>);
-<a class="jxr_linenumber" name="L168" href="#L168">168</a>             pw.println(<span class="jxr_string">"Width: "</span> + width);
-<a class="jxr_linenumber" name="L169" href="#L169">169</a>             pw.println(<span class="jxr_string">"Height: "</span> + height);
-<a class="jxr_linenumber" name="L170" href="#L170">170</a>             pw.println(<span class="jxr_string">"ColorCount: "</span> + colorCount);
-<a class="jxr_linenumber" name="L171" href="#L171">171</a>             pw.println(<span class="jxr_string">"Reserved: "</span> + reserved);
-<a class="jxr_linenumber" name="L172" href="#L172">172</a>             pw.println(<span class="jxr_string">"Planes: "</span> + planes);
-<a class="jxr_linenumber" name="L173" href="#L173">173</a>             pw.println(<span class="jxr_string">"BitCount: "</span> + bitCount);
-<a class="jxr_linenumber" name="L174" href="#L174">174</a>             pw.println(<span class="jxr_string">"ImageSize: "</span> + imageSize);
-<a class="jxr_linenumber" name="L175" href="#L175">175</a>             pw.println(<span class="jxr_string">"ImageOffset: "</span> + imageOffset);
-<a class="jxr_linenumber" name="L176" href="#L176">176</a>         }
-<a class="jxr_linenumber" name="L177" href="#L177">177</a>     }
-<a class="jxr_linenumber" name="L178" href="#L178">178</a> 
-<a class="jxr_linenumber" name="L179" href="#L179">179</a>     <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">IconInfo</a> readIconInfo(<strong class="jxr_keyword">final</strong> InputStream is) <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="L180" href="#L180">180</a>         <em class="jxr_comment">// Width (1 byte), Width of Icon (1 to 255)</em>
-<a class="jxr_linenumber" name="L181" href="#L181">181</a>         <strong class="jxr_keyword">final</strong> byte width = readByte(<span class="jxr_string">"Width"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>);
-<a class="jxr_linenumber" name="L182" href="#L182">182</a>         <em class="jxr_comment">// Height (1 byte), Height of Icon (1 to 255)</em>
-<a class="jxr_linenumber" name="L183" href="#L183">183</a>         <strong class="jxr_keyword">final</strong> byte height = readByte(<span class="jxr_string">"Height"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>);
-<a class="jxr_linenumber" name="L184" href="#L184">184</a>         <em class="jxr_comment">// ColorCount (1 byte), Number of colors, either</em>
-<a class="jxr_linenumber" name="L185" href="#L185">185</a>         <em class="jxr_comment">// 0 for 24 bit or higher,</em>
-<a class="jxr_linenumber" name="L186" href="#L186">186</a>         <em class="jxr_comment">// 2 for monochrome or 16 for 16 color images.</em>
-<a class="jxr_linenumber" name="L187" href="#L187">187</a>         <strong class="jxr_keyword">final</strong> byte colorCount = readByte(<span class="jxr_string">"ColorCount"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>);
-<a class="jxr_linenumber" name="L188" href="#L188">188</a>         <em class="jxr_comment">// Reserved (1 byte), Not used (always 0)</em>
-<a class="jxr_linenumber" name="L189" href="#L189">189</a>         <strong class="jxr_keyword">final</strong> byte reserved = readByte(<span class="jxr_string">"Reserved"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>);
-<a class="jxr_linenumber" name="L190" href="#L190">190</a>         <em class="jxr_comment">// Planes (2 bytes), always 1</em>
-<a class="jxr_linenumber" name="L191" href="#L191">191</a>         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> planes = read2Bytes(<span class="jxr_string">"Planes"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>, getByteOrder());
-<a class="jxr_linenumber" name="L192" href="#L192">192</a>         <em class="jxr_comment">// BitCount (2 bytes), number of bits per pixel (1 for monchrome,</em>
-<a class="jxr_linenumber" name="L193" href="#L193">193</a>         <em class="jxr_comment">// 4 for 16 colors, 8 for 256 colors, 24 for true colors,</em>
-<a class="jxr_linenumber" name="L194" href="#L194">194</a>         <em class="jxr_comment">// 32 for true colors + alpha channel)</em>
-<a class="jxr_linenumber" name="L195" href="#L195">195</a>         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> bitCount = read2Bytes(<span class="jxr_string">"BitCount"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>, getByteOrder());
-<a class="jxr_linenumber" name="L196" href="#L196">196</a>         <em class="jxr_comment">// ImageSize (4 bytes), Length of resource in bytes</em>
-<a class="jxr_linenumber" name="L197" href="#L197">197</a>         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> imageSize = read4Bytes(<span class="jxr_string">"ImageSize"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>, getByteOrder());
-<a class="jxr_linenumber" name="L198" href="#L198">198</a>         <em class="jxr_comment">// ImageOffset (4 bytes), start of the image in the file</em>
-<a class="jxr_linenumber" name="L199" href="#L199">199</a>         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> imageOffset = read4Bytes(<span class="jxr_string">"ImageOffset"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>, getByteOrder());
-<a class="jxr_linenumber" name="L200" href="#L200">200</a> 
-<a class="jxr_linenumber" name="L201" href="#L201">201</a>         <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">IconInfo</a>(width, height, colorCount, reserved, planes, bitCount, imageSize, imageOffset);
-<a class="jxr_linenumber" name="L202" href="#L202">202</a>     }
-<a class="jxr_linenumber" name="L203" href="#L203">203</a> 
-<a class="jxr_linenumber" name="L204" href="#L204">204</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">BitmapHeader</a> {
-<a class="jxr_linenumber" name="L205" href="#L205">205</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> size;
-<a class="jxr_linenumber" name="L206" href="#L206">206</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> width;
-<a class="jxr_linenumber" name="L207" href="#L207">207</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> height;
-<a class="jxr_linenumber" name="L208" href="#L208">208</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> planes;
-<a class="jxr_linenumber" name="L209" href="#L209">209</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> bitCount;
-<a class="jxr_linenumber" name="L210" href="#L210">210</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> compression;
-<a class="jxr_linenumber" name="L211" href="#L211">211</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> sizeImage;
-<a class="jxr_linenumber" name="L212" href="#L212">212</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> xPelsPerMeter;
-<a class="jxr_linenumber" name="L213" href="#L213">213</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> yPelsPerMeter;
-<a class="jxr_linenumber" name="L214" href="#L214">214</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> colorsUsed;
-<a class="jxr_linenumber" name="L215" href="#L215">215</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> colorsImportant;
-<a class="jxr_linenumber" name="L216" href="#L216">216</a> 
-<a class="jxr_linenumber" name="L217" href="#L217">217</a>         <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">BitmapHeader</a>(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> size, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> width, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> height,
-<a class="jxr_linenumber" name="L218" href="#L218">218</a>                 <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> planes, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> bitCount, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> compression,
-<a class="jxr_linenumber" name="L219" href="#L219">219</a>                 <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> sizeImage, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> pelsPerMeter,
-<a class="jxr_linenumber" name="L220" href="#L220">220</a>                 <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> pelsPerMeter2, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> colorsUsed,
-<a class="jxr_linenumber" name="L221" href="#L221">221</a>                 <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> colorsImportant) {
-<a class="jxr_linenumber" name="L222" href="#L222">222</a>             <strong class="jxr_keyword">this</strong>.size = size;
-<a class="jxr_linenumber" name="L223" href="#L223">223</a>             <strong class="jxr_keyword">this</strong>.width = width;
-<a class="jxr_linenumber" name="L224" href="#L224">224</a>             <strong class="jxr_keyword">this</strong>.height = height;
-<a class="jxr_linenumber" name="L225" href="#L225">225</a>             <strong class="jxr_keyword">this</strong>.planes = planes;
-<a class="jxr_linenumber" name="L226" href="#L226">226</a>             <strong class="jxr_keyword">this</strong>.bitCount = bitCount;
-<a class="jxr_linenumber" name="L227" href="#L227">227</a>             <strong class="jxr_keyword">this</strong>.compression = compression;
-<a class="jxr_linenumber" name="L228" href="#L228">228</a>             <strong class="jxr_keyword">this</strong>.sizeImage = sizeImage;
-<a class="jxr_linenumber" name="L229" href="#L229">229</a>             xPelsPerMeter = pelsPerMeter;
-<a class="jxr_linenumber" name="L230" href="#L230">230</a>             yPelsPerMeter = pelsPerMeter2;
-<a class="jxr_linenumber" name="L231" href="#L231">231</a>             <strong class="jxr_keyword">this</strong>.colorsUsed = colorsUsed;
-<a class="jxr_linenumber" name="L232" href="#L232">232</a>             <strong class="jxr_keyword">this</strong>.colorsImportant = colorsImportant;
-<a class="jxr_linenumber" name="L233" href="#L233">233</a>         }
-<a class="jxr_linenumber" name="L234" href="#L234">234</a> 
-<a class="jxr_linenumber" name="L235" href="#L235">235</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> dump(<strong class="jxr_keyword">final</strong> PrintWriter pw) {
-<a class="jxr_linenumber" name="L236" href="#L236">236</a>             pw.println(<span class="jxr_string">"BitmapHeader"</span>);
-<a class="jxr_linenumber" name="L237" href="#L237">237</a> 
-<a class="jxr_linenumber" name="L238" href="#L238">238</a>             pw.println(<span class="jxr_string">"Size: "</span> + size);
-<a class="jxr_linenumber" name="L239" href="#L239">239</a>             pw.println(<span class="jxr_string">"Width: "</span> + width);
-<a class="jxr_linenumber" name="L240" href="#L240">240</a>             pw.println(<span class="jxr_string">"Height: "</span> + height);
-<a class="jxr_linenumber" name="L241" href="#L241">241</a>             pw.println(<span class="jxr_string">"Planes: "</span> + planes);
-<a class="jxr_linenumber" name="L242" href="#L242">242</a>             pw.println(<span class="jxr_string">"BitCount: "</span> + bitCount);
-<a class="jxr_linenumber" name="L243" href="#L243">243</a>             pw.println(<span class="jxr_string">"Compression: "</span> + compression);
-<a class="jxr_linenumber" name="L244" href="#L244">244</a>             pw.println(<span class="jxr_string">"SizeImage: "</span> + sizeImage);
-<a class="jxr_linenumber" name="L245" href="#L245">245</a>             pw.println(<span class="jxr_string">"XPelsPerMeter: "</span> + xPelsPerMeter);
-<a class="jxr_linenumber" name="L246" href="#L246">246</a>             pw.println(<span class="jxr_string">"YPelsPerMeter: "</span> + yPelsPerMeter);
-<a class="jxr_linenumber" name="L247" href="#L247">247</a>             pw.println(<span class="jxr_string">"ColorsUsed: "</span> + colorsUsed);
-<a class="jxr_linenumber" name="L248" href="#L248">248</a>             pw.println(<span class="jxr_string">"ColorsImportant: "</span> + colorsImportant);
-<a class="jxr_linenumber" name="L249" href="#L249">249</a>         }
-<a class="jxr_linenumber" name="L250" href="#L250">250</a>     }
-<a class="jxr_linenumber" name="L251" href="#L251">251</a> 
-<a class="jxr_linenumber" name="L252" href="#L252">252</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">abstract</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">IconData</a> {
-<a class="jxr_linenumber" name="L253" href="#L253">253</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">IconInfo</a> iconInfo;
-<a class="jxr_linenumber" name="L254" href="#L254">254</a> 
-<a class="jxr_linenumber" name="L255" href="#L255">255</a>         <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">IconData</a>(<strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">IconInfo</a> iconInfo) {
-<a class="jxr_linenumber" name="L256" href="#L256">256</a>             <strong class="jxr_keyword">this</strong>.iconInfo = iconInfo;
-<a class="jxr_linenumber" name="L257" href="#L257">257</a>         }
+<a class="jxr_linenumber" name="L143" href="#L143">143</a>         <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">FileHeader</a>(reserved, iconType, iconCount);
+<a class="jxr_linenumber" name="L144" href="#L144">144</a> 
+<a class="jxr_linenumber" name="L145" href="#L145">145</a>     }
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> 
+<a class="jxr_linenumber" name="L147" href="#L147">147</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">IconInfo</a> {
+<a class="jxr_linenumber" name="L148" href="#L148">148</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> byte width;
+<a class="jxr_linenumber" name="L149" href="#L149">149</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> byte height;
+<a class="jxr_linenumber" name="L150" href="#L150">150</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> byte colorCount;
+<a class="jxr_linenumber" name="L151" href="#L151">151</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> byte reserved;
+<a class="jxr_linenumber" name="L152" href="#L152">152</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> planes;
+<a class="jxr_linenumber" name="L153" href="#L153">153</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> bitCount;
+<a class="jxr_linenumber" name="L154" href="#L154">154</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> imageSize;
+<a class="jxr_linenumber" name="L155" href="#L155">155</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> imageOffset;
+<a class="jxr_linenumber" name="L156" href="#L156">156</a> 
+<a class="jxr_linenumber" name="L157" href="#L157">157</a>         <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">IconInfo</a>(<strong class="jxr_keyword">final</strong> byte width, <strong class="jxr_keyword">final</strong> byte height,
+<a class="jxr_linenumber" name="L158" href="#L158">158</a>                 <strong class="jxr_keyword">final</strong> byte colorCount, <strong class="jxr_keyword">final</strong> byte reserved, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> planes,
+<a class="jxr_linenumber" name="L159" href="#L159">159</a>                 <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> bitCount, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> imageSize, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> imageOffset) {
+<a class="jxr_linenumber" name="L160" href="#L160">160</a>             <strong class="jxr_keyword">this</strong>.width = width;
+<a class="jxr_linenumber" name="L161" href="#L161">161</a>             <strong class="jxr_keyword">this</strong>.height = height;
+<a class="jxr_linenumber" name="L162" href="#L162">162</a>             <strong class="jxr_keyword">this</strong>.colorCount = colorCount;
+<a class="jxr_linenumber" name="L163" href="#L163">163</a>             <strong class="jxr_keyword">this</strong>.reserved = reserved;
+<a class="jxr_linenumber" name="L164" href="#L164">164</a>             <strong class="jxr_keyword">this</strong>.planes = planes;
+<a class="jxr_linenumber" name="L165" href="#L165">165</a>             <strong class="jxr_keyword">this</strong>.bitCount = bitCount;
+<a class="jxr_linenumber" name="L166" href="#L166">166</a>             <strong class="jxr_keyword">this</strong>.imageSize = imageSize;
+<a class="jxr_linenumber" name="L167" href="#L167">167</a>             <strong class="jxr_keyword">this</strong>.imageOffset = imageOffset;
+<a class="jxr_linenumber" name="L168" href="#L168">168</a>         }
+<a class="jxr_linenumber" name="L169" href="#L169">169</a> 
+<a class="jxr_linenumber" name="L170" href="#L170">170</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> dump(<strong class="jxr_keyword">final</strong> PrintWriter pw) {
+<a class="jxr_linenumber" name="L171" href="#L171">171</a>             pw.println(<span class="jxr_string">"IconInfo"</span>);
+<a class="jxr_linenumber" name="L172" href="#L172">172</a>             pw.println(<span class="jxr_string">"Width: "</span> + width);
+<a class="jxr_linenumber" name="L173" href="#L173">173</a>             pw.println(<span class="jxr_string">"Height: "</span> + height);
+<a class="jxr_linenumber" name="L174" href="#L174">174</a>             pw.println(<span class="jxr_string">"ColorCount: "</span> + colorCount);
+<a class="jxr_linenumber" name="L175" href="#L175">175</a>             pw.println(<span class="jxr_string">"Reserved: "</span> + reserved);
+<a class="jxr_linenumber" name="L176" href="#L176">176</a>             pw.println(<span class="jxr_string">"Planes: "</span> + planes);
+<a class="jxr_linenumber" name="L177" href="#L177">177</a>             pw.println(<span class="jxr_string">"BitCount: "</span> + bitCount);
+<a class="jxr_linenumber" name="L178" href="#L178">178</a>             pw.println(<span class="jxr_string">"ImageSize: "</span> + imageSize);
+<a class="jxr_linenumber" name="L179" href="#L179">179</a>             pw.println(<span class="jxr_string">"ImageOffset: "</span> + imageOffset);
+<a class="jxr_linenumber" name="L180" href="#L180">180</a>         }
+<a class="jxr_linenumber" name="L181" href="#L181">181</a>     }
+<a class="jxr_linenumber" name="L182" href="#L182">182</a> 
+<a class="jxr_linenumber" name="L183" href="#L183">183</a>     <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">IconInfo</a> readIconInfo(<strong class="jxr_keyword">final</strong> InputStream is) <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="L184" href="#L184">184</a>         <em class="jxr_comment">// Width (1 byte), Width of Icon (1 to 255)</em>
+<a class="jxr_linenumber" name="L185" href="#L185">185</a>         <strong class="jxr_keyword">final</strong> byte width = readByte(<span class="jxr_string">"Width"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>);
+<a class="jxr_linenumber" name="L186" href="#L186">186</a>         <em class="jxr_comment">// Height (1 byte), Height of Icon (1 to 255)</em>
+<a class="jxr_linenumber" name="L187" href="#L187">187</a>         <strong class="jxr_keyword">final</strong> byte height = readByte(<span class="jxr_string">"Height"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>);
+<a class="jxr_linenumber" name="L188" href="#L188">188</a>         <em class="jxr_comment">// ColorCount (1 byte), Number of colors, either</em>
+<a class="jxr_linenumber" name="L189" href="#L189">189</a>         <em class="jxr_comment">// 0 for 24 bit or higher,</em>
+<a class="jxr_linenumber" name="L190" href="#L190">190</a>         <em class="jxr_comment">// 2 for monochrome or 16 for 16 color images.</em>
+<a class="jxr_linenumber" name="L191" href="#L191">191</a>         <strong class="jxr_keyword">final</strong> byte colorCount = readByte(<span class="jxr_string">"ColorCount"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>);
+<a class="jxr_linenumber" name="L192" href="#L192">192</a>         <em class="jxr_comment">// Reserved (1 byte), Not used (always 0)</em>
+<a class="jxr_linenumber" name="L193" href="#L193">193</a>         <strong class="jxr_keyword">final</strong> byte reserved = readByte(<span class="jxr_string">"Reserved"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>);
+<a class="jxr_linenumber" name="L194" href="#L194">194</a>         <em class="jxr_comment">// Planes (2 bytes), always 1</em>
+<a class="jxr_linenumber" name="L195" href="#L195">195</a>         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> planes = read2Bytes(<span class="jxr_string">"Planes"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>, getByteOrder());
+<a class="jxr_linenumber" name="L196" href="#L196">196</a>         <em class="jxr_comment">// BitCount (2 bytes), number of bits per pixel (1 for monchrome,</em>
+<a class="jxr_linenumber" name="L197" href="#L197">197</a>         <em class="jxr_comment">// 4 for 16 colors, 8 for 256 colors, 24 for true colors,</em>
+<a class="jxr_linenumber" name="L198" href="#L198">198</a>         <em class="jxr_comment">// 32 for true colors + alpha channel)</em>
+<a class="jxr_linenumber" name="L199" href="#L199">199</a>         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> bitCount = read2Bytes(<span class="jxr_string">"BitCount"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>, getByteOrder());
+<a class="jxr_linenumber" name="L200" href="#L200">200</a>         <em class="jxr_comment">// ImageSize (4 bytes), Length of resource in bytes</em>
+<a class="jxr_linenumber" name="L201" href="#L201">201</a>         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> imageSize = read4Bytes(<span class="jxr_string">"ImageSize"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>, getByteOrder());
+<a class="jxr_linenumber" name="L202" href="#L202">202</a>         <em class="jxr_comment">// ImageOffset (4 bytes), start of the image in the file</em>
+<a class="jxr_linenumber" name="L203" href="#L203">203</a>         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> imageOffset = read4Bytes(<span class="jxr_string">"ImageOffset"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>, getByteOrder());
+<a class="jxr_linenumber" name="L204" href="#L204">204</a> 
+<a class="jxr_linenumber" name="L205" href="#L205">205</a>         <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">IconInfo</a>(width, height, colorCount, reserved, planes, bitCount, imageSize, imageOffset);
+<a class="jxr_linenumber" name="L206" href="#L206">206</a>     }
+<a class="jxr_linenumber" name="L207" href="#L207">207</a> 
+<a class="jxr_linenumber" name="L208" href="#L208">208</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">BitmapHeader</a> {
+<a class="jxr_linenumber" name="L209" href="#L209">209</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> size;
+<a class="jxr_linenumber" name="L210" href="#L210">210</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> width;
+<a class="jxr_linenumber" name="L211" href="#L211">211</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> height;
+<a class="jxr_linenumber" name="L212" href="#L212">212</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> planes;
+<a class="jxr_linenumber" name="L213" href="#L213">213</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> bitCount;
+<a class="jxr_linenumber" name="L214" href="#L214">214</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> compression;
+<a class="jxr_linenumber" name="L215" href="#L215">215</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> sizeImage;
+<a class="jxr_linenumber" name="L216" href="#L216">216</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> xPelsPerMeter;
+<a class="jxr_linenumber" name="L217" href="#L217">217</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> yPelsPerMeter;
+<a class="jxr_linenumber" name="L218" href="#L218">218</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> colorsUsed;
+<a class="jxr_linenumber" name="L219" href="#L219">219</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> colorsImportant;
+<a class="jxr_linenumber" name="L220" href="#L220">220</a> 
+<a class="jxr_linenumber" name="L221" href="#L221">221</a>         <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">BitmapHeader</a>(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> size, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> width, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> height,
+<a class="jxr_linenumber" name="L222" href="#L222">222</a>                 <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> planes, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> bitCount, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> compression,
+<a class="jxr_linenumber" name="L223" href="#L223">223</a>                 <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> sizeImage, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> pelsPerMeter,
+<a class="jxr_linenumber" name="L224" href="#L224">224</a>                 <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> pelsPerMeter2, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> colorsUsed,
+<a class="jxr_linenumber" name="L225" href="#L225">225</a>                 <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> colorsImportant) {
+<a class="jxr_linenumber" name="L226" href="#L226">226</a>             <strong class="jxr_keyword">this</strong>.size = size;
+<a class="jxr_linenumber" name="L227" href="#L227">227</a>             <strong class="jxr_keyword">this</strong>.width = width;
+<a class="jxr_linenumber" name="L228" href="#L228">228</a>             <strong class="jxr_keyword">this</strong>.height = height;
+<a class="jxr_linenumber" name="L229" href="#L229">229</a>             <strong class="jxr_keyword">this</strong>.planes = planes;
+<a class="jxr_linenumber" name="L230" href="#L230">230</a>             <strong class="jxr_keyword">this</strong>.bitCount = bitCount;
+<a class="jxr_linenumber" name="L231" href="#L231">231</a>             <strong class="jxr_keyword">this</strong>.compression = compression;
+<a class="jxr_linenumber" name="L232" href="#L232">232</a>             <strong class="jxr_keyword">this</strong>.sizeImage = sizeImage;
+<a class="jxr_linenumber" name="L233" href="#L233">233</a>             xPelsPerMeter = pelsPerMeter;
+<a class="jxr_linenumber" name="L234" href="#L234">234</a>             yPelsPerMeter = pelsPerMeter2;
+<a class="jxr_linenumber" name="L235" href="#L235">235</a>             <strong class="jxr_keyword">this</strong>.colorsUsed = colorsUsed;
+<a class="jxr_linenumber" name="L236" href="#L236">236</a>             <strong class="jxr_keyword">this</strong>.colorsImportant = colorsImportant;
+<a class="jxr_linenumber" name="L237" href="#L237">237</a>         }
+<a class="jxr_linenumber" name="L238" href="#L238">238</a> 
+<a class="jxr_linenumber" name="L239" href="#L239">239</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> dump(<strong class="jxr_keyword">final</strong> PrintWriter pw) {
+<a class="jxr_linenumber" name="L240" href="#L240">240</a>             pw.println(<span class="jxr_string">"BitmapHeader"</span>);
+<a class="jxr_linenumber" name="L241" href="#L241">241</a> 
+<a class="jxr_linenumber" name="L242" href="#L242">242</a>             pw.println(<span class="jxr_string">"Size: "</span> + size);
+<a class="jxr_linenumber" name="L243" href="#L243">243</a>             pw.println(<span class="jxr_string">"Width: "</span> + width);
+<a class="jxr_linenumber" name="L244" href="#L244">244</a>             pw.println(<span class="jxr_string">"Height: "</span> + height);
+<a class="jxr_linenumber" name="L245" href="#L245">245</a>             pw.println(<span class="jxr_string">"Planes: "</span> + planes);
+<a class="jxr_linenumber" name="L246" href="#L246">246</a>             pw.println(<span class="jxr_string">"BitCount: "</span> + bitCount);
+<a class="jxr_linenumber" name="L247" href="#L247">247</a>             pw.println(<span class="jxr_string">"Compression: "</span> + compression);
+<a class="jxr_linenumber" name="L248" href="#L248">248</a>             pw.println(<span class="jxr_string">"SizeImage: "</span> + sizeImage);
+<a class="jxr_linenumber" name="L249" href="#L249">249</a>             pw.println(<span class="jxr_string">"XPelsPerMeter: "</span> + xPelsPerMeter);
+<a class="jxr_linenumber" name="L250" href="#L250">250</a>             pw.println(<span class="jxr_string">"YPelsPerMeter: "</span> + yPelsPerMeter);
+<a class="jxr_linenumber" name="L251" href="#L251">251</a>             pw.println(<span class="jxr_string">"ColorsUsed: "</span> + colorsUsed);
+<a class="jxr_linenumber" name="L252" href="#L252">252</a>             pw.println(<span class="jxr_string">"ColorsImportant: "</span> + colorsImportant);
+<a class="jxr_linenumber" name="L253" href="#L253">253</a>         }
+<a class="jxr_linenumber" name="L254" href="#L254">254</a>     }
+<a class="jxr_linenumber" name="L255" href="#L255">255</a> 
+<a class="jxr_linenumber" name="L256" href="#L256">256</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">abstract</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">IconData</a> {
+<a class="jxr_linenumber" name="L257" href="#L257">257</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">IconInfo</a> iconInfo;
 <a class="jxr_linenumber" name="L258" href="#L258">258</a> 
-<a class="jxr_linenumber" name="L259" href="#L259">259</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> dump(<strong class="jxr_keyword">final</strong> PrintWriter pw) {
-<a class="jxr_linenumber" name="L260" href="#L260">260</a>             iconInfo.dump(pw);
-<a class="jxr_linenumber" name="L261" href="#L261">261</a>             pw.println();
-<a class="jxr_linenumber" name="L262" href="#L262">262</a>             dumpSubclass(pw);
-<a class="jxr_linenumber" name="L263" href="#L263">263</a>         }
-<a class="jxr_linenumber" name="L264" href="#L264">264</a> 
-<a class="jxr_linenumber" name="L265" href="#L265">265</a>         <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">abstract</strong> <strong class="jxr_keyword">void</strong> dumpSubclass(PrintWriter pw);
-<a class="jxr_linenumber" name="L266" href="#L266">266</a> 
-<a class="jxr_linenumber" name="L267" href="#L267">267</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">abstract</strong> BufferedImage readBufferedImage()
-<a class="jxr_linenumber" name="L268" href="#L268">268</a>                 <strong class="jxr_keyword">throws</strong> ImageReadException;
-<a class="jxr_linenumber" name="L269" href="#L269">269</a>     }
+<a class="jxr_linenumber" name="L259" href="#L259">259</a>         <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">IconData</a>(<strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">IconInfo</a> iconInfo) {
+<a class="jxr_linenumber" name="L260" href="#L260">260</a>             <strong class="jxr_keyword">this</strong>.iconInfo = iconInfo;
+<a class="jxr_linenumber" name="L261" href="#L261">261</a>         }
+<a class="jxr_linenumber" name="L262" href="#L262">262</a> 
+<a class="jxr_linenumber" name="L263" href="#L263">263</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> dump(<strong class="jxr_keyword">final</strong> PrintWriter pw) {
+<a class="jxr_linenumber" name="L264" href="#L264">264</a>             iconInfo.dump(pw);
+<a class="jxr_linenumber" name="L265" href="#L265">265</a>             pw.println();
+<a class="jxr_linenumber" name="L266" href="#L266">266</a>             dumpSubclass(pw);
+<a class="jxr_linenumber" name="L267" href="#L267">267</a>         }
+<a class="jxr_linenumber" name="L268" href="#L268">268</a> 
+<a class="jxr_linenumber" name="L269" href="#L269">269</a>         <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">abstract</strong> <strong class="jxr_keyword">void</strong> dumpSubclass(PrintWriter pw);
 <a class="jxr_linenumber" name="L270" href="#L270">270</a> 
-<a class="jxr_linenumber" name="L271" href="#L271">271</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">BitmapIconData</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">IconData</a> {
-<a class="jxr_linenumber" name="L272" href="#L272">272</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">BitmapHeader</a> header;
-<a class="jxr_linenumber" name="L273" href="#L273">273</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> BufferedImage bufferedImage;
+<a class="jxr_linenumber" name="L271" href="#L271">271</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">abstract</strong> BufferedImage readBufferedImage()
+<a class="jxr_linenumber" name="L272" href="#L272">272</a>                 <strong class="jxr_keyword">throws</strong> ImageReadException;
+<a class="jxr_linenumber" name="L273" href="#L273">273</a>     }
 <a class="jxr_linenumber" name="L274" href="#L274">274</a> 
-<a class="jxr_linenumber" name="L275" href="#L275">275</a>         <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">BitmapIconData</a>(<strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">IconInfo</a> iconInfo,
-<a class="jxr_linenumber" name="L276" href="#L276">276</a>                 <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">BitmapHeader</a> header, <strong class="jxr_keyword">final</strong> BufferedImage bufferedImage) {
-<a class="jxr_linenumber" name="L277" href="#L277">277</a>             <strong class="jxr_keyword">super</strong>(iconInfo);
-<a class="jxr_linenumber" name="L278" href="#L278">278</a>             <strong class="jxr_keyword">this</strong>.header = header;
-<a class="jxr_linenumber" name="L279" href="#L279">279</a>             <strong class="jxr_keyword">this</strong>.bufferedImage = bufferedImage;
-<a class="jxr_linenumber" name="L280" href="#L280">280</a>         }
-<a class="jxr_linenumber" name="L281" href="#L281">281</a> 
-<a class="jxr_linenumber" name="L282" href="#L282">282</a>         @Override
-<a class="jxr_linenumber" name="L283" href="#L283">283</a>         <strong class="jxr_keyword">public</strong> BufferedImage readBufferedImage() <strong class="jxr_keyword">throws</strong> ImageReadException {
-<a class="jxr_linenumber" name="L284" href="#L284">284</a>             <strong class="jxr_keyword">return</strong> bufferedImage;
-<a class="jxr_linenumber" name="L285" href="#L285">285</a>         }
-<a class="jxr_linenumber" name="L286" href="#L286">286</a> 
-<a class="jxr_linenumber" name="L287" href="#L287">287</a>         @Override
-<a class="jxr_linenumber" name="L288" href="#L288">288</a>         <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> dumpSubclass(<strong class="jxr_keyword">final</strong> PrintWriter pw) {
-<a class="jxr_linenumber" name="L289" href="#L289">289</a>             pw.println(<span class="jxr_string">"BitmapIconData"</span>);
-<a class="jxr_linenumber" name="L290" href="#L290">290</a>             header.dump(pw);
-<a class="jxr_linenumber" name="L291" href="#L291">291</a>             pw.println();
-<a class="jxr_linenumber" name="L292" href="#L292">292</a>         }
-<a class="jxr_linenumber" name="L293" href="#L293">293</a>     }
-<a class="jxr_linenumber" name="L294" href="#L294">294</a> 
-<a class="jxr_linenumber" name="L295" href="#L295">295</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">PNGIconData</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">IconData</a> {
-<a class="jxr_linenumber" name="L296" href="#L296">296</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> BufferedImage bufferedImage;
-<a class="jxr_linenumber" name="L297" href="#L297">297</a> 
-<a class="jxr_linenumber" name="L298" href="#L298">298</a>         <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">PNGIconData</a>(<strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">IconInfo</a> iconInfo,
-<a class="jxr_linenumber" name="L299" href="#L299">299</a>                 <strong class="jxr_keyword">final</strong> BufferedImage bufferedImage) {
-<a class="jxr_linenumber" name="L300" href="#L300">300</a>             <strong class="jxr_keyword">super</strong>(iconInfo);
-<a class="jxr_linenumber" name="L301" href="#L301">301</a>             <strong class="jxr_keyword">this</strong>.bufferedImage = bufferedImage;
-<a class="jxr_linenumber" name="L302" href="#L302">302</a>         }
-<a class="jxr_linenumber" name="L303" href="#L303">303</a> 
-<a class="jxr_linenumber" name="L304" href="#L304">304</a>         @Override
-<a class="jxr_linenumber" name="L305" href="#L305">305</a>         <strong class="jxr_keyword">public</strong> BufferedImage readBufferedImage() {
-<a class="jxr_linenumber" name="L306" href="#L306">306</a>             <strong class="jxr_keyword">return</strong> bufferedImage;
-<a class="jxr_linenumber" name="L307" href="#L307">307</a>         }
-<a class="jxr_linenumber" name="L308" href="#L308">308</a> 
-<a class="jxr_linenumber" name="L309" href="#L309">309</a>         @Override
-<a class="jxr_linenumber" name="L310" href="#L310">310</a>         <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> dumpSubclass(<strong class="jxr_keyword">final</strong> PrintWriter pw) {
-<a class="jxr_linenumber" name="L311" href="#L311">311</a>             pw.println(<span class="jxr_string">"PNGIconData"</span>);
-<a class="jxr_linenumber" name="L312" href="#L312">312</a>             pw.println();
-<a class="jxr_linenumber" name="L313" href="#L313">313</a>         }
-<a class="jxr_linenumber" name="L314" href="#L314">314</a>     }
-<a class="jxr_linenumber" name="L315" href="#L315">315</a> 
-<a class="jxr_linenumber" name="L316" href="#L316">316</a>     <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">IconData</a> readBitmapIconData(<strong class="jxr_keyword">final</strong> byte[] iconData, <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">IconInfo</a> fIconInfo)
-<a class="jxr_linenumber" name="L317" href="#L317">317</a>             <strong class="jxr_keyword">throws</strong> ImageReadException, IOException {
-<a class="jxr_linenumber" name="L318" href="#L318">318</a>         <strong class="jxr_keyword">final</strong> ByteArrayInputStream is = <strong class="jxr_keyword">new</strong> ByteArrayInputStream(iconData);
-<a class="jxr_linenumber" name="L319" href="#L319">319</a>         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> size = read4Bytes(<span class="jxr_string">"size"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>, getByteOrder()); <em class="jxr_comment">// Size (4</em>
-<a class="jxr_linenumber" name="L320" href="#L320">320</a>                                                                    <em class="jxr_comment">// bytes),</em>
-<a class="jxr_linenumber" name="L321" href="#L321">321</a>                                                                    <em class="jxr_comment">// size of</em>
-<a class="jxr_linenumber" name="L322" href="#L322">322</a>                                                                    <em class="jxr_comment">// this</em>
-<a class="jxr_linenumber" name="L323" href="#L323">323</a>                                                                    <em class="jxr_comment">// structure</em>
-<a class="jxr_linenumber" name="L324" href="#L324">324</a>                                                                    <em class="jxr_comment">// (always</em>
-<a class="jxr_linenumber" name="L325" href="#L325">325</a>                                                                    <em class="jxr_comment">// 40)</em>
-<a class="jxr_linenumber" name="L326" href="#L326">326</a>         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> width = read4Bytes(<span class="jxr_string">"width"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>, getByteOrder()); <em class="jxr_comment">// Width (4</em>
-<a class="jxr_linenumber" name="L327" href="#L327">327</a>                                                                      <em class="jxr_comment">// bytes),</em>
-<a class="jxr_linenumber" name="L328" href="#L328">328</a>                                                                      <em class="jxr_comment">// width of</em>
-<a class="jxr_linenumber" name="L329" href="#L329">329</a>                                                                      <em class="jxr_comment">// the</em>
-<a class="jxr_linenumber" name="L330" href="#L330">330</a>                                                                      <em class="jxr_comment">// image</em>
-<a class="jxr_linenumber" name="L331" href="#L331">331</a>                                                                      <em class="jxr_comment">// (same as</em>
-<a class="jxr_linenumber" name="L332" href="#L332">332</a>                                                                      <em class="jxr_comment">// iconinfo.width)</em>
-<a class="jxr_linenumber" name="L333" href="#L333">333</a>         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> height = read4Bytes(<span class="jxr_string">"height"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>, getByteOrder()); <em class="jxr_comment">// Height</em>
-<a class="jxr_linenumber" name="L334" href="#L334">334</a>                                                                        <em class="jxr_comment">// (4</em>
-<a class="jxr_linenumber" name="L335" href="#L335">335</a>                                                                        <em class="jxr_comment">// bytes),</em>
-<a class="jxr_linenumber" name="L336" href="#L336">336</a>                                                                        <em class="jxr_comment">// scanlines</em>
-<a class="jxr_linenumber" name="L337" href="#L337">337</a>                                                                        <em class="jxr_comment">// in the</em>
-<a class="jxr_linenumber" name="L338" href="#L338">338</a>                                                                        <em class="jxr_comment">// color</em>
-<a class="jxr_linenumber" name="L339" href="#L339">339</a>                                                                        <em class="jxr_comment">// map +</em>
-<a class="jxr_linenumber" name="L340" href="#L340">340</a>                                                                        <em class="jxr_comment">// transparent</em>
-<a class="jxr_linenumber" name="L341" href="#L341">341</a>                                                                        <em class="jxr_comment">// map</em>
-<a class="jxr_linenumber" name="L342" href="#L342">342</a>                                                                        <em class="jxr_comment">// (iconinfo.height</em>
-<a class="jxr_linenumber" name="L343" href="#L343">343</a>                                                                        <em class="jxr_comment">// * 2)</em>
-<a class="jxr_linenumber" name="L344" href="#L344">344</a>         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> planes = read2Bytes(<span class="jxr_string">"planes"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>, getByteOrder()); <em class="jxr_comment">// Planes</em>
-<a class="jxr_linenumber" name="L345" href="#L345">345</a>                                                                        <em class="jxr_comment">// (2</em>
-<a class="jxr_linenumber" name="L346" href="#L346">346</a>                                                                        <em class="jxr_comment">// bytes),</em>
-<a class="jxr_linenumber" name="L347" href="#L347">347</a>                                                                        <em class="jxr_comment">// always</em>
-<a class="jxr_linenumber" name="L348" href="#L348">348</a>                                                                        <em class="jxr_comment">// 1</em>
-<a class="jxr_linenumber" name="L349" href="#L349">349</a>         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> bitCount = read2Bytes(<span class="jxr_string">"bitCount"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>, getByteOrder()); <em class="jxr_comment">// BitCount</em>
-<a class="jxr_linenumber" name="L350" href="#L350">350</a>                                                                            <em class="jxr_comment">// (2</em>
-<a class="jxr_linenumber" name="L351" href="#L351">351</a>                                                                            <em class="jxr_comment">// bytes),</em>
-<a class="jxr_linenumber" name="L352" href="#L352">352</a>                                                                            <em class="jxr_comment">// 1,4,8,16,24,32</em>
-<a class="jxr_linenumber" name="L353" href="#L353">353</a>                                                                            <em class="jxr_comment">// (see</em>
-<a class="jxr_linenumber" name="L354" href="#L354">354</a>                                                                            <em class="jxr_comment">// iconinfo</em>
-<a class="jxr_linenumber" name="L355" href="#L355">355</a>                                                                            <em class="jxr_comment">// for</em>
-<a class="jxr_linenumber" name="L356" href="#L356">356</a>                                                                            <em class="jxr_comment">// details)</em>
-<a class="jxr_linenumber" name="L357" href="#L357">357</a>         <strong class="jxr_keyword">int</strong> compression = read4Bytes(<span class="jxr_string">"compression"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>, getByteOrder()); <em class="jxr_comment">// Compression</em>
-<a class="jxr_linenumber" name="L358" href="#L358">358</a>                                                                                  <em class="jxr_comment">// (4</em>
-<a class="jxr_linenumber" name="L359" href="#L359">359</a>                                                                                  <em class="jxr_comment">// bytes),</em>
-<a class="jxr_linenumber" name="L360" href="#L360">360</a>                                                                                  <em class="jxr_comment">// we</em>
-<a class="jxr_linenumber" name="L361" href="#L361">361</a>                                                                                  <em class="jxr_comment">// don?t</em>
-<a class="jxr_linenumber" name="L362" href="#L362">362</a>                                                                                  <em class="jxr_comment">// use</em>
-<a class="jxr_linenumber" name="L363" href="#L363">363</a>                                                                                  <em class="jxr_comment">// this</em>
-<a class="jxr_linenumber" name="L364" href="#L364">364</a>                                                                                  <em class="jxr_comment">// (0)</em>
-<a class="jxr_linenumber" name="L365" href="#L365">365</a>         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> sizeImage = read4Bytes(<span class="jxr_string">"sizeImage"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>, getByteOrder()); <em class="jxr_comment">// SizeImage</em>
-<a class="jxr_linenumber" name="L366" href="#L366">366</a>                                                                              <em class="jxr_comment">// (4</em>
-<a class="jxr_linenumber" name="L367" href="#L367">367</a>                                                                              <em class="jxr_comment">// bytes),</em>
-<a class="jxr_linenumber" name="L368" href="#L368">368</a>                                                                              <em class="jxr_comment">// we</em>
-<a class="jxr_linenumber" name="L369" href="#L369">369</a>                                                                              <em class="jxr_comment">// don?t</em>
-<a class="jxr_linenumber" name="L370" href="#L370">370</a>                                                                              <em class="jxr_comment">// use</em>
-<a class="jxr_linenumber" name="L371" href="#L371">371</a>                                                                              <em class="jxr_comment">// this</em>
-<a class="jxr_linenumber" name="L372" href="#L372">372</a>                                                                              <em class="jxr_comment">// (0)</em>
-<a class="jxr_linenumber" name="L373" href="#L373">373</a>         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> xPelsPerMeter = read4Bytes(<span class="jxr_string">"xPelsPerMeter"</span>, is,
-<a class="jxr_linenumber" name="L374" href="#L374">374</a>                 <span class="jxr_string">"Not a Valid ICO File"</span>, getByteOrder()); <em class="jxr_comment">// XPelsPerMeter (4 bytes), we don?t</em>
-<a class="jxr_linenumber" name="L375" href="#L375">375</a>                                          <em class="jxr_comment">// use this (0)</em>
-<a class="jxr_linenumber" name="L376" href="#L376">376</a>         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> yPelsPerMeter = read4Bytes(<span class="jxr_string">"yPelsPerMeter"</span>, is, 
-<a class="jxr_linenumber" name="L377" href="#L377">377</a>                 <span class="jxr_string">"Not a Valid ICO File"</span>, getByteOrder()); <em class="jxr_comment">// YPelsPerMeter (4 bytes), we don?t</em>
-<a class="jxr_linenumber" name="L378" href="#L378">378</a>                                          <em class="jxr_comment">// use this (0)</em>
-<a class="jxr_linenumber" name="L379" href="#L379">379</a>         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> colorsUsed = read4Bytes(<span class="jxr_string">"colorsUsed"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>, getByteOrder()); <em class="jxr_comment">// ColorsUsed</em>
-<a class="jxr_linenumber" name="L380" href="#L380">380</a>                                                                                <em class="jxr_comment">// (4</em>
-<a class="jxr_linenumber" name="L381" href="#L381">381</a>                                                                                <em class="jxr_comment">// bytes),</em>
-<a class="jxr_linenumber" name="L382" href="#L382">382</a>                                                                                <em class="jxr_comment">// we</em>
-<a class="jxr_linenumber" name="L383" href="#L383">383</a>                                                                                <em class="jxr_comment">// don?t</em>
-<a class="jxr_linenumber" name="L384" href="#L384">384</a>                                                                                <em class="jxr_comment">// use</em>
-<a class="jxr_linenumber" name="L385" href="#L385">385</a>                                                                                <em class="jxr_comment">// this</em>
-<a class="jxr_linenumber" name="L386" href="#L386">386</a>                                                                                <em class="jxr_comment">// (0)</em>
-<a class="jxr_linenumber" name="L387" href="#L387">387</a>         <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> colorsImportant = read4Bytes(<span class="jxr_string">"ColorsImportant"</span>, is,
-<a class="jxr_linenumber" name="L388" href="#L388">388</a>                 <span class="jxr_string">"Not a Valid ICO File"</span>, getByteOrder()); <em class="jxr_comment">// ColorsImportant (4 bytes), we don?t</em>
-<a class="jxr_linenumber" name="L389" href="#L389">389</a>                                          <em class="jxr_comment">// use this (0)</em>
-<a class="jxr_linenumber" name="L390" href="#L390">390</a>         <strong class="jxr_keyword">int</strong> redMask = 0;
-<a class="jxr_linenumber" name="L391" href="#L391">391</a>         <strong class="jxr_keyword">int</strong> greenMask = 0;
-<a class="jxr_linenumber" name="L392" href="#L392">392</a>         <strong class="jxr_keyword">int</strong> blueMask = 0;
-<a class="jxr_linenumber" name="L393" href="#L393">393</a>         <strong class="jxr_keyword">int</strong> alphaMask = 0;
-<a class="jxr_linenumber" name="L394" href="#L394">394</a>         <strong class="jxr_keyword">if</strong> (compression == 3) {
-<a class="jxr_linenumber" name="L395" href="#L395">395</a>             redMask = read4Bytes(<span class="jxr_string">"redMask"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>, getByteOrder());
-<a class="jxr_linenumber" name="L396" href="#L396">396</a>             greenMask = read4Bytes(<span class="jxr_string">"greenMask"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>, getByteOrder());
-<a class="jxr_linenumber" name="L397" href="#L397">397</a>             blueMask = read4Bytes(<span class="jxr_string">"blueMask"</span>, is, <span class="jxr_string">"Not a Valid ICO File"</span>, getByteOrder());
-<a class="jxr_linenumber" name="L398" href="#L398">398</a>         }
-<a class="jxr_linenumber" name="L399" href="#L399">399</a>         <strong class="jxr_keyword">final</strong> byte[] restOfFile = readBytes(<span class="jxr_string">"RestOfFile"</span>, is, is.available());
-<a class="jxr_linenumber" name="L400" href="#L400">400</a> 
-<a class="jxr_linenumber" name="L401" href="#L401">401</a>         <strong class="jxr_keyword">if</strong> (size != 40) {
-<a class="jxr_linenumber" name="L402" href="#L402">402</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/imaging/ImageReadException.html">ImageReadException</a>(<span class="jxr_string">"Not a Valid ICO File: Wrong bitmap header size "</span> + size);
-<a class="jxr_linenumber" name="L403" href="#L403">403</a>         }
-<a class="jxr_linenumber" name="L404" href="#L404">404</a>         <strong class="jxr_keyword">if</strong> (planes != 1) {
-<a class="jxr_linenumber" name="L405" href="#L405">405</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/imaging/ImageReadException.html">ImageReadException</a>(<span class="jxr_string">"Not a Valid ICO File: Planes can't be "</span> + planes);
-<a class="jxr_linenumber" name="L406" href="#L406">406</a>         }
-<a class="jxr_linenumber" name="L407" href="#L407">407</a> 
-<a class="jxr_linenumber" name="L408" href="#L408">408</a>         <strong class="jxr_keyword">if</strong> (compression == 0 &amp;&amp; bitCount == 32) {
-<a class="jxr_linenumber" name="L409" href="#L409">409</a>             <em class="jxr_comment">// 32 BPP RGB icons need an alpha channel, but BMP files don't have</em>
-<a class="jxr_linenumber" name="L410" href="#L410">410</a>             <em class="jxr_comment">// one unless BI_BITFIELDS is used...</em>
-<a class="jxr_linenumber" name="L411" href="#L411">411</a>             compression = 3;
-<a class="jxr_linenumber" name="L412" href="#L412">412</a>             redMask = 0x00ff0000;
-<a class="jxr_linenumber" name="L413" href="#L413">413</a>             greenMask = 0x0000ff00;
-<a class="jxr_linenumber" name="L414" href="#L414">414</a>             blueMask = 0x000000ff;
-<a class="jxr_linenumber" name="L415" href="#L415">415</a>             alphaMask = 0xff000000;
-<a class="jxr_linenumber" name="L416" href="#L416">416</a>         }
-<a class="jxr_linenumber" name="L417" href="#L417">417</a> 
-<a class="jxr_linenumber" name="L418" href="#L418">418</a>         <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">BitmapHeader</a> header = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">BitmapHeader</a>(size, width, height, planes,
-<a class="jxr_linenumber" name="L419" href="#L419">419</a>                 bitCount, compression, sizeImage, xPelsPerMeter, yPelsPerMeter,
-<a class="jxr_linenumber" name="L420" href="#L420">420</a>                 colorsUsed, colorsImportant);
+<a class="jxr_linenumber" name="L275" href="#L275">275</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">BitmapIconData</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">IconData</a> {
+<a class="jxr_linenumber" name="L276" href="#L276">276</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/commons/imaging/formats/ico/IcoImageParser.html">BitmapHeader</a> header;
+<a class="jxr_linenumber" name="L277" href="#L277">277</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> BufferedImage bufferedImage;
+<a class="jxr_linenumber" name="L278" href="#L278">278</a> 

[... 962 lines stripped ...]


Mime
View raw message