Modified:
websites/production/commons/content/proper/commons-imaging/xref/org/apache/commons/imaging/formats/pnm/PpmWriter.html
==============================================================================
---
websites/production/commons/content/proper/commons-imaging/xref/org/apache/commons/imaging/formats/pnm/PpmWriter.html
(original)
+++
websites/production/commons/content/proper/commons-imaging/xref/org/apache/commons/imaging/formats/pnm/PpmWriter.html
Sun Jan 11 12:33:25 2015
@@ -31,60 +31,61 @@
<a class="jxr_linenumber" name="L23" href="#L23">23</a>
<a class="jxr_linenumber" name="L24" href="#L24">24</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.ImageWriteException;
<a class="jxr_linenumber" name="L25" href="#L25">25</a>
-<a class="jxr_linenumber" name="L26" href="#L26">26</a> <strong
class="jxr_keyword">class</strong> <a
href="../../../../../../org/apache/commons/imaging/formats/pnm/PpmWriter.html">PpmWriter</a>
<strong class="jxr_keyword">extends</strong> <a
href="../../../../../../org/apache/commons/imaging/formats/pnm/PnmWriter.html">PnmWriter</a>
{
+<a class="jxr_linenumber" name="L26" href="#L26">26</a> <strong
class="jxr_keyword">class</strong> <a
href="../../../../../../org/apache/commons/imaging/formats/pnm/PpmWriter.html">PpmWriter</a>
<strong class="jxr_keyword">implements</strong> <a
href="../../../../../../org/apache/commons/imaging/formats/pnm/PnmWriter.html">PnmWriter</a>
{
<a class="jxr_linenumber" name="L27" href="#L27">27</a>
-<a class="jxr_linenumber" name="L28" href="#L28">28</a> <strong
class="jxr_keyword">public</strong> <a
href="../../../../../../org/apache/commons/imaging/formats/pnm/PpmWriter.html">PpmWriter</a>(<strong
class="jxr_keyword">boolean</strong> rawbits) {
-<a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong
class="jxr_keyword">super</strong>(rawbits);
-<a class="jxr_linenumber" name="L30" href="#L30">30</a> }
-<a class="jxr_linenumber" name="L31" href="#L31">31</a>
-<a class="jxr_linenumber" name="L32" href="#L32">32</a> @Override
-<a class="jxr_linenumber" name="L33" href="#L33">33</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
writeImage(<strong class="jxr_keyword">final</strong> BufferedImage src,
<strong class="jxr_keyword">final</strong> OutputStream os, <strong
class="jxr_keyword">final</strong> Map<String, Object> params)
-<a class="jxr_linenumber" name="L34" href="#L34">34</a> <strong
class="jxr_keyword">throws</strong> ImageWriteException, IOException {
-<a class="jxr_linenumber" name="L35" href="#L35">35</a> <em
class="jxr_comment">// System.out.println</em>
-<a class="jxr_linenumber" name="L36" href="#L36">36</a> <em
class="jxr_comment">// (b1 == 0x50 && b2 == 0x36)</em>
-<a class="jxr_linenumber" name="L37" href="#L37">37</a>
os.write(0x50);
-<a class="jxr_linenumber" name="L38" href="#L38">38</a>
os.write(rawbits ? 0x36 : 0x33);
-<a class="jxr_linenumber" name="L39" href="#L39">39</a>
os.write(PnmConstants.PNM_SEPARATOR);
-<a class="jxr_linenumber" name="L40" href="#L40">40</a>
-<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong>
width = src.getWidth();
-<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong>
height = src.getHeight();
-<a class="jxr_linenumber" name="L43" href="#L43">43</a>
-<a class="jxr_linenumber" name="L44" href="#L44">44</a>
os.write(Integer.toString(width).getBytes(<span
class="jxr_string">"US-ASCII"</span>));
-<a class="jxr_linenumber" name="L45" href="#L45">45</a>
os.write(PnmConstants.PNM_SEPARATOR);
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>
-<a class="jxr_linenumber" name="L47" href="#L47">47</a>
os.write(Integer.toString(height).getBytes(<span
class="jxr_string">"US-ASCII"</span>));
-<a class="jxr_linenumber" name="L48" href="#L48">48</a>
os.write(PnmConstants.PNM_SEPARATOR);
-<a class="jxr_linenumber" name="L49" href="#L49">49</a>
-<a class="jxr_linenumber" name="L50" href="#L50">50</a>
os.write(Integer.toString(255).getBytes(<span
class="jxr_string">"US-ASCII"</span>)); <em class="jxr_comment">// max
component value</em>
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>
os.write(PnmConstants.PNM_NEWLINE);
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>
-<a class="jxr_linenumber" name="L53" href="#L53">53</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> y =
0; y < height; y++) {
-<a class="jxr_linenumber" name="L54" href="#L54">54</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> x =
0; x < width; x++) {
-<a class="jxr_linenumber" name="L55" href="#L55">55</a>
<strong class="jxr_keyword">final</strong> <strong
class="jxr_keyword">int</strong> argb = src.getRGB(x, y);
-<a class="jxr_linenumber" name="L56" href="#L56">56</a>
<strong class="jxr_keyword">final</strong> <strong
class="jxr_keyword">int</strong> red = 0xff & (argb >> 16);
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>
<strong class="jxr_keyword">final</strong> <strong
class="jxr_keyword">int</strong> green = 0xff & (argb >> 8);
-<a class="jxr_linenumber" name="L58" href="#L58">58</a>
<strong class="jxr_keyword">final</strong> <strong
class="jxr_keyword">int</strong> blue = 0xff & (argb >> 0);
-<a class="jxr_linenumber" name="L59" href="#L59">59</a>
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>
<strong class="jxr_keyword">if</strong> (rawbits) {
-<a class="jxr_linenumber" name="L61" href="#L61">61</a>
os.write((byte) red);
-<a class="jxr_linenumber" name="L62" href="#L62">62</a>
os.write((byte) green);
-<a class="jxr_linenumber" name="L63" href="#L63">63</a>
os.write((byte) blue);
-<a class="jxr_linenumber" name="L64" href="#L64">64</a> }
<strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L65" href="#L65">65</a>
os.write(Integer.toString(red).getBytes(<span
class="jxr_string">"US-ASCII"</span>)); <em class="jxr_comment">// max
component</em>
-<a class="jxr_linenumber" name="L66" href="#L66">66</a>
<em class="jxr_comment">// value</em>
-<a class="jxr_linenumber" name="L67" href="#L67">67</a>
os.write(PnmConstants.PNM_SEPARATOR);
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>
os.write(Integer.toString(green).getBytes(<span
class="jxr_string">"US-ASCII"</span>)); <em class="jxr_comment">// max</em>
-<a class="jxr_linenumber" name="L69" href="#L69">69</a>
<em class="jxr_comment">//
component</em>
-<a class="jxr_linenumber" name="L70" href="#L70">70</a>
<em class="jxr_comment">// value</em>
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>
os.write(PnmConstants.PNM_SEPARATOR);
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>
os.write(Integer.toString(blue).getBytes(<span
class="jxr_string">"US-ASCII"</span>)); <em class="jxr_comment">// max
component</em>
-<a class="jxr_linenumber" name="L73" href="#L73">73</a>
<em class="jxr_comment">// value</em>
-<a class="jxr_linenumber" name="L74" href="#L74">74</a>
os.write(PnmConstants.PNM_SEPARATOR);
-<a class="jxr_linenumber" name="L75" href="#L75">75</a> }
-<a class="jxr_linenumber" name="L76" href="#L76">76</a> }
-<a class="jxr_linenumber" name="L77" href="#L77">77</a> }
-<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="L28" href="#L28">28</a> <strong
class="jxr_keyword">private</strong> <strong
class="jxr_keyword">boolean</strong> rawbits;
+<a class="jxr_linenumber" name="L29" href="#L29">29</a>
+<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong
class="jxr_keyword">public</strong> <a
href="../../../../../../org/apache/commons/imaging/formats/pnm/PpmWriter.html">PpmWriter</a>(<strong
class="jxr_keyword">boolean</strong> rawbits) {
+<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong
class="jxr_keyword">this</strong>.rawbits = rawbits;
+<a class="jxr_linenumber" name="L32" href="#L32">32</a> }
+<a class="jxr_linenumber" name="L33" href="#L33">33</a>
+<a class="jxr_linenumber" name="L34" href="#L34">34</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
writeImage(<strong class="jxr_keyword">final</strong> BufferedImage src,
<strong class="jxr_keyword">final</strong> OutputStream os, <strong
class="jxr_keyword">final</strong> Map<String, Object> params)
+<a class="jxr_linenumber" name="L35" href="#L35">35</a> <strong
class="jxr_keyword">throws</strong> ImageWriteException, IOException {
+<a class="jxr_linenumber" name="L36" href="#L36">36</a> <em
class="jxr_comment">// System.out.println</em>
+<a class="jxr_linenumber" name="L37" href="#L37">37</a> <em
class="jxr_comment">// (b1 == 0x50 && b2 == 0x36)</em>
+<a class="jxr_linenumber" name="L38" href="#L38">38</a>
os.write(0x50);
+<a class="jxr_linenumber" name="L39" href="#L39">39</a>
os.write(rawbits ? 0x36 : 0x33);
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>
os.write(PnmConstants.PNM_SEPARATOR);
+<a class="jxr_linenumber" name="L41" href="#L41">41</a>
+<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong>
width = src.getWidth();
+<a class="jxr_linenumber" name="L43" href="#L43">43</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong>
height = src.getHeight();
+<a class="jxr_linenumber" name="L44" href="#L44">44</a>
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>
os.write(Integer.toString(width).getBytes(<span
class="jxr_string">"US-ASCII"</span>));
+<a class="jxr_linenumber" name="L46" href="#L46">46</a>
os.write(PnmConstants.PNM_SEPARATOR);
+<a class="jxr_linenumber" name="L47" href="#L47">47</a>
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>
os.write(Integer.toString(height).getBytes(<span
class="jxr_string">"US-ASCII"</span>));
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>
os.write(PnmConstants.PNM_SEPARATOR);
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>
+<a class="jxr_linenumber" name="L51" href="#L51">51</a>
os.write(Integer.toString(255).getBytes(<span
class="jxr_string">"US-ASCII"</span>)); <em class="jxr_comment">// max
component value</em>
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>
os.write(PnmConstants.PNM_NEWLINE);
+<a class="jxr_linenumber" name="L53" href="#L53">53</a>
+<a class="jxr_linenumber" name="L54" href="#L54">54</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> y =
0; y < height; y++) {
+<a class="jxr_linenumber" name="L55" href="#L55">55</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> x =
0; x < width; x++) {
+<a class="jxr_linenumber" name="L56" href="#L56">56</a>
<strong class="jxr_keyword">final</strong> <strong
class="jxr_keyword">int</strong> argb = src.getRGB(x, y);
+<a class="jxr_linenumber" name="L57" href="#L57">57</a>
<strong class="jxr_keyword">final</strong> <strong
class="jxr_keyword">int</strong> red = 0xff & (argb >> 16);
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>
<strong class="jxr_keyword">final</strong> <strong
class="jxr_keyword">int</strong> green = 0xff & (argb >> 8);
+<a class="jxr_linenumber" name="L59" href="#L59">59</a>
<strong class="jxr_keyword">final</strong> <strong
class="jxr_keyword">int</strong> blue = 0xff & (argb >> 0);
+<a class="jxr_linenumber" name="L60" href="#L60">60</a>
+<a class="jxr_linenumber" name="L61" href="#L61">61</a>
<strong class="jxr_keyword">if</strong> (rawbits) {
+<a class="jxr_linenumber" name="L62" href="#L62">62</a>
os.write((byte) red);
+<a class="jxr_linenumber" name="L63" href="#L63">63</a>
os.write((byte) green);
+<a class="jxr_linenumber" name="L64" href="#L64">64</a>
os.write((byte) blue);
+<a class="jxr_linenumber" name="L65" href="#L65">65</a> }
<strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>
os.write(Integer.toString(red).getBytes(<span
class="jxr_string">"US-ASCII"</span>)); <em class="jxr_comment">// max
component</em>
+<a class="jxr_linenumber" name="L67" href="#L67">67</a>
<em class="jxr_comment">// value</em>
+<a class="jxr_linenumber" name="L68" href="#L68">68</a>
os.write(PnmConstants.PNM_SEPARATOR);
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>
os.write(Integer.toString(green).getBytes(<span
class="jxr_string">"US-ASCII"</span>)); <em class="jxr_comment">// max</em>
+<a class="jxr_linenumber" name="L70" href="#L70">70</a>
<em class="jxr_comment">//
component</em>
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>
<em class="jxr_comment">// value</em>
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>
os.write(PnmConstants.PNM_SEPARATOR);
+<a class="jxr_linenumber" name="L73" href="#L73">73</a>
os.write(Integer.toString(blue).getBytes(<span
class="jxr_string">"US-ASCII"</span>)); <em class="jxr_comment">// max
component</em>
+<a class="jxr_linenumber" name="L74" href="#L74">74</a>
<em class="jxr_comment">// value</em>
+<a class="jxr_linenumber" name="L75" href="#L75">75</a>
os.write(PnmConstants.PNM_SEPARATOR);
+<a class="jxr_linenumber" name="L76" href="#L76">76</a> }
+<a class="jxr_linenumber" name="L77" href="#L77">77</a> }
+<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> }
</pre>
<hr/>
<div id="footer">Copyright © 2007–2015 <a
href="http://www.apache.org/">The Apache Software Foundation</a>. All rights
reserved.</div>
Modified:
websites/production/commons/content/proper/commons-imaging/xref/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.html
==============================================================================
---
websites/production/commons/content/proper/commons-imaging/xref/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.html
(original)
+++
websites/production/commons/content/proper/commons-imaging/xref/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.html
Sun Jan 11 12:33:25 2015
@@ -41,63 +41,64 @@
<a class="jxr_linenumber" name="L33" href="#L33">33</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.psd.dataparsers.DataParser;
<a class="jxr_linenumber" name="L34" href="#L34">34</a> <strong
class="jxr_keyword">import</strong> org.apache.commons.imaging.util.IoUtils;
<a class="jxr_linenumber" name="L35" href="#L35">35</a>
-<a class="jxr_linenumber" name="L36" href="#L36">36</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong>
<a
href="../../../../../../../org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.html">CompressedDataReader</a>
<strong class="jxr_keyword">extends</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/psd/datareaders/DataReader.html">DataReader</a>
{
+<a class="jxr_linenumber" name="L36" href="#L36">36</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong>
<a
href="../../../../../../../org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.html">CompressedDataReader</a>
<strong class="jxr_keyword">implements</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/psd/datareaders/DataReader.html">DataReader</a>
{
<a class="jxr_linenumber" name="L37" href="#L37">37</a>
-<a class="jxr_linenumber" name="L38" href="#L38">38</a> <strong
class="jxr_keyword">public</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.html">CompressedDataReader</a>(<strong
class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/psd/dataparsers/DataParser.html">DataParser</a>
fDataParser) {
-<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong
class="jxr_keyword">super</strong>(fDataParser);
-<a class="jxr_linenumber" name="L40" href="#L40">40</a> }
-<a class="jxr_linenumber" name="L41" href="#L41">41</a>
-<a class="jxr_linenumber" name="L42" href="#L42">42</a> @Override
-<a class="jxr_linenumber" name="L43" href="#L43">43</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
readData(<strong class="jxr_keyword">final</strong> InputStream is, <strong
class="jxr_keyword">final</strong> BufferedImage bi,
-<a class="jxr_linenumber" name="L44" href="#L44">44</a> <strong
class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/psd/ImageContents.html">ImageContents</a>
imageContents, <strong class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/commons/imaging/common/BinaryFileParser.html">BinaryFileParser</a>
bfp)
-<a class="jxr_linenumber" name="L45" href="#L45">45</a> <strong
class="jxr_keyword">throws</strong> ImageReadException, IOException {
-<a class="jxr_linenumber" name="L46" href="#L46">46</a> <strong
class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/psd/PsdHeaderInfo.html">PsdHeaderInfo</a>
header = imageContents.header;
-<a class="jxr_linenumber" name="L47" href="#L47">47</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong>
width = header.columns;
-<a class="jxr_linenumber" name="L48" href="#L48">48</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong>
height = header.rows;
-<a class="jxr_linenumber" name="L49" href="#L49">49</a>
-<a class="jxr_linenumber" name="L50" href="#L50">50</a> <em
class="jxr_comment">// this.setDebug(true);</em>
-<a class="jxr_linenumber" name="L51" href="#L51">51</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong>
scanlineCount = height * header.channels;
-<a class="jxr_linenumber" name="L52" href="#L52">52</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong>[]
scanlineBytecounts = <strong class="jxr_keyword">new</strong> <strong
class="jxr_keyword">int</strong>[scanlineCount];
-<a class="jxr_linenumber" name="L53" href="#L53">53</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i =
0; i < scanlineCount; i++) {
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>
scanlineBytecounts[i] = BinaryFunctions.read2Bytes(<span
class="jxr_string">"scanline_bytecount["</span> + i
-<a class="jxr_linenumber" name="L55" href="#L55">55</a> +
<span class="jxr_string">"]"</span>, is, <span class="jxr_string">"PSD: bad
Image Data"</span>, bfp.getByteOrder());
-<a class="jxr_linenumber" name="L56" href="#L56">56</a> }
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>
bfp.setDebug(false);
-<a class="jxr_linenumber" name="L58" href="#L58">58</a> <em
class="jxr_comment">// System.out.println("fImageContents.Compression: "</em>
-<a class="jxr_linenumber" name="L59" href="#L59">59</a> <em
class="jxr_comment">// + imageContents.Compression);</em>
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>
-<a class="jxr_linenumber" name="L61" href="#L61">61</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong>
depth = header.depth;
-<a class="jxr_linenumber" name="L62" href="#L62">62</a>
-<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong>
channelCount = dataParser.getBasicChannelsCount();
-<a class="jxr_linenumber" name="L64" href="#L64">64</a> <strong
class="jxr_keyword">final</strong> <strong
class="jxr_keyword">int</strong>[][][] data = <strong
class="jxr_keyword">new</strong> <strong
class="jxr_keyword">int</strong>[channelCount][height][];
-<a class="jxr_linenumber" name="L65" href="#L65">65</a> <em
class="jxr_comment">// channels[0] =</em>
-<a class="jxr_linenumber" name="L66" href="#L66">66</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong>
channel = 0; channel < channelCount; channel++) {
-<a class="jxr_linenumber" name="L67" href="#L67">67</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> y =
0; y < height; y++) {
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>
<strong class="jxr_keyword">final</strong> <strong
class="jxr_keyword">int</strong> index = channel * height + y;
-<a class="jxr_linenumber" name="L69" href="#L69">69</a>
<strong class="jxr_keyword">final</strong> byte[] packed =
BinaryFunctions.readBytes(<span class="jxr_string">"scanline"</span>,
-<a class="jxr_linenumber" name="L70" href="#L70">70</a>
is, scanlineBytecounts[index],
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>
<span class="jxr_string">"PSD: Missing Image Data"</span>);
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>
-<a class="jxr_linenumber" name="L73" href="#L73">73</a>
<strong class="jxr_keyword">final</strong> byte[] unpacked = <strong
class="jxr_keyword">new</strong> <a
href="../../../../../../../org/apache/commons/imaging/common/PackBits.html">PackBits</a>().decompress(packed,
width);
-<a class="jxr_linenumber" name="L74" href="#L74">74</a>
<strong class="jxr_keyword">final</strong> InputStream bais = <strong
class="jxr_keyword">new</strong> ByteArrayInputStream(unpacked);
-<a class="jxr_linenumber" name="L75" href="#L75">75</a>
<strong class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/commons/imaging/common/mylzw/MyBitInputStream.html">MyBitInputStream</a>
mbis = <strong class="jxr_keyword">new</strong> <a
href="../../../../../../../org/apache/commons/imaging/common/mylzw/MyBitInputStream.html">MyBitInputStream</a>(bais,
ByteOrder.BIG_ENDIAN);
-<a class="jxr_linenumber" name="L76" href="#L76">76</a> <a
href="../../../../../../../org/apache/commons/imaging/common/mylzw/BitsToByteInputStream.html">BitsToByteInputStream</a>
bbis = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L77" href="#L77">77</a>
<strong class="jxr_keyword">boolean</strong> canThrow = false;
-<a class="jxr_linenumber" name="L78" href="#L78">78</a>
<strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L79" href="#L79">79</a>
bbis = <strong class="jxr_keyword">new</strong> <a
href="../../../../../../../org/apache/commons/imaging/common/mylzw/BitsToByteInputStream.html">BitsToByteInputStream</a>(mbis,
8); <em class="jxr_comment">// we want all samples to be bytes</em>
-<a class="jxr_linenumber" name="L80" href="#L80">80</a>
<strong class="jxr_keyword">final</strong> <strong
class="jxr_keyword">int</strong>[] scanline = bbis.readBitsArray(depth, width);
-<a class="jxr_linenumber" name="L81" href="#L81">81</a>
data[channel][y] = scanline;
-<a class="jxr_linenumber" name="L82" href="#L82">82</a>
canThrow = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L83" href="#L83">83</a> }
<strong class="jxr_keyword">finally</strong> {
-<a class="jxr_linenumber" name="L84" href="#L84">84</a>
IoUtils.closeQuietly(canThrow, bbis);
-<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> }
-<a class="jxr_linenumber" name="L88" href="#L88">88</a>
-<a class="jxr_linenumber" name="L89" href="#L89">89</a>
dataParser.parseData(data, bi, imageContents);
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>
-<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="L38" href="#L38">38</a> <strong
class="jxr_keyword">private</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/psd/dataparsers/DataParser.html">DataParser</a>
dataParser;
+<a class="jxr_linenumber" name="L39" href="#L39">39</a>
+<a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong
class="jxr_keyword">public</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.html">CompressedDataReader</a>(<strong
class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/psd/dataparsers/DataParser.html">DataParser</a>
dataParser) {
+<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong
class="jxr_keyword">this</strong>.dataParser = dataParser;
+<a class="jxr_linenumber" name="L42" href="#L42">42</a> }
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>
+<a class="jxr_linenumber" name="L44" href="#L44">44</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
readData(<strong class="jxr_keyword">final</strong> InputStream is, <strong
class="jxr_keyword">final</strong> BufferedImage bi,
+<a class="jxr_linenumber" name="L45" href="#L45">45</a> <strong
class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/psd/ImageContents.html">ImageContents</a>
imageContents, <strong class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/commons/imaging/common/BinaryFileParser.html">BinaryFileParser</a>
bfp)
+<a class="jxr_linenumber" name="L46" href="#L46">46</a> <strong
class="jxr_keyword">throws</strong> ImageReadException, IOException {
+<a class="jxr_linenumber" name="L47" href="#L47">47</a> <strong
class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/psd/PsdHeaderInfo.html">PsdHeaderInfo</a>
header = imageContents.header;
+<a class="jxr_linenumber" name="L48" href="#L48">48</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong>
width = header.columns;
+<a class="jxr_linenumber" name="L49" href="#L49">49</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong>
height = header.rows;
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>
+<a class="jxr_linenumber" name="L51" href="#L51">51</a> <em
class="jxr_comment">// this.setDebug(true);</em>
+<a class="jxr_linenumber" name="L52" href="#L52">52</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong>
scanlineCount = height * header.channels;
+<a class="jxr_linenumber" name="L53" href="#L53">53</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong>[]
scanlineBytecounts = <strong class="jxr_keyword">new</strong> <strong
class="jxr_keyword">int</strong>[scanlineCount];
+<a class="jxr_linenumber" name="L54" href="#L54">54</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i =
0; i < scanlineCount; i++) {
+<a class="jxr_linenumber" name="L55" href="#L55">55</a>
scanlineBytecounts[i] = BinaryFunctions.read2Bytes(<span
class="jxr_string">"scanline_bytecount["</span> + i
+<a class="jxr_linenumber" name="L56" href="#L56">56</a> +
<span class="jxr_string">"]"</span>, is, <span class="jxr_string">"PSD: bad
Image Data"</span>, bfp.getByteOrder());
+<a class="jxr_linenumber" name="L57" href="#L57">57</a> }
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>
bfp.setDebug(false);
+<a class="jxr_linenumber" name="L59" href="#L59">59</a> <em
class="jxr_comment">// System.out.println("fImageContents.Compression: "</em>
+<a class="jxr_linenumber" name="L60" href="#L60">60</a> <em
class="jxr_comment">// + imageContents.Compression);</em>
+<a class="jxr_linenumber" name="L61" href="#L61">61</a>
+<a class="jxr_linenumber" name="L62" href="#L62">62</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong>
depth = header.depth;
+<a class="jxr_linenumber" name="L63" href="#L63">63</a>
+<a class="jxr_linenumber" name="L64" href="#L64">64</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong>
channelCount = dataParser.getBasicChannelsCount();
+<a class="jxr_linenumber" name="L65" href="#L65">65</a> <strong
class="jxr_keyword">final</strong> <strong
class="jxr_keyword">int</strong>[][][] data = <strong
class="jxr_keyword">new</strong> <strong
class="jxr_keyword">int</strong>[channelCount][height][];
+<a class="jxr_linenumber" name="L66" href="#L66">66</a> <em
class="jxr_comment">// channels[0] =</em>
+<a class="jxr_linenumber" name="L67" href="#L67">67</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong>
channel = 0; channel < channelCount; channel++) {
+<a class="jxr_linenumber" name="L68" href="#L68">68</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> y =
0; y < height; y++) {
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>
<strong class="jxr_keyword">final</strong> <strong
class="jxr_keyword">int</strong> index = channel * height + y;
+<a class="jxr_linenumber" name="L70" href="#L70">70</a>
<strong class="jxr_keyword">final</strong> byte[] packed =
BinaryFunctions.readBytes(<span class="jxr_string">"scanline"</span>,
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>
is, scanlineBytecounts[index],
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>
<span class="jxr_string">"PSD: Missing Image Data"</span>);
+<a class="jxr_linenumber" name="L73" href="#L73">73</a>
+<a class="jxr_linenumber" name="L74" href="#L74">74</a>
<strong class="jxr_keyword">final</strong> byte[] unpacked = <strong
class="jxr_keyword">new</strong> <a
href="../../../../../../../org/apache/commons/imaging/common/PackBits.html">PackBits</a>().decompress(packed,
width);
+<a class="jxr_linenumber" name="L75" href="#L75">75</a>
<strong class="jxr_keyword">final</strong> InputStream bais = <strong
class="jxr_keyword">new</strong> ByteArrayInputStream(unpacked);
+<a class="jxr_linenumber" name="L76" href="#L76">76</a>
<strong class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/commons/imaging/common/mylzw/MyBitInputStream.html">MyBitInputStream</a>
mbis = <strong class="jxr_keyword">new</strong> <a
href="../../../../../../../org/apache/commons/imaging/common/mylzw/MyBitInputStream.html">MyBitInputStream</a>(bais,
ByteOrder.BIG_ENDIAN);
+<a class="jxr_linenumber" name="L77" href="#L77">77</a> <a
href="../../../../../../../org/apache/commons/imaging/common/mylzw/BitsToByteInputStream.html">BitsToByteInputStream</a>
bbis = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L78" href="#L78">78</a>
<strong class="jxr_keyword">boolean</strong> canThrow = false;
+<a class="jxr_linenumber" name="L79" href="#L79">79</a>
<strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L80" href="#L80">80</a>
bbis = <strong class="jxr_keyword">new</strong> <a
href="../../../../../../../org/apache/commons/imaging/common/mylzw/BitsToByteInputStream.html">BitsToByteInputStream</a>(mbis,
8); <em class="jxr_comment">// we want all samples to be bytes</em>
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>
<strong class="jxr_keyword">final</strong> <strong
class="jxr_keyword">int</strong>[] scanline = bbis.readBitsArray(depth, width);
+<a class="jxr_linenumber" name="L82" href="#L82">82</a>
data[channel][y] = scanline;
+<a class="jxr_linenumber" name="L83" href="#L83">83</a>
canThrow = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L84" href="#L84">84</a> }
<strong class="jxr_keyword">finally</strong> {
+<a class="jxr_linenumber" name="L85" href="#L85">85</a>
IoUtils.closeQuietly(canThrow, bbis);
+<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> }
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>
+<a class="jxr_linenumber" name="L90" href="#L90">90</a>
dataParser.parseData(data, bi, imageContents);
+<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> }
</pre>
<hr/>
<div id="footer">Copyright © 2007–2015 <a
href="http://www.apache.org/">The Apache Software Foundation</a>. All rights
reserved.</div>
Modified:
websites/production/commons/content/proper/commons-imaging/xref/org/apache/commons/imaging/formats/psd/datareaders/DataReader.html
==============================================================================
---
websites/production/commons/content/proper/commons-imaging/xref/org/apache/commons/imaging/formats/psd/datareaders/DataReader.html
(original)
+++
websites/production/commons/content/proper/commons-imaging/xref/org/apache/commons/imaging/formats/psd/datareaders/DataReader.html
Sun Jan 11 12:33:25 2015
@@ -33,17 +33,13 @@
<a class="jxr_linenumber" name="L25" href="#L25">25</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.psd.ImageContents;
<a class="jxr_linenumber" name="L26" href="#L26">26</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.psd.dataparsers.DataParser;
<a class="jxr_linenumber" name="L27" href="#L27">27</a>
-<a class="jxr_linenumber" name="L28" href="#L28">28</a> <strong
class="jxr_keyword">public</strong> <strong
class="jxr_keyword">abstract</strong> <strong
class="jxr_keyword">class</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/psd/datareaders/DataReader.html">DataReader</a>
{
-<a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong
class="jxr_keyword">protected</strong> <strong
class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/psd/dataparsers/DataParser.html">DataParser</a>
dataParser;
-<a class="jxr_linenumber" name="L30" href="#L30">30</a>
-<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong
class="jxr_keyword">public</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/psd/datareaders/DataReader.html">DataReader</a>(<strong
class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/psd/dataparsers/DataParser.html">DataParser</a>
fDataParser) {
-<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong
class="jxr_keyword">this</strong>.dataParser = fDataParser;
-<a class="jxr_linenumber" name="L33" href="#L33">33</a> }
-<a class="jxr_linenumber" name="L34" href="#L34">34</a>
-<a class="jxr_linenumber" name="L35" href="#L35">35</a> <strong
class="jxr_keyword">public</strong> <strong
class="jxr_keyword">abstract</strong> <strong class="jxr_keyword">void</strong>
readData(InputStream is, BufferedImage bi,
-<a class="jxr_linenumber" name="L36" href="#L36">36</a> <a
href="../../../../../../../org/apache/commons/imaging/formats/psd/ImageContents.html">ImageContents</a>
imageContents, <a
href="../../../../../../../org/apache/commons/imaging/common/BinaryFileParser.html">BinaryFileParser</a>
bfp)
-<a class="jxr_linenumber" name="L37" href="#L37">37</a> <strong
class="jxr_keyword">throws</strong> ImageReadException, IOException;
-<a class="jxr_linenumber" name="L38" href="#L38">38</a> }
+<a class="jxr_linenumber" name="L28" href="#L28">28</a> <strong
class="jxr_keyword">public</strong> <strong
class="jxr_keyword">interface</strong> DataReader {
+<a class="jxr_linenumber" name="L29" href="#L29">29</a>
+<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong
class="jxr_keyword">void</strong> readData(InputStream is, BufferedImage bi,
+<a class="jxr_linenumber" name="L31" href="#L31">31</a> <a
href="../../../../../../../org/apache/commons/imaging/formats/psd/ImageContents.html">ImageContents</a>
imageContents, <a
href="../../../../../../../org/apache/commons/imaging/common/BinaryFileParser.html">BinaryFileParser</a>
bfp)
+<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong
class="jxr_keyword">throws</strong> ImageReadException, IOException;
+<a class="jxr_linenumber" name="L33" href="#L33">33</a>
+<a class="jxr_linenumber" name="L34" href="#L34">34</a> }
</pre>
<hr/>
<div id="footer">Copyright © 2007–2015 <a
href="http://www.apache.org/">The Apache Software Foundation</a>. All rights
reserved.</div>
Modified:
websites/production/commons/content/proper/commons-imaging/xref/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.html
==============================================================================
---
websites/production/commons/content/proper/commons-imaging/xref/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.html
(original)
+++
websites/production/commons/content/proper/commons-imaging/xref/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.html
Sun Jan 11 12:33:25 2015
@@ -38,48 +38,50 @@
<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.psd.dataparsers.DataParser;
<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong
class="jxr_keyword">import</strong> org.apache.commons.imaging.util.IoUtils;
<a class="jxr_linenumber" name="L32" href="#L32">32</a>
-<a class="jxr_linenumber" name="L33" href="#L33">33</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong>
<a
href="../../../../../../../org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.html">UncompressedDataReader</a>
<strong class="jxr_keyword">extends</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/psd/datareaders/DataReader.html">DataReader</a>
{
-<a class="jxr_linenumber" name="L34" href="#L34">34</a> <strong
class="jxr_keyword">public</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.html">UncompressedDataReader</a>(<strong
class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/psd/dataparsers/DataParser.html">DataParser</a>
fDataParser) {
-<a class="jxr_linenumber" name="L35" href="#L35">35</a> <strong
class="jxr_keyword">super</strong>(fDataParser);
-<a class="jxr_linenumber" name="L36" href="#L36">36</a> }
-<a class="jxr_linenumber" name="L37" href="#L37">37</a>
-<a class="jxr_linenumber" name="L38" href="#L38">38</a> @Override
-<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
readData(<strong class="jxr_keyword">final</strong> InputStream is, <strong
class="jxr_keyword">final</strong> BufferedImage bi,
-<a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong
class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/psd/ImageContents.html">ImageContents</a>
imageContents, <strong class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/commons/imaging/common/BinaryFileParser.html">BinaryFileParser</a>
bfp)
-<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong
class="jxr_keyword">throws</strong> ImageReadException, IOException {
-<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong
class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/psd/PsdHeaderInfo.html">PsdHeaderInfo</a>
header = imageContents.header;
-<a class="jxr_linenumber" name="L43" href="#L43">43</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong>
width = header.columns;
-<a class="jxr_linenumber" name="L44" href="#L44">44</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong>
height = header.rows;
-<a class="jxr_linenumber" name="L45" href="#L45">45</a>
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>
bfp.setDebug(false);
+<a class="jxr_linenumber" name="L33" href="#L33">33</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong>
<a
href="../../../../../../../org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.html">UncompressedDataReader</a>
<strong class="jxr_keyword">implements</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/psd/datareaders/DataReader.html">DataReader</a>
{
+<a class="jxr_linenumber" name="L34" href="#L34">34</a>
+<a class="jxr_linenumber" name="L35" href="#L35">35</a> <strong
class="jxr_keyword">private</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/psd/dataparsers/DataParser.html">DataParser</a>
dataParser;
+<a class="jxr_linenumber" name="L36" href="#L36">36</a>
+<a class="jxr_linenumber" name="L37" href="#L37">37</a> <strong
class="jxr_keyword">public</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.html">UncompressedDataReader</a>(<strong
class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/psd/dataparsers/DataParser.html">DataParser</a>
dataParser) {
+<a class="jxr_linenumber" name="L38" href="#L38">38</a> <strong
class="jxr_keyword">this</strong>.dataParser = dataParser;
+<a class="jxr_linenumber" name="L39" href="#L39">39</a> }
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>
+<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
readData(<strong class="jxr_keyword">final</strong> InputStream is, <strong
class="jxr_keyword">final</strong> BufferedImage bi,
+<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong
class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/psd/ImageContents.html">ImageContents</a>
imageContents, <strong class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/commons/imaging/common/BinaryFileParser.html">BinaryFileParser</a>
bfp)
+<a class="jxr_linenumber" name="L43" href="#L43">43</a> <strong
class="jxr_keyword">throws</strong> ImageReadException, IOException {
+<a class="jxr_linenumber" name="L44" href="#L44">44</a> <strong
class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/psd/PsdHeaderInfo.html">PsdHeaderInfo</a>
header = imageContents.header;
+<a class="jxr_linenumber" name="L45" href="#L45">45</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong>
width = header.columns;
+<a class="jxr_linenumber" name="L46" href="#L46">46</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong>
height = header.rows;
<a class="jxr_linenumber" name="L47" href="#L47">47</a>
-<a class="jxr_linenumber" name="L48" href="#L48">48</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong>
channelCount = dataParser.getBasicChannelsCount();
-<a class="jxr_linenumber" name="L49" href="#L49">49</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong>
depth = header.depth;
-<a class="jxr_linenumber" name="L50" href="#L50">50</a> <strong
class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/commons/imaging/common/mylzw/MyBitInputStream.html">MyBitInputStream</a>
mbis = <strong class="jxr_keyword">new</strong> <a
href="../../../../../../../org/apache/commons/imaging/common/mylzw/MyBitInputStream.html">MyBitInputStream</a>(is,
ByteOrder.BIG_ENDIAN);
-<a class="jxr_linenumber" name="L51" href="#L51">51</a> <em
class="jxr_comment">// we want all samples to be bytes</em>
-<a class="jxr_linenumber" name="L52" href="#L52">52</a> <a
href="../../../../../../../org/apache/commons/imaging/common/mylzw/BitsToByteInputStream.html">BitsToByteInputStream</a>
bbis = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L53" href="#L53">53</a> <strong
class="jxr_keyword">boolean</strong> canThrow = false;
-<a class="jxr_linenumber" name="L54" href="#L54">54</a> <strong
class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L55" href="#L55">55</a> bbis =
<strong class="jxr_keyword">new</strong> <a
href="../../../../../../../org/apache/commons/imaging/common/mylzw/BitsToByteInputStream.html">BitsToByteInputStream</a>(mbis,
8);
-<a class="jxr_linenumber" name="L56" href="#L56">56</a>
-<a class="jxr_linenumber" name="L57" href="#L57">57</a> <strong
class="jxr_keyword">final</strong> <strong
class="jxr_keyword">int</strong>[][][] data = <strong
class="jxr_keyword">new</strong> <strong
class="jxr_keyword">int</strong>[channelCount][height][width];
-<a class="jxr_linenumber" name="L58" href="#L58">58</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong>
channel = 0; channel < channelCount; channel++) {
-<a class="jxr_linenumber" name="L59" href="#L59">59</a>
<strong class="jxr_keyword">for</strong> (<strong
class="jxr_keyword">int</strong> y = 0; y < height; y++) {
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>
<strong class="jxr_keyword">for</strong> (<strong
class="jxr_keyword">int</strong> x = 0; x < width; x++) {
-<a class="jxr_linenumber" name="L61" href="#L61">61</a>
<strong class="jxr_keyword">final</strong> <strong
class="jxr_keyword">int</strong> b = bbis.readBits(depth);
-<a class="jxr_linenumber" name="L62" href="#L62">62</a>
-<a class="jxr_linenumber" name="L63" href="#L63">63</a>
data[channel][y][x] = (byte) b;
-<a class="jxr_linenumber" name="L64" href="#L64">64</a> }
-<a class="jxr_linenumber" name="L65" href="#L65">65</a> }
-<a class="jxr_linenumber" name="L66" href="#L66">66</a> }
-<a class="jxr_linenumber" name="L67" href="#L67">67</a>
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>
dataParser.parseData(data, bi, imageContents);
-<a class="jxr_linenumber" name="L69" href="#L69">69</a> canThrow
= <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L70" href="#L70">70</a> } <strong
class="jxr_keyword">finally</strong> {
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>
IoUtils.closeQuietly(canThrow, bbis);
-<a class="jxr_linenumber" name="L72" href="#L72">72</a> }
-<a class="jxr_linenumber" name="L73" href="#L73">73</a> }
-<a class="jxr_linenumber" name="L74" href="#L74">74</a> }
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>
bfp.setDebug(false);
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>
+<a class="jxr_linenumber" name="L50" href="#L50">50</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong>
channelCount = dataParser.getBasicChannelsCount();
+<a class="jxr_linenumber" name="L51" href="#L51">51</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong>
depth = header.depth;
+<a class="jxr_linenumber" name="L52" href="#L52">52</a> <strong
class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/commons/imaging/common/mylzw/MyBitInputStream.html">MyBitInputStream</a>
mbis = <strong class="jxr_keyword">new</strong> <a
href="../../../../../../../org/apache/commons/imaging/common/mylzw/MyBitInputStream.html">MyBitInputStream</a>(is,
ByteOrder.BIG_ENDIAN);
+<a class="jxr_linenumber" name="L53" href="#L53">53</a> <em
class="jxr_comment">// we want all samples to be bytes</em>
+<a class="jxr_linenumber" name="L54" href="#L54">54</a> <a
href="../../../../../../../org/apache/commons/imaging/common/mylzw/BitsToByteInputStream.html">BitsToByteInputStream</a>
bbis = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L55" href="#L55">55</a> <strong
class="jxr_keyword">boolean</strong> canThrow = false;
+<a class="jxr_linenumber" name="L56" href="#L56">56</a> <strong
class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L57" href="#L57">57</a> bbis =
<strong class="jxr_keyword">new</strong> <a
href="../../../../../../../org/apache/commons/imaging/common/mylzw/BitsToByteInputStream.html">BitsToByteInputStream</a>(mbis,
8);
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>
+<a class="jxr_linenumber" name="L59" href="#L59">59</a> <strong
class="jxr_keyword">final</strong> <strong
class="jxr_keyword">int</strong>[][][] data = <strong
class="jxr_keyword">new</strong> <strong
class="jxr_keyword">int</strong>[channelCount][height][width];
+<a class="jxr_linenumber" name="L60" href="#L60">60</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong>
channel = 0; channel < channelCount; channel++) {
+<a class="jxr_linenumber" name="L61" href="#L61">61</a>
<strong class="jxr_keyword">for</strong> (<strong
class="jxr_keyword">int</strong> y = 0; y < height; y++) {
+<a class="jxr_linenumber" name="L62" href="#L62">62</a>
<strong class="jxr_keyword">for</strong> (<strong
class="jxr_keyword">int</strong> x = 0; x < width; x++) {
+<a class="jxr_linenumber" name="L63" href="#L63">63</a>
<strong class="jxr_keyword">final</strong> <strong
class="jxr_keyword">int</strong> b = bbis.readBits(depth);
+<a class="jxr_linenumber" name="L64" href="#L64">64</a>
+<a class="jxr_linenumber" name="L65" href="#L65">65</a>
data[channel][y][x] = (byte) b;
+<a class="jxr_linenumber" name="L66" href="#L66">66</a> }
+<a class="jxr_linenumber" name="L67" href="#L67">67</a> }
+<a class="jxr_linenumber" name="L68" href="#L68">68</a> }
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>
+<a class="jxr_linenumber" name="L70" href="#L70">70</a>
dataParser.parseData(data, bi, imageContents);
+<a class="jxr_linenumber" name="L71" href="#L71">71</a> canThrow
= <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L72" href="#L72">72</a> } <strong
class="jxr_keyword">finally</strong> {
+<a class="jxr_linenumber" name="L73" href="#L73">73</a>
IoUtils.closeQuietly(canThrow, bbis);
+<a class="jxr_linenumber" name="L74" href="#L74">74</a> }
+<a class="jxr_linenumber" name="L75" href="#L75">75</a> }
+<a class="jxr_linenumber" name="L76" href="#L76">76</a> }
</pre>
<hr/>
<div id="footer">Copyright © 2007–2015 <a
href="http://www.apache.org/">The Apache Software Foundation</a>. All rights
reserved.</div>
Modified:
websites/production/commons/content/proper/commons-imaging/xref/org/apache/commons/imaging/formats/tiff/TiffField.html
==============================================================================
---
websites/production/commons/content/proper/commons-imaging/xref/org/apache/commons/imaging/formats/tiff/TiffField.html
(original)
+++
websites/production/commons/content/proper/commons-imaging/xref/org/apache/commons/imaging/formats/tiff/TiffField.html
Sun Jan 11 12:33:25 2015
@@ -32,7 +32,7 @@
<a class="jxr_linenumber" name="L24" href="#L24">24</a> <strong
class="jxr_keyword">import</strong> java.text.SimpleDateFormat;
<a class="jxr_linenumber" name="L25" href="#L25">25</a> <strong
class="jxr_keyword">import</strong> java.util.ArrayList;
<a class="jxr_linenumber" name="L26" href="#L26">26</a> <strong
class="jxr_keyword">import</strong> java.util.Date;
-<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong
class="jxr_keyword">import</strong> java.util.Hashtable;
+<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong
class="jxr_keyword">import</strong> java.util.HashMap;
<a class="jxr_linenumber" name="L28" href="#L28">28</a> <strong
class="jxr_keyword">import</strong> java.util.List;
<a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong
class="jxr_keyword">import</strong> java.util.Locale;
<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong
class="jxr_keyword">import</strong> java.util.Map;
@@ -59,7 +59,7 @@
<a class="jxr_linenumber" name="L51" href="#L51">51</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong>
byte[] value;
<a class="jxr_linenumber" name="L52" href="#L52">52</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong>
ByteOrder byteOrder;
<a class="jxr_linenumber" name="L53" href="#L53">53</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong>
<strong class="jxr_keyword">int</strong> sortHint;
-<a class="jxr_linenumber" name="L54" href="#L54">54</a> <strong
class="jxr_keyword">private</strong> <strong
class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong>
Map<Object, List<TagInfo>> ALL_TAG_MAP =
makeTagMap(AllTagConstants.ALL_TAGS);
+<a class="jxr_linenumber" name="L54" href="#L54">54</a> <strong
class="jxr_keyword">private</strong> <strong
class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong>
Map<Integer, List<TagInfo>> ALL_TAG_MAP =
makeTagMap(AllTagConstants.ALL_TAGS);
<a class="jxr_linenumber" name="L55" href="#L55">55</a>
<a class="jxr_linenumber" name="L56" href="#L56">56</a> <strong
class="jxr_keyword">public</strong> <a
href="../../../../../../org/apache/commons/imaging/formats/tiff/TiffField.html">TiffField</a>(<strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong>
tag, <strong class="jxr_keyword">final</strong> <strong
class="jxr_keyword">int</strong> directoryType, <strong
class="jxr_keyword">final</strong> <a
href="../../../../../../org/apache/commons/imaging/formats/tiff/fieldtypes/FieldType.html">FieldType</a>
fieldType,
<a class="jxr_linenumber" name="L57" href="#L57">57</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong>
count, <strong class="jxr_keyword">final</strong> <strong
class="jxr_keyword">long</strong> offset, <strong
class="jxr_keyword">final</strong> byte[] value,
@@ -567,10 +567,10 @@
<a class="jxr_linenumber" name="L559" href="#L559">559</a> <strong
class="jxr_keyword">return</strong> (String) o;
<a class="jxr_linenumber" name="L560" href="#L560">560</a> }
<a class="jxr_linenumber" name="L561" href="#L561">561</a>
-<a class="jxr_linenumber" name="L562" href="#L562">562</a> <strong
class="jxr_keyword">private</strong> <strong
class="jxr_keyword">static</strong> Map<Object, List<TagInfo>>
makeTagMap(
+<a class="jxr_linenumber" name="L562" href="#L562">562</a> <strong
class="jxr_keyword">private</strong> <strong
class="jxr_keyword">static</strong> Map<Integer, List<TagInfo>>
makeTagMap(
<a class="jxr_linenumber" name="L563" href="#L563">563</a> <strong
class="jxr_keyword">final</strong> List<TagInfo> tags) {
<a class="jxr_linenumber" name="L564" href="#L564">564</a> <em
class="jxr_comment">// make sure to use the thread-safe version; this is shared
state.</em>
-<a class="jxr_linenumber" name="L565" href="#L565">565</a> <strong
class="jxr_keyword">final</strong> Map<Object, List<TagInfo>> map =
<strong class="jxr_keyword">new</strong> Hashtable<Object,
List<TagInfo>>();
+<a class="jxr_linenumber" name="L565" href="#L565">565</a> <strong
class="jxr_keyword">final</strong> Map<Integer, List<TagInfo>> map
= <strong class="jxr_keyword">new</strong> HashMap<Integer,
List<TagInfo>>();
<a class="jxr_linenumber" name="L566" href="#L566">566</a>
<a class="jxr_linenumber" name="L567" href="#L567">567</a> <strong
class="jxr_keyword">for</strong> (TagInfo tag : tags) {
<a class="jxr_linenumber" name="L568" href="#L568">568</a>
List<TagInfo> tagList = map.get(tag.tag);
Modified:
websites/production/commons/content/proper/commons-imaging/xref/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.html
==============================================================================
---
websites/production/commons/content/proper/commons-imaging/xref/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.html
(original)
+++
websites/production/commons/content/proper/commons-imaging/xref/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.html
Sun Jan 11 12:33:25 2015
@@ -28,7 +28,7 @@
<a class="jxr_linenumber" name="L20" href="#L20">20</a> <strong
class="jxr_keyword">import</strong> java.io.IOException;
<a class="jxr_linenumber" name="L21" href="#L21">21</a> <strong
class="jxr_keyword">import</strong> java.nio.ByteOrder;
<a class="jxr_linenumber" name="L22" href="#L22">22</a> <strong
class="jxr_keyword">import</strong> java.util.ArrayList;
-<a class="jxr_linenumber" name="L23" href="#L23">23</a> <strong
class="jxr_keyword">import</strong> java.util.Hashtable;
+<a class="jxr_linenumber" name="L23" href="#L23">23</a> <strong
class="jxr_keyword">import</strong> java.util.HashMap;
<a class="jxr_linenumber" name="L24" href="#L24">24</a> <strong
class="jxr_keyword">import</strong> java.util.List;
<a class="jxr_linenumber" name="L25" href="#L25">25</a> <strong
class="jxr_keyword">import</strong> java.util.Map;
<a class="jxr_linenumber" name="L26" href="#L26">26</a>
@@ -61,14 +61,14 @@
<a class="jxr_linenumber" name="L53" href="#L53">53</a>
<a class="jxr_linenumber" name="L54" href="#L54">54</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong>
<a
href="../../../../../../org/apache/commons/imaging/formats/tiff/TiffImageMetadata.html">TiffImageMetadata</a>
<strong class="jxr_keyword">extends</strong> <a
href="../../../../../../org/apache/commons/imaging/common/GenericImageMetadata.html">GenericImageMetadata</a>
{
<a class="jxr_linenumber" name="L55" href="#L55">55</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong>
<a
href="../../../../../../org/apache/commons/imaging/formats/tiff/TiffContents.html">TiffContents</a>
contents;
-<a class="jxr_linenumber" name="L56" href="#L56">56</a> <strong
class="jxr_keyword">private</strong> <strong
class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong>
Map<Object, Integer> TAG_COUNTS = countTags(AllTagConstants.ALL_TAGS);
+<a class="jxr_linenumber" name="L56" href="#L56">56</a> <strong
class="jxr_keyword">private</strong> <strong
class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong>
Map<Integer, Integer> TAG_COUNTS = countTags(AllTagConstants.ALL_TAGS);
<a class="jxr_linenumber" name="L57" href="#L57">57</a>
<a class="jxr_linenumber" name="L58" href="#L58">58</a> <strong
class="jxr_keyword">public</strong> <a
href="../../../../../../org/apache/commons/imaging/formats/tiff/TiffImageMetadata.html">TiffImageMetadata</a>(<strong
class="jxr_keyword">final</strong> <a
href="../../../../../../org/apache/commons/imaging/formats/tiff/TiffContents.html">TiffContents</a>
contents) {
<a class="jxr_linenumber" name="L59" href="#L59">59</a> <strong
class="jxr_keyword">this</strong>.contents = contents;
<a class="jxr_linenumber" name="L60" href="#L60">60</a> }
<a class="jxr_linenumber" name="L61" href="#L61">61</a>
-<a class="jxr_linenumber" name="L62" href="#L62">62</a> <strong
class="jxr_keyword">private</strong> <strong
class="jxr_keyword">static</strong> Map<Object, Integer>
countTags(<strong class="jxr_keyword">final</strong> List<TagInfo> tags) {
-<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong
class="jxr_keyword">final</strong> Map<Object, Integer> map = <strong
class="jxr_keyword">new</strong> Hashtable<Object, Integer>();
+<a class="jxr_linenumber" name="L62" href="#L62">62</a> <strong
class="jxr_keyword">private</strong> <strong
class="jxr_keyword">static</strong> Map<Integer, Integer>
countTags(<strong class="jxr_keyword">final</strong> List<TagInfo> tags) {
+<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong
class="jxr_keyword">final</strong> Map<Integer, Integer> map = <strong
class="jxr_keyword">new</strong> HashMap<Integer, Integer>();
<a class="jxr_linenumber" name="L64" href="#L64">64</a>
<a class="jxr_linenumber" name="L65" href="#L65">65</a> <strong
class="jxr_keyword">for</strong> (TagInfo tag : tags) {
<a class="jxr_linenumber" name="L66" href="#L66">66</a> <strong
class="jxr_keyword">final</strong> Integer count = map.get(tag.tag);
Modified:
websites/production/commons/content/proper/commons-imaging/xref/org/apache/commons/imaging/formats/tiff/constants/AdobePhotoshopTagConstants.html
==============================================================================
---
websites/production/commons/content/proper/commons-imaging/xref/org/apache/commons/imaging/formats/tiff/constants/AdobePhotoshopTagConstants.html
(original)
+++
websites/production/commons/content/proper/commons-imaging/xref/org/apache/commons/imaging/formats/tiff/constants/AdobePhotoshopTagConstants.html
Sun Jan 11 12:33:25 2015
@@ -48,10 +48,10 @@
<a class="jxr_linenumber" name="L40" href="#L40">40</a>
TiffDirectoryType.EXIF_DIRECTORY_IFD0);
<a class="jxr_linenumber" name="L41" href="#L41">41</a>
<a class="jxr_linenumber" name="L42" href="#L42">42</a>
List<TagInfo> ALL_ADOBE_PHOTOSHOP_TAGS =
-<a class="jxr_linenumber" name="L43" href="#L43">43</a>
Collections.unmodifiableList(Arrays.asList(<strong
class="jxr_keyword">new</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/tiff/taginfos/TagInfo.html">TagInfo</a>[]
{
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>
Collections.unmodifiableList(Arrays.<TagInfo> asList(
<a class="jxr_linenumber" name="L44" href="#L44">44</a>
EXIF_TAG_JPEGTABLES,
<a class="jxr_linenumber" name="L45" href="#L45">45</a>
EXIF_TAG_IMAGE_SOURCE_DATA
-<a class="jxr_linenumber" name="L46" href="#L46">46</a> }));
+<a class="jxr_linenumber" name="L46" href="#L46">46</a> ));
<a class="jxr_linenumber" name="L47" href="#L47">47</a> }
</pre>
<hr/>
Modified:
websites/production/commons/content/proper/commons-imaging/xref/org/apache/commons/imaging/formats/tiff/constants/AliasSketchbookProTagConstants.html
==============================================================================
---
websites/production/commons/content/proper/commons-imaging/xref/org/apache/commons/imaging/formats/tiff/constants/AliasSketchbookProTagConstants.html
(original)
+++
websites/production/commons/content/proper/commons-imaging/xref/org/apache/commons/imaging/formats/tiff/constants/AliasSketchbookProTagConstants.html
Sun Jan 11 12:33:25 2015
@@ -42,8 +42,8 @@
<a class="jxr_linenumber" name="L34" href="#L34">34</a>
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
<a class="jxr_linenumber" name="L35" href="#L35">35</a>
<a class="jxr_linenumber" name="L36" href="#L36">36</a>
List<TagInfo> ALL_ALIAS_SKETCHBOOK_PRO_TAGS =
-<a class="jxr_linenumber" name="L37" href="#L37">37</a>
Collections.unmodifiableList(Arrays.asList(<strong
class="jxr_keyword">new</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/tiff/taginfos/TagInfo.html">TagInfo</a>[]
{
-<a class="jxr_linenumber" name="L38" href="#L38">38</a>
EXIF_TAG_ALIAS_LAYER_METADATA}));
+<a class="jxr_linenumber" name="L37" href="#L37">37</a>
Collections.unmodifiableList(Arrays.<TagInfo> asList(
+<a class="jxr_linenumber" name="L38" href="#L38">38</a>
EXIF_TAG_ALIAS_LAYER_METADATA));
<a class="jxr_linenumber" name="L39" href="#L39">39</a> }
</pre>
<hr/>
Modified:
websites/production/commons/content/proper/commons-imaging/xref/org/apache/commons/imaging/formats/tiff/constants/GdalLibraryTagConstants.html
==============================================================================
---
websites/production/commons/content/proper/commons-imaging/xref/org/apache/commons/imaging/formats/tiff/constants/GdalLibraryTagConstants.html
(original)
+++
websites/production/commons/content/proper/commons-imaging/xref/org/apache/commons/imaging/formats/tiff/constants/GdalLibraryTagConstants.html
Sun Jan 11 12:33:25 2015
@@ -48,9 +48,9 @@
<a class="jxr_linenumber" name="L40" href="#L40">40</a>
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
<a class="jxr_linenumber" name="L41" href="#L41">41</a>
<a class="jxr_linenumber" name="L42" href="#L42">42</a>
List<TagInfo> ALL_GDAL_LIBRARY_TAGS =
-<a class="jxr_linenumber" name="L43" href="#L43">43</a>
Collections.unmodifiableList(Arrays.asList(<strong
class="jxr_keyword">new</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/tiff/taginfos/TagInfo.html">TagInfo</a>[]
{
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>
Collections.unmodifiableList(Arrays.<TagInfo> asList(
<a class="jxr_linenumber" name="L44" href="#L44">44</a>
EXIF_TAG_GDAL_METADATA,
-<a class="jxr_linenumber" name="L45" href="#L45">45</a>
EXIF_TAG_GDAL_NO_DATA}));
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>
EXIF_TAG_GDAL_NO_DATA));
<a class="jxr_linenumber" name="L46" href="#L46">46</a> }
</pre>
<hr/>