Modified:
websites/production/commons/content/proper/commons-imaging/xref-test/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.html
==============================================================================
---
websites/production/commons/content/proper/commons-imaging/xref-test/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.html
(original)
+++
websites/production/commons/content/proper/commons-imaging/xref-test/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.html
Sun Jan 11 12:33:25 2015
@@ -36,398 +36,399 @@
<a class="jxr_linenumber" name="L28" href="#L28">28</a> <strong
class="jxr_keyword">import</strong> java.io.OutputStream;
<a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong
class="jxr_keyword">import</strong> java.util.ArrayList;
<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong
class="jxr_keyword">import</strong> java.util.Collections;
-<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong
class="jxr_keyword">import</strong> java.util.HashSet;
-<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong
class="jxr_keyword">import</strong> java.util.Hashtable;
+<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong
class="jxr_keyword">import</strong> java.util.HashMap;
+<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong
class="jxr_keyword">import</strong> java.util.HashSet;
<a class="jxr_linenumber" name="L33" href="#L33">33</a> <strong
class="jxr_keyword">import</strong> java.util.List;
-<a class="jxr_linenumber" name="L34" href="#L34">34</a> <strong
class="jxr_keyword">import</strong> java.util.Set;
-<a class="jxr_linenumber" name="L35" href="#L35">35</a>
-<a class="jxr_linenumber" name="L36" href="#L36">36</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.ImageReadException;
-<a class="jxr_linenumber" name="L37" href="#L37">37</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.ImageWriteException;
-<a class="jxr_linenumber" name="L38" href="#L38">38</a> <strong
class="jxr_keyword">import</strong> org.apache.commons.imaging.Imaging;
-<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.common.ImageMetadata.ImageMetadataItem;
-<a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.common.bytesource.ByteSource;
-<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.common.bytesource.ByteSourceArray;
-<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.common.bytesource.ByteSourceFile;
-<a class="jxr_linenumber" name="L43" href="#L43">43</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
-<a class="jxr_linenumber" name="L44" href="#L44">44</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.jpeg.JpegUtils;
-<a class="jxr_linenumber" name="L45" href="#L45">45</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.tiff.TiffField;
-<a class="jxr_linenumber" name="L46" href="#L46">46</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.tiff.TiffImageMetadata;
-<a class="jxr_linenumber" name="L47" href="#L47">47</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.tiff.constants.AllTagConstants;
-<a class="jxr_linenumber" name="L48" href="#L48">48</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.tiff.fieldtypes.FieldType;
-<a class="jxr_linenumber" name="L49" href="#L49">49</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.tiff.write.TiffOutputSet;
-<a class="jxr_linenumber" name="L50" href="#L50">50</a> <strong
class="jxr_keyword">import</strong> org.apache.commons.imaging.util.Debug;
-<a class="jxr_linenumber" name="L51" href="#L51">51</a> <strong
class="jxr_keyword">import</strong> org.apache.commons.io.FileUtils;
-<a class="jxr_linenumber" name="L52" href="#L52">52</a> <strong
class="jxr_keyword">import</strong> org.junit.Assert;
-<a class="jxr_linenumber" name="L53" href="#L53">53</a> <strong
class="jxr_keyword">import</strong> org.junit.Test;
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>
-<a class="jxr_linenumber" name="L55" href="#L55">55</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong>
<a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.html">ExifRewriteTest</a>
<strong class="jxr_keyword">extends</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/ExifBaseTest.html">ExifBaseTest</a>
<strong class="jxr_keyword">implements</strong> AllTagConstants {
-<a class="jxr_linenumber" name="L56" href="#L56">56</a> <em
class="jxr_comment">// public ExifRewriteTest(String name)</em>
-<a class="jxr_linenumber" name="L57" href="#L57">57</a> <em
class="jxr_comment">// {</em>
-<a class="jxr_linenumber" name="L58" href="#L58">58</a> <em
class="jxr_comment">// super(name);</em>
-<a class="jxr_linenumber" name="L59" href="#L59">59</a> <em
class="jxr_comment">// }</em>
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>
-<a class="jxr_linenumber" name="L61" href="#L61">61</a> @Test
-<a class="jxr_linenumber" name="L62" href="#L62">62</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testRemove() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong
class="jxr_keyword">final</strong> List<File> images =
getImagesWithExifData();
-<a class="jxr_linenumber" name="L64" href="#L64">64</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i =
0; i < images.size(); i++) {
-<a class="jxr_linenumber" name="L65" href="#L65">65</a>
-<a class="jxr_linenumber" name="L66" href="#L66">66</a> <strong
class="jxr_keyword">final</strong> File imageFile = images.get(i);
-<a class="jxr_linenumber" name="L67" href="#L67">67</a>
Debug.debug(<span class="jxr_string">"imageFile"</span>, imageFile);
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>
-<a class="jxr_linenumber" name="L69" href="#L69">69</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong>
ignoreImageData = isPhilHarveyTestImage(imageFile);
-<a class="jxr_linenumber" name="L70" href="#L70">70</a> <strong
class="jxr_keyword">if</strong> (ignoreImageData) {
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>
<strong class="jxr_keyword">continue</strong>;
-<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> <strong
class="jxr_keyword">final</strong> ByteSource byteSource = <strong
class="jxr_keyword">new</strong> ByteSourceFile(imageFile);
-<a class="jxr_linenumber" name="L75" href="#L75">75</a>
Debug.debug(<span class="jxr_string">"Source Segments:"</span>);
-<a class="jxr_linenumber" name="L76" href="#L76">76</a> <strong
class="jxr_keyword">new</strong> JpegUtils().dumpJFIF(byteSource);
-<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>
<strong class="jxr_keyword">final</strong> JpegImageMetadata metadata =
(JpegImageMetadata) Imaging
-<a class="jxr_linenumber" name="L80" href="#L80">80</a>
.getMetadata(imageFile);
-<a class="jxr_linenumber" name="L81" href="#L81">81</a>
Assert.assertNotNull(metadata);
-<a class="jxr_linenumber" name="L82" href="#L82">82</a> }
-<a class="jxr_linenumber" name="L83" href="#L83">83</a>
-<a class="jxr_linenumber" name="L84" href="#L84">84</a> {
-<a class="jxr_linenumber" name="L85" href="#L85">85</a>
<strong class="jxr_keyword">final</strong> ByteArrayOutputStream baos = <strong
class="jxr_keyword">new</strong> ByteArrayOutputStream();
-<a class="jxr_linenumber" name="L86" href="#L86">86</a>
<strong class="jxr_keyword">new</strong>
ExifRewriter().removeExifMetadata(byteSource, baos);
-<a class="jxr_linenumber" name="L87" href="#L87">87</a>
<strong class="jxr_keyword">final</strong> byte[] bytes = baos.toByteArray();
-<a class="jxr_linenumber" name="L88" href="#L88">88</a>
<strong class="jxr_keyword">final</strong> File tempFile = createTempFile(<span
class="jxr_string">"test"</span>, <span class="jxr_string">".jpg"</span>);
-<a class="jxr_linenumber" name="L89" href="#L89">89</a>
Debug.debug(<span class="jxr_string">"tempFile"</span>, tempFile);
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>
FileUtils.writeByteArrayToFile(tempFile, bytes);
-<a class="jxr_linenumber" name="L91" href="#L91">91</a>
-<a class="jxr_linenumber" name="L92" href="#L92">92</a>
Debug.debug(<span class="jxr_string">"Output Segments:"</span>);
-<a class="jxr_linenumber" name="L93" href="#L93">93</a>
<strong class="jxr_keyword">new</strong> JpegUtils().dumpJFIF(<strong
class="jxr_keyword">new</strong> ByteSourceArray(bytes));
-<a class="jxr_linenumber" name="L94" href="#L94">94</a>
-<a class="jxr_linenumber" name="L95" href="#L95">95</a>
assertTrue(!hasExifData(tempFile));
-<a class="jxr_linenumber" name="L96" href="#L96">96</a> }
-<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>
-<a class="jxr_linenumber" name="L100" href="#L100">100</a> @Test
-<a class="jxr_linenumber" name="L101" href="#L101">101</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testInsert() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> <strong
class="jxr_keyword">final</strong> List<File> images =
getImagesWithExifData();
-<a class="jxr_linenumber" name="L103" href="#L103">103</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i =
0; i < images.size(); i++) {
-<a class="jxr_linenumber" name="L104" href="#L104">104</a>
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> <strong
class="jxr_keyword">final</strong> File imageFile = images.get(i);
-<a class="jxr_linenumber" name="L106" href="#L106">106</a>
Debug.debug(<span class="jxr_string">"imageFile"</span>, imageFile);
-<a class="jxr_linenumber" name="L107" href="#L107">107</a>
-<a class="jxr_linenumber" name="L108" href="#L108">108</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong>
ignoreImageData = isPhilHarveyTestImage(imageFile);
-<a class="jxr_linenumber" name="L109" href="#L109">109</a> <strong
class="jxr_keyword">if</strong> (ignoreImageData) {
-<a class="jxr_linenumber" name="L110" href="#L110">110</a>
<strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="L111" href="#L111">111</a> }
-<a class="jxr_linenumber" name="L112" href="#L112">112</a>
-<a class="jxr_linenumber" name="L113" href="#L113">113</a> <strong
class="jxr_keyword">final</strong> ByteSource byteSource = <strong
class="jxr_keyword">new</strong> ByteSourceFile(imageFile);
-<a class="jxr_linenumber" name="L114" href="#L114">114</a>
Debug.debug(<span class="jxr_string">"Source Segments:"</span>);
-<a class="jxr_linenumber" name="L115" href="#L115">115</a> <strong
class="jxr_keyword">new</strong> JpegUtils().dumpJFIF(byteSource);
-<a class="jxr_linenumber" name="L116" href="#L116">116</a>
-<a class="jxr_linenumber" name="L117" href="#L117">117</a> <strong
class="jxr_keyword">final</strong> JpegImageMetadata originalMetadata =
(JpegImageMetadata) Imaging
-<a class="jxr_linenumber" name="L118" href="#L118">118</a>
.getMetadata(imageFile);
-<a class="jxr_linenumber" name="L119" href="#L119">119</a>
assertNotNull(originalMetadata);
-<a class="jxr_linenumber" name="L120" href="#L120">120</a>
-<a class="jxr_linenumber" name="L121" href="#L121">121</a> <strong
class="jxr_keyword">final</strong> TiffImageMetadata oldExifMetadata =
originalMetadata.getExif();
-<a class="jxr_linenumber" name="L122" href="#L122">122</a>
assertNotNull(oldExifMetadata);
-<a class="jxr_linenumber" name="L123" href="#L123">123</a>
-<a class="jxr_linenumber" name="L124" href="#L124">124</a>
ByteSource stripped;
-<a class="jxr_linenumber" name="L125" href="#L125">125</a> {
-<a class="jxr_linenumber" name="L126" href="#L126">126</a>
<strong class="jxr_keyword">final</strong> ByteArrayOutputStream baos = <strong
class="jxr_keyword">new</strong> ByteArrayOutputStream();
-<a class="jxr_linenumber" name="L127" href="#L127">127</a>
<strong class="jxr_keyword">new</strong>
ExifRewriter().removeExifMetadata(byteSource, baos);
-<a class="jxr_linenumber" name="L128" href="#L128">128</a>
<strong class="jxr_keyword">final</strong> byte[] bytes = baos.toByteArray();
-<a class="jxr_linenumber" name="L129" href="#L129">129</a>
<strong class="jxr_keyword">final</strong> File tempFile = createTempFile(<span
class="jxr_string">"removed"</span>, <span class="jxr_string">".jpg"</span>);
-<a class="jxr_linenumber" name="L130" href="#L130">130</a>
Debug.debug(<span class="jxr_string">"tempFile"</span>, tempFile);
-<a class="jxr_linenumber" name="L131" href="#L131">131</a>
FileUtils.writeByteArrayToFile(tempFile, bytes);
-<a class="jxr_linenumber" name="L132" href="#L132">132</a>
-<a class="jxr_linenumber" name="L133" href="#L133">133</a>
Debug.debug(<span class="jxr_string">"Output Segments:"</span>);
-<a class="jxr_linenumber" name="L134" href="#L134">134</a>
stripped = <strong class="jxr_keyword">new</strong> ByteSourceArray(bytes);
-<a class="jxr_linenumber" name="L135" href="#L135">135</a>
<strong class="jxr_keyword">new</strong> JpegUtils().dumpJFIF(stripped);
-<a class="jxr_linenumber" name="L136" href="#L136">136</a>
-<a class="jxr_linenumber" name="L137" href="#L137">137</a>
assertTrue(!hasExifData(tempFile));
-<a class="jxr_linenumber" name="L138" href="#L138">138</a> }
-<a class="jxr_linenumber" name="L139" href="#L139">139</a>
-<a class="jxr_linenumber" name="L140" href="#L140">140</a> {
-<a class="jxr_linenumber" name="L141" href="#L141">141</a>
<strong class="jxr_keyword">final</strong> TiffOutputSet outputSet =
oldExifMetadata.getOutputSet();
-<a class="jxr_linenumber" name="L142" href="#L142">142</a> <em
class="jxr_comment">// outputSet.dump();</em>
-<a class="jxr_linenumber" name="L143" href="#L143">143</a>
-<a class="jxr_linenumber" name="L144" href="#L144">144</a>
<strong class="jxr_keyword">final</strong> ByteArrayOutputStream baos = <strong
class="jxr_keyword">new</strong> ByteArrayOutputStream();
-<a class="jxr_linenumber" name="L145" href="#L145">145</a>
-<a class="jxr_linenumber" name="L146" href="#L146">146</a>
<strong class="jxr_keyword">new</strong>
ExifRewriter().updateExifMetadataLossy(stripped, baos,
-<a class="jxr_linenumber" name="L147" href="#L147">147</a>
outputSet);
-<a class="jxr_linenumber" name="L148" href="#L148">148</a>
-<a class="jxr_linenumber" name="L149" href="#L149">149</a>
<strong class="jxr_keyword">final</strong> byte[] bytes = baos.toByteArray();
-<a class="jxr_linenumber" name="L150" href="#L150">150</a>
<strong class="jxr_keyword">final</strong> File tempFile = createTempFile(<span
class="jxr_string">"inserted"</span> + <span class="jxr_string">"_"</span>,
<span class="jxr_string">".jpg"</span>);
-<a class="jxr_linenumber" name="L151" href="#L151">151</a>
Debug.debug(<span class="jxr_string">"tempFile"</span>, tempFile);
-<a class="jxr_linenumber" name="L152" href="#L152">152</a>
FileUtils.writeByteArrayToFile(tempFile, bytes);
-<a class="jxr_linenumber" name="L153" href="#L153">153</a>
-<a class="jxr_linenumber" name="L154" href="#L154">154</a>
Debug.debug(<span class="jxr_string">"Output Segments:"</span>);
-<a class="jxr_linenumber" name="L155" href="#L155">155</a>
<strong class="jxr_keyword">new</strong> JpegUtils().dumpJFIF(<strong
class="jxr_keyword">new</strong> ByteSourceArray(bytes));
-<a class="jxr_linenumber" name="L156" href="#L156">156</a>
-<a class="jxr_linenumber" name="L157" href="#L157">157</a> <em
class="jxr_comment">// assertTrue(!hasExifData(tempFile));</em>
-<a class="jxr_linenumber" name="L158" href="#L158">158</a>
-<a class="jxr_linenumber" name="L159" href="#L159">159</a>
<strong class="jxr_keyword">final</strong> JpegImageMetadata newMetadata =
(JpegImageMetadata) Imaging
-<a class="jxr_linenumber" name="L160" href="#L160">160</a>
.getMetadata(tempFile);
-<a class="jxr_linenumber" name="L161" href="#L161">161</a>
assertNotNull(newMetadata);
-<a class="jxr_linenumber" name="L162" href="#L162">162</a>
<strong class="jxr_keyword">final</strong> TiffImageMetadata newExifMetadata =
newMetadata.getExif();
-<a class="jxr_linenumber" name="L163" href="#L163">163</a>
assertNotNull(newExifMetadata);
-<a class="jxr_linenumber" name="L164" href="#L164">164</a> <em
class="jxr_comment">// newMetadata.dump();</em>
-<a class="jxr_linenumber" name="L165" href="#L165">165</a>
-<a class="jxr_linenumber" name="L166" href="#L166">166</a>
compare(imageFile, oldExifMetadata, newExifMetadata);
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> }
-<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> }
-<a class="jxr_linenumber" name="L171" href="#L171">171</a>
-<a class="jxr_linenumber" name="L172" href="#L172">172</a> <strong
class="jxr_keyword">private</strong> <strong
class="jxr_keyword">interface</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.html">Rewriter</a>
{
-<a class="jxr_linenumber" name="L173" href="#L173">173</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
rewrite(ByteSource byteSource, OutputStream os,
-<a class="jxr_linenumber" name="L174" href="#L174">174</a>
TiffOutputSet outputSet) <strong class="jxr_keyword">throws</strong>
ImageReadException,
-<a class="jxr_linenumber" name="L175" href="#L175">175</a>
IOException, ImageWriteException;
-<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> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong>
rewrite(<strong class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.html">Rewriter</a>
rewriter, <strong class="jxr_keyword">final</strong> String name) <strong
class="jxr_keyword">throws</strong> IOException,
-<a class="jxr_linenumber" name="L179" href="#L179">179</a>
ImageReadException, ImageWriteException {
-<a class="jxr_linenumber" name="L180" href="#L180">180</a> <strong
class="jxr_keyword">final</strong> List<File> images =
getImagesWithExifData();
-<a class="jxr_linenumber" name="L181" href="#L181">181</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i =
0; i < images.size(); i++) {
-<a class="jxr_linenumber" name="L182" href="#L182">182</a>
-<a class="jxr_linenumber" name="L183" href="#L183">183</a> <strong
class="jxr_keyword">final</strong> File imageFile = images.get(i);
-<a class="jxr_linenumber" name="L184" href="#L184">184</a>
-<a class="jxr_linenumber" name="L185" href="#L185">185</a> <strong
class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L186" href="#L186">186</a>
-<a class="jxr_linenumber" name="L187" href="#L187">187</a>
Debug.debug(<span class="jxr_string">"imageFile"</span>, imageFile);
-<a class="jxr_linenumber" name="L188" href="#L188">188</a>
-<a class="jxr_linenumber" name="L189" href="#L189">189</a>
<strong class="jxr_keyword">final</strong> <strong
class="jxr_keyword">boolean</strong> ignoreImageData =
isPhilHarveyTestImage(imageFile);
-<a class="jxr_linenumber" name="L190" href="#L190">190</a>
<strong class="jxr_keyword">if</strong> (ignoreImageData) {
-<a class="jxr_linenumber" name="L191" href="#L191">191</a>
<strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="L192" href="#L192">192</a> }
-<a class="jxr_linenumber" name="L193" href="#L193">193</a>
-<a class="jxr_linenumber" name="L194" href="#L194">194</a>
<strong class="jxr_keyword">final</strong> ByteSource byteSource = <strong
class="jxr_keyword">new</strong> ByteSourceFile(imageFile);
-<a class="jxr_linenumber" name="L195" href="#L195">195</a>
Debug.debug(<span class="jxr_string">"Source Segments:"</span>);
-<a class="jxr_linenumber" name="L196" href="#L196">196</a>
<strong class="jxr_keyword">new</strong> JpegUtils().dumpJFIF(byteSource);
-<a class="jxr_linenumber" name="L197" href="#L197">197</a>
-<a class="jxr_linenumber" name="L198" href="#L198">198</a>
<strong class="jxr_keyword">final</strong> JpegImageMetadata oldMetadata =
(JpegImageMetadata) Imaging
-<a class="jxr_linenumber" name="L199" href="#L199">199</a>
.getMetadata(imageFile);
-<a class="jxr_linenumber" name="L200" href="#L200">200</a>
<strong class="jxr_keyword">if</strong> (<strong
class="jxr_keyword">null</strong> == oldMetadata) {
-<a class="jxr_linenumber" name="L201" href="#L201">201</a>
<strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="L202" href="#L202">202</a> }
-<a class="jxr_linenumber" name="L203" href="#L203">203</a>
assertNotNull(oldMetadata);
-<a class="jxr_linenumber" name="L204" href="#L204">204</a>
-<a class="jxr_linenumber" name="L205" href="#L205">205</a>
<strong class="jxr_keyword">final</strong> TiffImageMetadata oldExifMetadata =
oldMetadata.getExif();
-<a class="jxr_linenumber" name="L206" href="#L206">206</a>
<strong class="jxr_keyword">if</strong> (<strong
class="jxr_keyword">null</strong> == oldExifMetadata) {
-<a class="jxr_linenumber" name="L207" href="#L207">207</a>
<strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="L208" href="#L208">208</a> }
-<a class="jxr_linenumber" name="L209" href="#L209">209</a>
assertNotNull(oldExifMetadata);
-<a class="jxr_linenumber" name="L210" href="#L210">210</a>
oldMetadata.dump();
-<a class="jxr_linenumber" name="L211" href="#L211">211</a>
-<a class="jxr_linenumber" name="L212" href="#L212">212</a> <em
class="jxr_comment">// TiffImageMetadata tiffImageMetadata =
metadata.getExif();</em>
-<a class="jxr_linenumber" name="L213" href="#L213">213</a> <em
class="jxr_comment">// Photoshop photoshop = metadata.getPhotoshop();</em>
-<a class="jxr_linenumber" name="L214" href="#L214">214</a>
-<a class="jxr_linenumber" name="L215" href="#L215">215</a>
<strong class="jxr_keyword">final</strong> TiffOutputSet outputSet =
oldExifMetadata.getOutputSet();
-<a class="jxr_linenumber" name="L216" href="#L216">216</a> <em
class="jxr_comment">// outputSet.dump();</em>
-<a class="jxr_linenumber" name="L217" href="#L217">217</a>
-<a class="jxr_linenumber" name="L218" href="#L218">218</a>
<strong class="jxr_keyword">final</strong> ByteArrayOutputStream baos = <strong
class="jxr_keyword">new</strong> ByteArrayOutputStream();
-<a class="jxr_linenumber" name="L219" href="#L219">219</a>
rewriter.rewrite(byteSource, baos, outputSet);
-<a class="jxr_linenumber" name="L220" href="#L220">220</a>
<strong class="jxr_keyword">final</strong> byte[] bytes = baos.toByteArray();
-<a class="jxr_linenumber" name="L221" href="#L221">221</a>
<strong class="jxr_keyword">final</strong> File tempFile = createTempFile(name
+ <span class="jxr_string">"_"</span>, <span class="jxr_string">".jpg"</span>);
-<a class="jxr_linenumber" name="L222" href="#L222">222</a>
Debug.debug(<span class="jxr_string">"tempFile"</span>, tempFile);
-<a class="jxr_linenumber" name="L223" href="#L223">223</a>
FileUtils.writeByteArrayToFile(tempFile, bytes);
-<a class="jxr_linenumber" name="L224" href="#L224">224</a>
-<a class="jxr_linenumber" name="L225" href="#L225">225</a>
Debug.debug(<span class="jxr_string">"Output Segments:"</span>);
-<a class="jxr_linenumber" name="L226" href="#L226">226</a>
<strong class="jxr_keyword">new</strong> JpegUtils().dumpJFIF(<strong
class="jxr_keyword">new</strong> ByteSourceArray(bytes));
-<a class="jxr_linenumber" name="L227" href="#L227">227</a>
-<a class="jxr_linenumber" name="L228" href="#L228">228</a> <em
class="jxr_comment">// assertTrue(!hasExifData(tempFile));</em>
-<a class="jxr_linenumber" name="L229" href="#L229">229</a>
-<a class="jxr_linenumber" name="L230" href="#L230">230</a>
<strong class="jxr_keyword">final</strong> JpegImageMetadata newMetadata =
(JpegImageMetadata) Imaging
-<a class="jxr_linenumber" name="L231" href="#L231">231</a>
.getMetadata(tempFile);
-<a class="jxr_linenumber" name="L232" href="#L232">232</a>
assertNotNull(newMetadata);
-<a class="jxr_linenumber" name="L233" href="#L233">233</a>
<strong class="jxr_keyword">final</strong> TiffImageMetadata newExifMetadata =
newMetadata.getExif();
-<a class="jxr_linenumber" name="L234" href="#L234">234</a>
assertNotNull(newExifMetadata);
-<a class="jxr_linenumber" name="L235" href="#L235">235</a> <em
class="jxr_comment">// newMetadata.dump();</em>
-<a class="jxr_linenumber" name="L236" href="#L236">236</a>
-<a class="jxr_linenumber" name="L237" href="#L237">237</a>
compare(imageFile, oldExifMetadata, newExifMetadata);
-<a class="jxr_linenumber" name="L238" href="#L238">238</a> }
<strong class="jxr_keyword">catch</strong> (<strong
class="jxr_keyword">final</strong> IOException e) {
-<a class="jxr_linenumber" name="L239" href="#L239">239</a>
Debug.debug(<span class="jxr_string">"imageFile"</span>,
imageFile.getAbsoluteFile());
-<a class="jxr_linenumber" name="L240" href="#L240">240</a>
Debug.debug(e);
-<a class="jxr_linenumber" name="L241" href="#L241">241</a>
<strong class="jxr_keyword">throw</strong> e;
-<a class="jxr_linenumber" name="L242" href="#L242">242</a> }
<strong class="jxr_keyword">catch</strong> (<strong
class="jxr_keyword">final</strong> ImageReadException e) {
-<a class="jxr_linenumber" name="L243" href="#L243">243</a>
Debug.debug(<span class="jxr_string">"imageFile"</span>,
imageFile.getAbsoluteFile());
-<a class="jxr_linenumber" name="L244" href="#L244">244</a>
Debug.debug(e);
-<a class="jxr_linenumber" name="L245" href="#L245">245</a>
<strong class="jxr_keyword">throw</strong> e;
-<a class="jxr_linenumber" name="L246" href="#L246">246</a> }
<strong class="jxr_keyword">catch</strong> (<strong
class="jxr_keyword">final</strong> ImageWriteException e) {
-<a class="jxr_linenumber" name="L247" href="#L247">247</a>
Debug.debug(<span class="jxr_string">"imageFile"</span>,
imageFile.getAbsoluteFile());
-<a class="jxr_linenumber" name="L248" href="#L248">248</a>
Debug.debug(e);
-<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> }
-<a class="jxr_linenumber" name="L253" href="#L253">253</a>
-<a class="jxr_linenumber" name="L254" href="#L254">254</a> @Test
-<a class="jxr_linenumber" name="L255" href="#L255">255</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testRewriteLossy() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="L256" href="#L256">256</a> <strong
class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.html">Rewriter</a>
rewriter = <strong class="jxr_keyword">new</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.html">Rewriter</a>()
{
-<a class="jxr_linenumber" name="L257" href="#L257">257</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
rewrite(<strong class="jxr_keyword">final</strong> ByteSource byteSource,
<strong class="jxr_keyword">final</strong> OutputStream os,
-<a class="jxr_linenumber" name="L258" href="#L258">258</a>
<strong class="jxr_keyword">final</strong> TiffOutputSet outputSet) <strong
class="jxr_keyword">throws</strong> ImageReadException,
-<a class="jxr_linenumber" name="L259" href="#L259">259</a>
IOException, ImageWriteException {
-<a class="jxr_linenumber" name="L260" href="#L260">260</a>
<strong class="jxr_keyword">new</strong>
ExifRewriter().updateExifMetadataLossy(byteSource, os,
-<a class="jxr_linenumber" name="L261" href="#L261">261</a>
outputSet);
-<a class="jxr_linenumber" name="L262" href="#L262">262</a> }
-<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>
rewrite(rewriter, <span class="jxr_string">"lossy"</span>);
-<a class="jxr_linenumber" name="L266" href="#L266">266</a> }
-<a class="jxr_linenumber" name="L267" href="#L267">267</a>
-<a class="jxr_linenumber" name="L268" href="#L268">268</a> @Test
-<a class="jxr_linenumber" name="L269" href="#L269">269</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testRewriteLossless() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="L270" href="#L270">270</a> <strong
class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.html">Rewriter</a>
rewriter = <strong class="jxr_keyword">new</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.html">Rewriter</a>()
{
-<a class="jxr_linenumber" name="L271" href="#L271">271</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
rewrite(<strong class="jxr_keyword">final</strong> ByteSource byteSource,
<strong class="jxr_keyword">final</strong> OutputStream os,
-<a class="jxr_linenumber" name="L272" href="#L272">272</a>
<strong class="jxr_keyword">final</strong> TiffOutputSet outputSet) <strong
class="jxr_keyword">throws</strong> ImageReadException,
-<a class="jxr_linenumber" name="L273" href="#L273">273</a>
IOException, ImageWriteException {
-<a class="jxr_linenumber" name="L274" href="#L274">274</a>
<strong class="jxr_keyword">new</strong>
ExifRewriter().updateExifMetadataLossless(byteSource, os,
-<a class="jxr_linenumber" name="L275" href="#L275">275</a>
outputSet);
-<a class="jxr_linenumber" name="L276" href="#L276">276</a> }
-<a class="jxr_linenumber" name="L277" href="#L277">277</a> };
-<a class="jxr_linenumber" name="L278" href="#L278">278</a>
-<a class="jxr_linenumber" name="L279" href="#L279">279</a>
rewrite(rewriter, <span class="jxr_string">"lossless"</span>);
-<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> <strong
class="jxr_keyword">private</strong>
Hashtable<Integer,TiffImageMetadata.Directory> makeDirectoryMap(<strong
class="jxr_keyword">final</strong> List<? <strong
class="jxr_keyword">extends</strong> ImageMetadataItem> directories) {
-<a class="jxr_linenumber" name="L283" href="#L283">283</a> <strong
class="jxr_keyword">final</strong>
Hashtable<Integer,TiffImageMetadata.Directory> directoryMap = <strong
class="jxr_keyword">new</strong>
Hashtable<Integer,TiffImageMetadata.Directory>();
-<a class="jxr_linenumber" name="L284" href="#L284">284</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i =
0; i < directories.size(); i++) {
-<a class="jxr_linenumber" name="L285" href="#L285">285</a> <strong
class="jxr_keyword">final</strong> TiffImageMetadata.Directory directory =
(TiffImageMetadata.Directory) directories
-<a class="jxr_linenumber" name="L286" href="#L286">286</a>
.get(i);
-<a class="jxr_linenumber" name="L287" href="#L287">287</a>
directoryMap.put(directory.type, directory);
-<a class="jxr_linenumber" name="L288" href="#L288">288</a> }
-<a class="jxr_linenumber" name="L289" href="#L289">289</a> <strong
class="jxr_keyword">return</strong> directoryMap;
-<a class="jxr_linenumber" name="L290" href="#L290">290</a> }
-<a class="jxr_linenumber" name="L291" href="#L291">291</a>
-<a class="jxr_linenumber" name="L292" href="#L292">292</a> <strong
class="jxr_keyword">private</strong> Hashtable<Integer,TiffField>
makeFieldMap(<strong class="jxr_keyword">final</strong> List<? <strong
class="jxr_keyword">extends</strong> ImageMetadataItem> items) {
-<a class="jxr_linenumber" name="L293" href="#L293">293</a> <strong
class="jxr_keyword">final</strong> Hashtable<Integer,TiffField> fieldMap
= <strong class="jxr_keyword">new</strong> Hashtable<Integer,TiffField>();
-<a class="jxr_linenumber" name="L294" href="#L294">294</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i =
0; i < items.size(); i++) {
-<a class="jxr_linenumber" name="L295" href="#L295">295</a> <strong
class="jxr_keyword">final</strong> TiffImageMetadata.TiffMetadataItem item =
(TiffImageMetadata.TiffMetadataItem) items.get(i);
-<a class="jxr_linenumber" name="L296" href="#L296">296</a> <strong
class="jxr_keyword">final</strong> TiffField field = item.getTiffField();
-<a class="jxr_linenumber" name="L297" href="#L297">297</a> <strong
class="jxr_keyword">if</strong> (!fieldMap.containsKey(field.getTag())) {
-<a class="jxr_linenumber" name="L298" href="#L298">298</a>
fieldMap.put(field.getTag(), field);
-<a class="jxr_linenumber" name="L299" href="#L299">299</a> }
-<a class="jxr_linenumber" name="L300" href="#L300">300</a> }
-<a class="jxr_linenumber" name="L301" href="#L301">301</a> <strong
class="jxr_keyword">return</strong> fieldMap;
-<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> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong>
compare(<strong class="jxr_keyword">final</strong> File imageFile, <strong
class="jxr_keyword">final</strong> TiffImageMetadata oldExifMetadata,
-<a class="jxr_linenumber" name="L305" href="#L305">305</a> <strong
class="jxr_keyword">final</strong> TiffImageMetadata newExifMetadata) <strong
class="jxr_keyword">throws</strong> ImageReadException {
-<a class="jxr_linenumber" name="L306" href="#L306">306</a>
assertNotNull(oldExifMetadata);
-<a class="jxr_linenumber" name="L307" href="#L307">307</a>
assertNotNull(newExifMetadata);
-<a class="jxr_linenumber" name="L308" href="#L308">308</a>
-<a class="jxr_linenumber" name="L309" href="#L309">309</a> <strong
class="jxr_keyword">final</strong> List<? <strong
class="jxr_keyword">extends</strong> ImageMetadataItem> oldDirectories =
oldExifMetadata.getDirectories();
-<a class="jxr_linenumber" name="L310" href="#L310">310</a> <strong
class="jxr_keyword">final</strong> List<? <strong
class="jxr_keyword">extends</strong> ImageMetadataItem> newDirectories =
newExifMetadata.getDirectories();
-<a class="jxr_linenumber" name="L311" href="#L311">311</a>
-<a class="jxr_linenumber" name="L312" href="#L312">312</a>
assertTrue(oldDirectories.size() == newDirectories.size());
-<a class="jxr_linenumber" name="L313" href="#L313">313</a>
-<a class="jxr_linenumber" name="L314" href="#L314">314</a> <strong
class="jxr_keyword">final</strong>
Hashtable<Integer,TiffImageMetadata.Directory> oldDirectoryMap =
makeDirectoryMap(oldDirectories);
-<a class="jxr_linenumber" name="L315" href="#L315">315</a> <strong
class="jxr_keyword">final</strong>
Hashtable<Integer,TiffImageMetadata.Directory> newDirectoryMap =
makeDirectoryMap(newDirectories);
-<a class="jxr_linenumber" name="L316" href="#L316">316</a>
-<a class="jxr_linenumber" name="L317" href="#L317">317</a>
assertEquals(oldDirectories.size(), oldDirectoryMap.keySet().size());
-<a class="jxr_linenumber" name="L318" href="#L318">318</a> <strong
class="jxr_keyword">final</strong> List<Integer> oldDirectoryTypes =
<strong class="jxr_keyword">new</strong>
ArrayList<Integer>(oldDirectoryMap.keySet());
-<a class="jxr_linenumber" name="L319" href="#L319">319</a>
Collections.sort(oldDirectoryTypes);
-<a class="jxr_linenumber" name="L320" href="#L320">320</a> <strong
class="jxr_keyword">final</strong> List<Integer> newDirectoryTypes =
<strong class="jxr_keyword">new</strong>
ArrayList<Integer>(newDirectoryMap.keySet());
-<a class="jxr_linenumber" name="L321" href="#L321">321</a>
Collections.sort(newDirectoryTypes);
-<a class="jxr_linenumber" name="L322" href="#L322">322</a>
assertEquals(oldDirectoryTypes, newDirectoryTypes);
-<a class="jxr_linenumber" name="L323" href="#L323">323</a>
-<a class="jxr_linenumber" name="L324" href="#L324">324</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i =
0; i < oldDirectoryTypes.size(); i++) {
-<a class="jxr_linenumber" name="L325" href="#L325">325</a> <strong
class="jxr_keyword">final</strong> Integer dirType = oldDirectoryTypes.get(i);
-<a class="jxr_linenumber" name="L326" href="#L326">326</a>
-<a class="jxr_linenumber" name="L327" href="#L327">327</a> <em
class="jxr_comment">// Debug.debug("dirType", dirType);</em>
-<a class="jxr_linenumber" name="L328" href="#L328">328</a>
-<a class="jxr_linenumber" name="L329" href="#L329">329</a> <strong
class="jxr_keyword">final</strong> TiffImageMetadata.Directory oldDirectory =
oldDirectoryMap
-<a class="jxr_linenumber" name="L330" href="#L330">330</a>
.get(dirType);
-<a class="jxr_linenumber" name="L331" href="#L331">331</a> <strong
class="jxr_keyword">final</strong> TiffImageMetadata.Directory newDirectory =
newDirectoryMap
-<a class="jxr_linenumber" name="L332" href="#L332">332</a>
.get(dirType);
-<a class="jxr_linenumber" name="L333" href="#L333">333</a>
assertNotNull(oldDirectory);
-<a class="jxr_linenumber" name="L334" href="#L334">334</a>
assertNotNull(newDirectory);
-<a class="jxr_linenumber" name="L335" href="#L335">335</a>
-<a class="jxr_linenumber" name="L336" href="#L336">336</a> <strong
class="jxr_keyword">final</strong> List<? <strong
class="jxr_keyword">extends</strong> ImageMetadataItem> oldItems =
oldDirectory.getItems();
-<a class="jxr_linenumber" name="L337" href="#L337">337</a> <strong
class="jxr_keyword">final</strong> List<? <strong
class="jxr_keyword">extends</strong> ImageMetadataItem> newItems =
newDirectory.getItems();
-<a class="jxr_linenumber" name="L338" href="#L338">338</a>
-<a class="jxr_linenumber" name="L339" href="#L339">339</a> <strong
class="jxr_keyword">final</strong> Hashtable<Integer,TiffField>
oldFieldMap = makeFieldMap(oldItems);
-<a class="jxr_linenumber" name="L340" href="#L340">340</a> <strong
class="jxr_keyword">final</strong> Hashtable<Integer,TiffField>
newFieldMap = makeFieldMap(newItems);
-<a class="jxr_linenumber" name="L341" href="#L341">341</a>
-<a class="jxr_linenumber" name="L342" href="#L342">342</a> <strong
class="jxr_keyword">final</strong> Set<Integer> missingInNew = <strong
class="jxr_keyword">new</strong> HashSet<Integer>(oldFieldMap.keySet());
-<a class="jxr_linenumber" name="L343" href="#L343">343</a>
missingInNew.removeAll(newFieldMap.keySet());
-<a class="jxr_linenumber" name="L344" href="#L344">344</a>
-<a class="jxr_linenumber" name="L345" href="#L345">345</a> <strong
class="jxr_keyword">final</strong> Set<Integer> missingInOld = <strong
class="jxr_keyword">new</strong> HashSet<Integer>(newFieldMap.keySet());
-<a class="jxr_linenumber" name="L346" href="#L346">346</a>
missingInOld.removeAll(oldFieldMap.keySet());
-<a class="jxr_linenumber" name="L347" href="#L347">347</a>
-<a class="jxr_linenumber" name="L348" href="#L348">348</a>
assertTrue(missingInNew.size() == 0);
-<a class="jxr_linenumber" name="L349" href="#L349">349</a>
assertTrue(missingInOld.size() == 0);
-<a class="jxr_linenumber" name="L350" href="#L350">350</a>
-<a class="jxr_linenumber" name="L351" href="#L351">351</a>
assertEquals(oldItems.size(), oldFieldMap.keySet().size());
-<a class="jxr_linenumber" name="L352" href="#L352">352</a>
assertEquals(oldFieldMap.keySet(), newFieldMap.keySet());
+<a class="jxr_linenumber" name="L34" href="#L34">34</a> <strong
class="jxr_keyword">import</strong> java.util.Map;
+<a class="jxr_linenumber" name="L35" href="#L35">35</a> <strong
class="jxr_keyword">import</strong> java.util.Set;
+<a class="jxr_linenumber" name="L36" href="#L36">36</a>
+<a class="jxr_linenumber" name="L37" href="#L37">37</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.ImageReadException;
+<a class="jxr_linenumber" name="L38" href="#L38">38</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.ImageWriteException;
+<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong
class="jxr_keyword">import</strong> org.apache.commons.imaging.Imaging;
+<a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.common.ImageMetadata.ImageMetadataItem;
+<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.common.bytesource.ByteSource;
+<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.common.bytesource.ByteSourceArray;
+<a class="jxr_linenumber" name="L43" href="#L43">43</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.common.bytesource.ByteSourceFile;
+<a class="jxr_linenumber" name="L44" href="#L44">44</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
+<a class="jxr_linenumber" name="L45" href="#L45">45</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.jpeg.JpegUtils;
+<a class="jxr_linenumber" name="L46" href="#L46">46</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.tiff.TiffField;
+<a class="jxr_linenumber" name="L47" href="#L47">47</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.tiff.TiffImageMetadata;
+<a class="jxr_linenumber" name="L48" href="#L48">48</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.tiff.constants.AllTagConstants;
+<a class="jxr_linenumber" name="L49" href="#L49">49</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.tiff.fieldtypes.FieldType;
+<a class="jxr_linenumber" name="L50" href="#L50">50</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.tiff.write.TiffOutputSet;
+<a class="jxr_linenumber" name="L51" href="#L51">51</a> <strong
class="jxr_keyword">import</strong> org.apache.commons.imaging.util.Debug;
+<a class="jxr_linenumber" name="L52" href="#L52">52</a> <strong
class="jxr_keyword">import</strong> org.apache.commons.io.FileUtils;
+<a class="jxr_linenumber" name="L53" href="#L53">53</a> <strong
class="jxr_keyword">import</strong> org.junit.Assert;
+<a class="jxr_linenumber" name="L54" href="#L54">54</a> <strong
class="jxr_keyword">import</strong> org.junit.Test;
+<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> <strong class="jxr_keyword">class</strong>
<a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.html">ExifRewriteTest</a>
<strong class="jxr_keyword">extends</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/ExifBaseTest.html">ExifBaseTest</a>
<strong class="jxr_keyword">implements</strong> AllTagConstants {
+<a class="jxr_linenumber" name="L57" href="#L57">57</a> <em
class="jxr_comment">// public ExifRewriteTest(String name)</em>
+<a class="jxr_linenumber" name="L58" href="#L58">58</a> <em
class="jxr_comment">// {</em>
+<a class="jxr_linenumber" name="L59" href="#L59">59</a> <em
class="jxr_comment">// super(name);</em>
+<a class="jxr_linenumber" name="L60" href="#L60">60</a> <em
class="jxr_comment">// }</em>
+<a class="jxr_linenumber" name="L61" href="#L61">61</a>
+<a class="jxr_linenumber" name="L62" href="#L62">62</a> @Test
+<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testRemove() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="L64" href="#L64">64</a> <strong
class="jxr_keyword">final</strong> List<File> images =
getImagesWithExifData();
+<a class="jxr_linenumber" name="L65" href="#L65">65</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i =
0; i < images.size(); i++) {
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>
+<a class="jxr_linenumber" name="L67" href="#L67">67</a> <strong
class="jxr_keyword">final</strong> File imageFile = images.get(i);
+<a class="jxr_linenumber" name="L68" href="#L68">68</a>
Debug.debug(<span class="jxr_string">"imageFile"</span>, imageFile);
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>
+<a class="jxr_linenumber" name="L70" href="#L70">70</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong>
ignoreImageData = isPhilHarveyTestImage(imageFile);
+<a class="jxr_linenumber" name="L71" href="#L71">71</a> <strong
class="jxr_keyword">if</strong> (ignoreImageData) {
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>
<strong class="jxr_keyword">continue</strong>;
+<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="L75" href="#L75">75</a> <strong
class="jxr_keyword">final</strong> ByteSource byteSource = <strong
class="jxr_keyword">new</strong> ByteSourceFile(imageFile);
+<a class="jxr_linenumber" name="L76" href="#L76">76</a>
Debug.debug(<span class="jxr_string">"Source Segments:"</span>);
+<a class="jxr_linenumber" name="L77" href="#L77">77</a> <strong
class="jxr_keyword">new</strong> JpegUtils().dumpJFIF(byteSource);
+<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>
<strong class="jxr_keyword">final</strong> JpegImageMetadata metadata =
(JpegImageMetadata) Imaging
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>
.getMetadata(imageFile);
+<a class="jxr_linenumber" name="L82" href="#L82">82</a>
Assert.assertNotNull(metadata);
+<a class="jxr_linenumber" name="L83" href="#L83">83</a> }
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>
+<a class="jxr_linenumber" name="L85" href="#L85">85</a> {
+<a class="jxr_linenumber" name="L86" href="#L86">86</a>
<strong class="jxr_keyword">final</strong> ByteArrayOutputStream baos = <strong
class="jxr_keyword">new</strong> ByteArrayOutputStream();
+<a class="jxr_linenumber" name="L87" href="#L87">87</a>
<strong class="jxr_keyword">new</strong>
ExifRewriter().removeExifMetadata(byteSource, baos);
+<a class="jxr_linenumber" name="L88" href="#L88">88</a>
<strong class="jxr_keyword">final</strong> byte[] bytes = baos.toByteArray();
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>
<strong class="jxr_keyword">final</strong> File tempFile = createTempFile(<span
class="jxr_string">"test"</span>, <span class="jxr_string">".jpg"</span>);
+<a class="jxr_linenumber" name="L90" href="#L90">90</a>
Debug.debug(<span class="jxr_string">"tempFile"</span>, tempFile);
+<a class="jxr_linenumber" name="L91" href="#L91">91</a>
FileUtils.writeByteArrayToFile(tempFile, bytes);
+<a class="jxr_linenumber" name="L92" href="#L92">92</a>
+<a class="jxr_linenumber" name="L93" href="#L93">93</a>
Debug.debug(<span class="jxr_string">"Output Segments:"</span>);
+<a class="jxr_linenumber" name="L94" href="#L94">94</a>
<strong class="jxr_keyword">new</strong> JpegUtils().dumpJFIF(<strong
class="jxr_keyword">new</strong> ByteSourceArray(bytes));
+<a class="jxr_linenumber" name="L95" href="#L95">95</a>
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>
assertTrue(!hasExifData(tempFile));
+<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> }
+<a class="jxr_linenumber" name="L100" href="#L100">100</a>
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> @Test
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testInsert() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="L103" href="#L103">103</a> <strong
class="jxr_keyword">final</strong> List<File> images =
getImagesWithExifData();
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i =
0; i < images.size(); i++) {
+<a class="jxr_linenumber" name="L105" href="#L105">105</a>
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> <strong
class="jxr_keyword">final</strong> File imageFile = images.get(i);
+<a class="jxr_linenumber" name="L107" href="#L107">107</a>
Debug.debug(<span class="jxr_string">"imageFile"</span>, imageFile);
+<a class="jxr_linenumber" name="L108" href="#L108">108</a>
+<a class="jxr_linenumber" name="L109" href="#L109">109</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong>
ignoreImageData = isPhilHarveyTestImage(imageFile);
+<a class="jxr_linenumber" name="L110" href="#L110">110</a> <strong
class="jxr_keyword">if</strong> (ignoreImageData) {
+<a class="jxr_linenumber" name="L111" href="#L111">111</a>
<strong class="jxr_keyword">continue</strong>;
+<a class="jxr_linenumber" name="L112" href="#L112">112</a> }
+<a class="jxr_linenumber" name="L113" href="#L113">113</a>
+<a class="jxr_linenumber" name="L114" href="#L114">114</a> <strong
class="jxr_keyword">final</strong> ByteSource byteSource = <strong
class="jxr_keyword">new</strong> ByteSourceFile(imageFile);
+<a class="jxr_linenumber" name="L115" href="#L115">115</a>
Debug.debug(<span class="jxr_string">"Source Segments:"</span>);
+<a class="jxr_linenumber" name="L116" href="#L116">116</a> <strong
class="jxr_keyword">new</strong> JpegUtils().dumpJFIF(byteSource);
+<a class="jxr_linenumber" name="L117" href="#L117">117</a>
+<a class="jxr_linenumber" name="L118" href="#L118">118</a> <strong
class="jxr_keyword">final</strong> JpegImageMetadata originalMetadata =
(JpegImageMetadata) Imaging
+<a class="jxr_linenumber" name="L119" href="#L119">119</a>
.getMetadata(imageFile);
+<a class="jxr_linenumber" name="L120" href="#L120">120</a>
assertNotNull(originalMetadata);
+<a class="jxr_linenumber" name="L121" href="#L121">121</a>
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> <strong
class="jxr_keyword">final</strong> TiffImageMetadata oldExifMetadata =
originalMetadata.getExif();
+<a class="jxr_linenumber" name="L123" href="#L123">123</a>
assertNotNull(oldExifMetadata);
+<a class="jxr_linenumber" name="L124" href="#L124">124</a>
+<a class="jxr_linenumber" name="L125" href="#L125">125</a>
ByteSource stripped;
+<a class="jxr_linenumber" name="L126" href="#L126">126</a> {
+<a class="jxr_linenumber" name="L127" href="#L127">127</a>
<strong class="jxr_keyword">final</strong> ByteArrayOutputStream baos = <strong
class="jxr_keyword">new</strong> ByteArrayOutputStream();
+<a class="jxr_linenumber" name="L128" href="#L128">128</a>
<strong class="jxr_keyword">new</strong>
ExifRewriter().removeExifMetadata(byteSource, baos);
+<a class="jxr_linenumber" name="L129" href="#L129">129</a>
<strong class="jxr_keyword">final</strong> byte[] bytes = baos.toByteArray();
+<a class="jxr_linenumber" name="L130" href="#L130">130</a>
<strong class="jxr_keyword">final</strong> File tempFile = createTempFile(<span
class="jxr_string">"removed"</span>, <span class="jxr_string">".jpg"</span>);
+<a class="jxr_linenumber" name="L131" href="#L131">131</a>
Debug.debug(<span class="jxr_string">"tempFile"</span>, tempFile);
+<a class="jxr_linenumber" name="L132" href="#L132">132</a>
FileUtils.writeByteArrayToFile(tempFile, bytes);
+<a class="jxr_linenumber" name="L133" href="#L133">133</a>
+<a class="jxr_linenumber" name="L134" href="#L134">134</a>
Debug.debug(<span class="jxr_string">"Output Segments:"</span>);
+<a class="jxr_linenumber" name="L135" href="#L135">135</a>
stripped = <strong class="jxr_keyword">new</strong> ByteSourceArray(bytes);
+<a class="jxr_linenumber" name="L136" href="#L136">136</a>
<strong class="jxr_keyword">new</strong> JpegUtils().dumpJFIF(stripped);
+<a class="jxr_linenumber" name="L137" href="#L137">137</a>
+<a class="jxr_linenumber" name="L138" href="#L138">138</a>
assertTrue(!hasExifData(tempFile));
+<a class="jxr_linenumber" name="L139" href="#L139">139</a> }
+<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="L142" href="#L142">142</a>
<strong class="jxr_keyword">final</strong> TiffOutputSet outputSet =
oldExifMetadata.getOutputSet();
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> <em
class="jxr_comment">// outputSet.dump();</em>
+<a class="jxr_linenumber" name="L144" href="#L144">144</a>
+<a class="jxr_linenumber" name="L145" href="#L145">145</a>
<strong class="jxr_keyword">final</strong> ByteArrayOutputStream baos = <strong
class="jxr_keyword">new</strong> ByteArrayOutputStream();
+<a class="jxr_linenumber" name="L146" href="#L146">146</a>
+<a class="jxr_linenumber" name="L147" href="#L147">147</a>
<strong class="jxr_keyword">new</strong>
ExifRewriter().updateExifMetadataLossy(stripped, baos,
+<a class="jxr_linenumber" name="L148" href="#L148">148</a>
outputSet);
+<a class="jxr_linenumber" name="L149" href="#L149">149</a>
+<a class="jxr_linenumber" name="L150" href="#L150">150</a>
<strong class="jxr_keyword">final</strong> byte[] bytes = baos.toByteArray();
+<a class="jxr_linenumber" name="L151" href="#L151">151</a>
<strong class="jxr_keyword">final</strong> File tempFile = createTempFile(<span
class="jxr_string">"inserted"</span> + <span class="jxr_string">"_"</span>,
<span class="jxr_string">".jpg"</span>);
+<a class="jxr_linenumber" name="L152" href="#L152">152</a>
Debug.debug(<span class="jxr_string">"tempFile"</span>, tempFile);
+<a class="jxr_linenumber" name="L153" href="#L153">153</a>
FileUtils.writeByteArrayToFile(tempFile, bytes);
+<a class="jxr_linenumber" name="L154" href="#L154">154</a>
+<a class="jxr_linenumber" name="L155" href="#L155">155</a>
Debug.debug(<span class="jxr_string">"Output Segments:"</span>);
+<a class="jxr_linenumber" name="L156" href="#L156">156</a>
<strong class="jxr_keyword">new</strong> JpegUtils().dumpJFIF(<strong
class="jxr_keyword">new</strong> ByteSourceArray(bytes));
+<a class="jxr_linenumber" name="L157" href="#L157">157</a>
+<a class="jxr_linenumber" name="L158" href="#L158">158</a> <em
class="jxr_comment">// assertTrue(!hasExifData(tempFile));</em>
+<a class="jxr_linenumber" name="L159" href="#L159">159</a>
+<a class="jxr_linenumber" name="L160" href="#L160">160</a>
<strong class="jxr_keyword">final</strong> JpegImageMetadata newMetadata =
(JpegImageMetadata) Imaging
+<a class="jxr_linenumber" name="L161" href="#L161">161</a>
.getMetadata(tempFile);
+<a class="jxr_linenumber" name="L162" href="#L162">162</a>
assertNotNull(newMetadata);
+<a class="jxr_linenumber" name="L163" href="#L163">163</a>
<strong class="jxr_keyword">final</strong> TiffImageMetadata newExifMetadata =
newMetadata.getExif();
+<a class="jxr_linenumber" name="L164" href="#L164">164</a>
assertNotNull(newExifMetadata);
+<a class="jxr_linenumber" name="L165" href="#L165">165</a> <em
class="jxr_comment">// newMetadata.dump();</em>
+<a class="jxr_linenumber" name="L166" href="#L166">166</a>
+<a class="jxr_linenumber" name="L167" href="#L167">167</a>
compare(imageFile, oldExifMetadata, newExifMetadata);
+<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> }
+<a class="jxr_linenumber" name="L171" href="#L171">171</a> }
+<a class="jxr_linenumber" name="L172" href="#L172">172</a>
+<a class="jxr_linenumber" name="L173" href="#L173">173</a> <strong
class="jxr_keyword">private</strong> <strong
class="jxr_keyword">interface</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.html">Rewriter</a>
{
+<a class="jxr_linenumber" name="L174" href="#L174">174</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
rewrite(ByteSource byteSource, OutputStream os,
+<a class="jxr_linenumber" name="L175" href="#L175">175</a>
TiffOutputSet outputSet) <strong class="jxr_keyword">throws</strong>
ImageReadException,
+<a class="jxr_linenumber" name="L176" href="#L176">176</a>
IOException, ImageWriteException;
+<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> <strong class="jxr_keyword">void</strong>
rewrite(<strong class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.html">Rewriter</a>
rewriter, <strong class="jxr_keyword">final</strong> String name) <strong
class="jxr_keyword">throws</strong> IOException,
+<a class="jxr_linenumber" name="L180" href="#L180">180</a>
ImageReadException, ImageWriteException {
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> <strong
class="jxr_keyword">final</strong> List<File> images =
getImagesWithExifData();
+<a class="jxr_linenumber" name="L182" href="#L182">182</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i =
0; i < images.size(); i++) {
+<a class="jxr_linenumber" name="L183" href="#L183">183</a>
+<a class="jxr_linenumber" name="L184" href="#L184">184</a> <strong
class="jxr_keyword">final</strong> File imageFile = images.get(i);
+<a class="jxr_linenumber" name="L185" href="#L185">185</a>
+<a class="jxr_linenumber" name="L186" href="#L186">186</a> <strong
class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L187" href="#L187">187</a>
+<a class="jxr_linenumber" name="L188" href="#L188">188</a>
Debug.debug(<span class="jxr_string">"imageFile"</span>, imageFile);
+<a class="jxr_linenumber" name="L189" href="#L189">189</a>
+<a class="jxr_linenumber" name="L190" href="#L190">190</a>
<strong class="jxr_keyword">final</strong> <strong
class="jxr_keyword">boolean</strong> ignoreImageData =
isPhilHarveyTestImage(imageFile);
+<a class="jxr_linenumber" name="L191" href="#L191">191</a>
<strong class="jxr_keyword">if</strong> (ignoreImageData) {
+<a class="jxr_linenumber" name="L192" href="#L192">192</a>
<strong class="jxr_keyword">continue</strong>;
+<a class="jxr_linenumber" name="L193" href="#L193">193</a> }
+<a class="jxr_linenumber" name="L194" href="#L194">194</a>
+<a class="jxr_linenumber" name="L195" href="#L195">195</a>
<strong class="jxr_keyword">final</strong> ByteSource byteSource = <strong
class="jxr_keyword">new</strong> ByteSourceFile(imageFile);
+<a class="jxr_linenumber" name="L196" href="#L196">196</a>
Debug.debug(<span class="jxr_string">"Source Segments:"</span>);
+<a class="jxr_linenumber" name="L197" href="#L197">197</a>
<strong class="jxr_keyword">new</strong> JpegUtils().dumpJFIF(byteSource);
+<a class="jxr_linenumber" name="L198" href="#L198">198</a>
+<a class="jxr_linenumber" name="L199" href="#L199">199</a>
<strong class="jxr_keyword">final</strong> JpegImageMetadata oldMetadata =
(JpegImageMetadata) Imaging
+<a class="jxr_linenumber" name="L200" href="#L200">200</a>
.getMetadata(imageFile);
+<a class="jxr_linenumber" name="L201" href="#L201">201</a>
<strong class="jxr_keyword">if</strong> (<strong
class="jxr_keyword">null</strong> == oldMetadata) {
+<a class="jxr_linenumber" name="L202" href="#L202">202</a>
<strong class="jxr_keyword">continue</strong>;
+<a class="jxr_linenumber" name="L203" href="#L203">203</a> }
+<a class="jxr_linenumber" name="L204" href="#L204">204</a>
assertNotNull(oldMetadata);
+<a class="jxr_linenumber" name="L205" href="#L205">205</a>
+<a class="jxr_linenumber" name="L206" href="#L206">206</a>
<strong class="jxr_keyword">final</strong> TiffImageMetadata oldExifMetadata =
oldMetadata.getExif();
+<a class="jxr_linenumber" name="L207" href="#L207">207</a>
<strong class="jxr_keyword">if</strong> (<strong
class="jxr_keyword">null</strong> == oldExifMetadata) {
+<a class="jxr_linenumber" name="L208" href="#L208">208</a>
<strong class="jxr_keyword">continue</strong>;
+<a class="jxr_linenumber" name="L209" href="#L209">209</a> }
+<a class="jxr_linenumber" name="L210" href="#L210">210</a>
assertNotNull(oldExifMetadata);
+<a class="jxr_linenumber" name="L211" href="#L211">211</a>
oldMetadata.dump();
+<a class="jxr_linenumber" name="L212" href="#L212">212</a>
+<a class="jxr_linenumber" name="L213" href="#L213">213</a> <em
class="jxr_comment">// TiffImageMetadata tiffImageMetadata =
metadata.getExif();</em>
+<a class="jxr_linenumber" name="L214" href="#L214">214</a> <em
class="jxr_comment">// Photoshop photoshop = metadata.getPhotoshop();</em>
+<a class="jxr_linenumber" name="L215" href="#L215">215</a>
+<a class="jxr_linenumber" name="L216" href="#L216">216</a>
<strong class="jxr_keyword">final</strong> TiffOutputSet outputSet =
oldExifMetadata.getOutputSet();
+<a class="jxr_linenumber" name="L217" href="#L217">217</a> <em
class="jxr_comment">// outputSet.dump();</em>
+<a class="jxr_linenumber" name="L218" href="#L218">218</a>
+<a class="jxr_linenumber" name="L219" href="#L219">219</a>
<strong class="jxr_keyword">final</strong> ByteArrayOutputStream baos = <strong
class="jxr_keyword">new</strong> ByteArrayOutputStream();
+<a class="jxr_linenumber" name="L220" href="#L220">220</a>
rewriter.rewrite(byteSource, baos, outputSet);
+<a class="jxr_linenumber" name="L221" href="#L221">221</a>
<strong class="jxr_keyword">final</strong> byte[] bytes = baos.toByteArray();
+<a class="jxr_linenumber" name="L222" href="#L222">222</a>
<strong class="jxr_keyword">final</strong> File tempFile = createTempFile(name
+ <span class="jxr_string">"_"</span>, <span class="jxr_string">".jpg"</span>);
+<a class="jxr_linenumber" name="L223" href="#L223">223</a>
Debug.debug(<span class="jxr_string">"tempFile"</span>, tempFile);
+<a class="jxr_linenumber" name="L224" href="#L224">224</a>
FileUtils.writeByteArrayToFile(tempFile, bytes);
+<a class="jxr_linenumber" name="L225" href="#L225">225</a>
+<a class="jxr_linenumber" name="L226" href="#L226">226</a>
Debug.debug(<span class="jxr_string">"Output Segments:"</span>);
+<a class="jxr_linenumber" name="L227" href="#L227">227</a>
<strong class="jxr_keyword">new</strong> JpegUtils().dumpJFIF(<strong
class="jxr_keyword">new</strong> ByteSourceArray(bytes));
+<a class="jxr_linenumber" name="L228" href="#L228">228</a>
+<a class="jxr_linenumber" name="L229" href="#L229">229</a> <em
class="jxr_comment">// assertTrue(!hasExifData(tempFile));</em>
+<a class="jxr_linenumber" name="L230" href="#L230">230</a>
+<a class="jxr_linenumber" name="L231" href="#L231">231</a>
<strong class="jxr_keyword">final</strong> JpegImageMetadata newMetadata =
(JpegImageMetadata) Imaging
+<a class="jxr_linenumber" name="L232" href="#L232">232</a>
.getMetadata(tempFile);
+<a class="jxr_linenumber" name="L233" href="#L233">233</a>
assertNotNull(newMetadata);
+<a class="jxr_linenumber" name="L234" href="#L234">234</a>
<strong class="jxr_keyword">final</strong> TiffImageMetadata newExifMetadata =
newMetadata.getExif();
+<a class="jxr_linenumber" name="L235" href="#L235">235</a>
assertNotNull(newExifMetadata);
+<a class="jxr_linenumber" name="L236" href="#L236">236</a> <em
class="jxr_comment">// newMetadata.dump();</em>
+<a class="jxr_linenumber" name="L237" href="#L237">237</a>
+<a class="jxr_linenumber" name="L238" href="#L238">238</a>
compare(imageFile, oldExifMetadata, newExifMetadata);
+<a class="jxr_linenumber" name="L239" href="#L239">239</a> }
<strong class="jxr_keyword">catch</strong> (<strong
class="jxr_keyword">final</strong> IOException e) {
+<a class="jxr_linenumber" name="L240" href="#L240">240</a>
Debug.debug(<span class="jxr_string">"imageFile"</span>,
imageFile.getAbsoluteFile());
+<a class="jxr_linenumber" name="L241" href="#L241">241</a>
Debug.debug(e);
+<a class="jxr_linenumber" name="L242" href="#L242">242</a>
<strong class="jxr_keyword">throw</strong> e;
+<a class="jxr_linenumber" name="L243" href="#L243">243</a> }
<strong class="jxr_keyword">catch</strong> (<strong
class="jxr_keyword">final</strong> ImageReadException e) {
+<a class="jxr_linenumber" name="L244" href="#L244">244</a>
Debug.debug(<span class="jxr_string">"imageFile"</span>,
imageFile.getAbsoluteFile());
+<a class="jxr_linenumber" name="L245" href="#L245">245</a>
Debug.debug(e);
+<a class="jxr_linenumber" name="L246" href="#L246">246</a>
<strong class="jxr_keyword">throw</strong> e;
+<a class="jxr_linenumber" name="L247" href="#L247">247</a> }
<strong class="jxr_keyword">catch</strong> (<strong
class="jxr_keyword">final</strong> ImageWriteException e) {
+<a class="jxr_linenumber" name="L248" href="#L248">248</a>
Debug.debug(<span class="jxr_string">"imageFile"</span>,
imageFile.getAbsoluteFile());
+<a class="jxr_linenumber" name="L249" href="#L249">249</a>
Debug.debug(e);
+<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> }
+<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> @Test
+<a class="jxr_linenumber" name="L256" href="#L256">256</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testRewriteLossy() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="L257" href="#L257">257</a> <strong
class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.html">Rewriter</a>
rewriter = <strong class="jxr_keyword">new</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.html">Rewriter</a>()
{
+<a class="jxr_linenumber" name="L258" href="#L258">258</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
rewrite(<strong class="jxr_keyword">final</strong> ByteSource byteSource,
<strong class="jxr_keyword">final</strong> OutputStream os,
+<a class="jxr_linenumber" name="L259" href="#L259">259</a>
<strong class="jxr_keyword">final</strong> TiffOutputSet outputSet) <strong
class="jxr_keyword">throws</strong> ImageReadException,
+<a class="jxr_linenumber" name="L260" href="#L260">260</a>
IOException, ImageWriteException {
+<a class="jxr_linenumber" name="L261" href="#L261">261</a>
<strong class="jxr_keyword">new</strong>
ExifRewriter().updateExifMetadataLossy(byteSource, os,
+<a class="jxr_linenumber" name="L262" href="#L262">262</a>
outputSet);
+<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>
+<a class="jxr_linenumber" name="L266" href="#L266">266</a>
rewrite(rewriter, <span class="jxr_string">"lossy"</span>);
+<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> @Test
+<a class="jxr_linenumber" name="L270" href="#L270">270</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testRewriteLossless() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="L271" href="#L271">271</a> <strong
class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.html">Rewriter</a>
rewriter = <strong class="jxr_keyword">new</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.html">Rewriter</a>()
{
+<a class="jxr_linenumber" name="L272" href="#L272">272</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
rewrite(<strong class="jxr_keyword">final</strong> ByteSource byteSource,
<strong class="jxr_keyword">final</strong> OutputStream os,
+<a class="jxr_linenumber" name="L273" href="#L273">273</a>
<strong class="jxr_keyword">final</strong> TiffOutputSet outputSet) <strong
class="jxr_keyword">throws</strong> ImageReadException,
+<a class="jxr_linenumber" name="L274" href="#L274">274</a>
IOException, ImageWriteException {
+<a class="jxr_linenumber" name="L275" href="#L275">275</a>
<strong class="jxr_keyword">new</strong>
ExifRewriter().updateExifMetadataLossless(byteSource, os,
+<a class="jxr_linenumber" name="L276" href="#L276">276</a>
outputSet);
+<a class="jxr_linenumber" name="L277" href="#L277">277</a> }
+<a class="jxr_linenumber" name="L278" href="#L278">278</a> };
+<a class="jxr_linenumber" name="L279" href="#L279">279</a>
+<a class="jxr_linenumber" name="L280" href="#L280">280</a>
rewrite(rewriter, <span class="jxr_string">"lossless"</span>);
+<a class="jxr_linenumber" name="L281" href="#L281">281</a> }
+<a class="jxr_linenumber" name="L282" href="#L282">282</a>
+<a class="jxr_linenumber" name="L283" href="#L283">283</a> <strong
class="jxr_keyword">private</strong>
Map<Integer,TiffImageMetadata.Directory> makeDirectoryMap(<strong
class="jxr_keyword">final</strong> List<? <strong
class="jxr_keyword">extends</strong> ImageMetadataItem> directories) {
+<a class="jxr_linenumber" name="L284" href="#L284">284</a> <strong
class="jxr_keyword">final</strong>
Map<Integer,TiffImageMetadata.Directory> directoryMap = <strong
class="jxr_keyword">new</strong>
HashMap<Integer,TiffImageMetadata.Directory>();
+<a class="jxr_linenumber" name="L285" href="#L285">285</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i =
0; i < directories.size(); i++) {
+<a class="jxr_linenumber" name="L286" href="#L286">286</a> <strong
class="jxr_keyword">final</strong> TiffImageMetadata.Directory directory =
(TiffImageMetadata.Directory) directories
+<a class="jxr_linenumber" name="L287" href="#L287">287</a>
.get(i);
+<a class="jxr_linenumber" name="L288" href="#L288">288</a>
directoryMap.put(directory.type, directory);
+<a class="jxr_linenumber" name="L289" href="#L289">289</a> }
+<a class="jxr_linenumber" name="L290" href="#L290">290</a> <strong
class="jxr_keyword">return</strong> directoryMap;
+<a class="jxr_linenumber" name="L291" href="#L291">291</a> }
+<a class="jxr_linenumber" name="L292" href="#L292">292</a>
+<a class="jxr_linenumber" name="L293" href="#L293">293</a> <strong
class="jxr_keyword">private</strong> Map<Integer,TiffField>
makeFieldMap(<strong class="jxr_keyword">final</strong> List<? <strong
class="jxr_keyword">extends</strong> ImageMetadataItem> items) {
+<a class="jxr_linenumber" name="L294" href="#L294">294</a> <strong
class="jxr_keyword">final</strong> Map<Integer,TiffField> fieldMap =
<strong class="jxr_keyword">new</strong> HashMap<Integer,TiffField>();
+<a class="jxr_linenumber" name="L295" href="#L295">295</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i =
0; i < items.size(); i++) {
+<a class="jxr_linenumber" name="L296" href="#L296">296</a> <strong
class="jxr_keyword">final</strong> TiffImageMetadata.TiffMetadataItem item =
(TiffImageMetadata.TiffMetadataItem) items.get(i);
+<a class="jxr_linenumber" name="L297" href="#L297">297</a> <strong
class="jxr_keyword">final</strong> TiffField field = item.getTiffField();
+<a class="jxr_linenumber" name="L298" href="#L298">298</a> <strong
class="jxr_keyword">if</strong> (!fieldMap.containsKey(field.getTag())) {
+<a class="jxr_linenumber" name="L299" href="#L299">299</a>
fieldMap.put(field.getTag(), field);
+<a class="jxr_linenumber" name="L300" href="#L300">300</a> }
+<a class="jxr_linenumber" name="L301" href="#L301">301</a> }
+<a class="jxr_linenumber" name="L302" href="#L302">302</a> <strong
class="jxr_keyword">return</strong> fieldMap;
+<a class="jxr_linenumber" name="L303" href="#L303">303</a> }
+<a class="jxr_linenumber" name="L304" href="#L304">304</a>
+<a class="jxr_linenumber" name="L305" href="#L305">305</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong>
compare(<strong class="jxr_keyword">final</strong> File imageFile, <strong
class="jxr_keyword">final</strong> TiffImageMetadata oldExifMetadata,
+<a class="jxr_linenumber" name="L306" href="#L306">306</a> <strong
class="jxr_keyword">final</strong> TiffImageMetadata newExifMetadata) <strong
class="jxr_keyword">throws</strong> ImageReadException {
+<a class="jxr_linenumber" name="L307" href="#L307">307</a>
assertNotNull(oldExifMetadata);
+<a class="jxr_linenumber" name="L308" href="#L308">308</a>
assertNotNull(newExifMetadata);
+<a class="jxr_linenumber" name="L309" href="#L309">309</a>
+<a class="jxr_linenumber" name="L310" href="#L310">310</a> <strong
class="jxr_keyword">final</strong> List<? <strong
class="jxr_keyword">extends</strong> ImageMetadataItem> oldDirectories =
oldExifMetadata.getDirectories();
+<a class="jxr_linenumber" name="L311" href="#L311">311</a> <strong
class="jxr_keyword">final</strong> List<? <strong
class="jxr_keyword">extends</strong> ImageMetadataItem> newDirectories =
newExifMetadata.getDirectories();
+<a class="jxr_linenumber" name="L312" href="#L312">312</a>
+<a class="jxr_linenumber" name="L313" href="#L313">313</a>
assertTrue(oldDirectories.size() == newDirectories.size());
+<a class="jxr_linenumber" name="L314" href="#L314">314</a>
+<a class="jxr_linenumber" name="L315" href="#L315">315</a> <strong
class="jxr_keyword">final</strong>
Map<Integer,TiffImageMetadata.Directory> oldDirectoryMap =
makeDirectoryMap(oldDirectories);
+<a class="jxr_linenumber" name="L316" href="#L316">316</a> <strong
class="jxr_keyword">final</strong>
Map<Integer,TiffImageMetadata.Directory> newDirectoryMap =
makeDirectoryMap(newDirectories);
+<a class="jxr_linenumber" name="L317" href="#L317">317</a>
+<a class="jxr_linenumber" name="L318" href="#L318">318</a>
assertEquals(oldDirectories.size(), oldDirectoryMap.keySet().size());
+<a class="jxr_linenumber" name="L319" href="#L319">319</a> <strong
class="jxr_keyword">final</strong> List<Integer> oldDirectoryTypes =
<strong class="jxr_keyword">new</strong>
ArrayList<Integer>(oldDirectoryMap.keySet());
+<a class="jxr_linenumber" name="L320" href="#L320">320</a>
Collections.sort(oldDirectoryTypes);
+<a class="jxr_linenumber" name="L321" href="#L321">321</a> <strong
class="jxr_keyword">final</strong> List<Integer> newDirectoryTypes =
<strong class="jxr_keyword">new</strong>
ArrayList<Integer>(newDirectoryMap.keySet());
+<a class="jxr_linenumber" name="L322" href="#L322">322</a>
Collections.sort(newDirectoryTypes);
+<a class="jxr_linenumber" name="L323" href="#L323">323</a>
assertEquals(oldDirectoryTypes, newDirectoryTypes);
+<a class="jxr_linenumber" name="L324" href="#L324">324</a>
+<a class="jxr_linenumber" name="L325" href="#L325">325</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i =
0; i < oldDirectoryTypes.size(); i++) {
+<a class="jxr_linenumber" name="L326" href="#L326">326</a> <strong
class="jxr_keyword">final</strong> Integer dirType = oldDirectoryTypes.get(i);
+<a class="jxr_linenumber" name="L327" href="#L327">327</a>
+<a class="jxr_linenumber" name="L328" href="#L328">328</a> <em
class="jxr_comment">// Debug.debug("dirType", dirType);</em>
+<a class="jxr_linenumber" name="L329" href="#L329">329</a>
+<a class="jxr_linenumber" name="L330" href="#L330">330</a> <strong
class="jxr_keyword">final</strong> TiffImageMetadata.Directory oldDirectory =
oldDirectoryMap
+<a class="jxr_linenumber" name="L331" href="#L331">331</a>
.get(dirType);
+<a class="jxr_linenumber" name="L332" href="#L332">332</a> <strong
class="jxr_keyword">final</strong> TiffImageMetadata.Directory newDirectory =
newDirectoryMap
+<a class="jxr_linenumber" name="L333" href="#L333">333</a>
.get(dirType);
+<a class="jxr_linenumber" name="L334" href="#L334">334</a>
assertNotNull(oldDirectory);
+<a class="jxr_linenumber" name="L335" href="#L335">335</a>
assertNotNull(newDirectory);
+<a class="jxr_linenumber" name="L336" href="#L336">336</a>
+<a class="jxr_linenumber" name="L337" href="#L337">337</a> <strong
class="jxr_keyword">final</strong> List<? <strong
class="jxr_keyword">extends</strong> ImageMetadataItem> oldItems =
oldDirectory.getItems();
+<a class="jxr_linenumber" name="L338" href="#L338">338</a> <strong
class="jxr_keyword">final</strong> List<? <strong
class="jxr_keyword">extends</strong> ImageMetadataItem> newItems =
newDirectory.getItems();
+<a class="jxr_linenumber" name="L339" href="#L339">339</a>
+<a class="jxr_linenumber" name="L340" href="#L340">340</a> <strong
class="jxr_keyword">final</strong> Map<Integer,TiffField> oldFieldMap =
makeFieldMap(oldItems);
+<a class="jxr_linenumber" name="L341" href="#L341">341</a> <strong
class="jxr_keyword">final</strong> Map<Integer,TiffField> newFieldMap =
makeFieldMap(newItems);
+<a class="jxr_linenumber" name="L342" href="#L342">342</a>
+<a class="jxr_linenumber" name="L343" href="#L343">343</a> <strong
class="jxr_keyword">final</strong> Set<Integer> missingInNew = <strong
class="jxr_keyword">new</strong> HashSet<Integer>(oldFieldMap.keySet());
+<a class="jxr_linenumber" name="L344" href="#L344">344</a>
missingInNew.removeAll(newFieldMap.keySet());
+<a class="jxr_linenumber" name="L345" href="#L345">345</a>
+<a class="jxr_linenumber" name="L346" href="#L346">346</a> <strong
class="jxr_keyword">final</strong> Set<Integer> missingInOld = <strong
class="jxr_keyword">new</strong> HashSet<Integer>(newFieldMap.keySet());
+<a class="jxr_linenumber" name="L347" href="#L347">347</a>
missingInOld.removeAll(oldFieldMap.keySet());
+<a class="jxr_linenumber" name="L348" href="#L348">348</a>
+<a class="jxr_linenumber" name="L349" href="#L349">349</a>
assertTrue(missingInNew.size() == 0);
+<a class="jxr_linenumber" name="L350" href="#L350">350</a>
assertTrue(missingInOld.size() == 0);
+<a class="jxr_linenumber" name="L351" href="#L351">351</a>
+<a class="jxr_linenumber" name="L352" href="#L352">352</a>
assertEquals(oldItems.size(), oldFieldMap.keySet().size());
<a class="jxr_linenumber" name="L353" href="#L353">353</a>
assertEquals(oldFieldMap.keySet(), newFieldMap.keySet());
-<a class="jxr_linenumber" name="L354" href="#L354">354</a>
-<a class="jxr_linenumber" name="L355" href="#L355">355</a> <strong
class="jxr_keyword">final</strong> List<Integer> oldFieldTags = <strong
class="jxr_keyword">new</strong> ArrayList<Integer>(oldFieldMap.keySet());
-<a class="jxr_linenumber" name="L356" href="#L356">356</a>
Collections.sort(oldFieldTags);
-<a class="jxr_linenumber" name="L357" href="#L357">357</a> <strong
class="jxr_keyword">final</strong> List<Integer> newFieldTags = <strong
class="jxr_keyword">new</strong> ArrayList<Integer>(newFieldMap.keySet());
-<a class="jxr_linenumber" name="L358" href="#L358">358</a>
Collections.sort(newFieldTags);
-<a class="jxr_linenumber" name="L359" href="#L359">359</a>
assertEquals(oldFieldTags, newFieldTags);
-<a class="jxr_linenumber" name="L360" href="#L360">360</a>
-<a class="jxr_linenumber" name="L361" href="#L361">361</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> j =
0; j < oldFieldTags.size(); j++) {
-<a class="jxr_linenumber" name="L362" href="#L362">362</a>
<strong class="jxr_keyword">final</strong> Integer fieldTag =
oldFieldTags.get(j);
-<a class="jxr_linenumber" name="L363" href="#L363">363</a>
-<a class="jxr_linenumber" name="L364" href="#L364">364</a>
<strong class="jxr_keyword">final</strong> TiffField oldField =
oldFieldMap.get(fieldTag);
-<a class="jxr_linenumber" name="L365" href="#L365">365</a>
<strong class="jxr_keyword">final</strong> TiffField newField =
newFieldMap.get(fieldTag);
-<a class="jxr_linenumber" name="L366" href="#L366">366</a>
-<a class="jxr_linenumber" name="L367" href="#L367">367</a> <em
class="jxr_comment">// fieldTag.</em>
-<a class="jxr_linenumber" name="L368" href="#L368">368</a>
assertNotNull(oldField);
-<a class="jxr_linenumber" name="L369" href="#L369">369</a>
assertNotNull(newField);
-<a class="jxr_linenumber" name="L370" href="#L370">370</a>
-<a class="jxr_linenumber" name="L371" href="#L371">371</a>
assertEquals(oldField.getTag(), newField.getTag());
-<a class="jxr_linenumber" name="L372" href="#L372">372</a>
assertEquals(dirType.intValue(), newField.getDirectoryType());
-<a class="jxr_linenumber" name="L373" href="#L373">373</a>
assertEquals(oldField.getDirectoryType(), newField.getDirectoryType());
-<a class="jxr_linenumber" name="L374" href="#L374">374</a>
-<a class="jxr_linenumber" name="L375" href="#L375">375</a>
<strong class="jxr_keyword">if</strong> (oldField.getFieldType() ==
FieldType.ASCII) {
-<a class="jxr_linenumber" name="L376" href="#L376">376</a>
<em class="jxr_comment">// Imaging currently doesn't correctly rewrite</em>
-<a class="jxr_linenumber" name="L377" href="#L377">377</a>
<em class="jxr_comment">// strings if any byte had the highest bit set,</em>
-<a class="jxr_linenumber" name="L378" href="#L378">378</a>
<em class="jxr_comment">// so if the source had that, all bets are off.</em>
-<a class="jxr_linenumber" name="L379" href="#L379">379</a>
<strong class="jxr_keyword">final</strong> byte[] rawBytes =
oldField.getByteArrayValue();
-<a class="jxr_linenumber" name="L380" href="#L380">380</a>
<strong class="jxr_keyword">boolean</strong> hasInvalidByte = false;
-<a class="jxr_linenumber" name="L381" href="#L381">381</a>
<strong class="jxr_keyword">for</strong> (<strong
class="jxr_keyword">final</strong> byte rawByte : rawBytes) {
-<a class="jxr_linenumber" name="L382" href="#L382">382</a>
<strong class="jxr_keyword">if</strong> ((rawByte & 0x80) != 0) {
-<a class="jxr_linenumber" name="L383" href="#L383">383</a>
hasInvalidByte = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L384" href="#L384">384</a>
<strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="L385" href="#L385">385</a>
}
-<a class="jxr_linenumber" name="L386" href="#L386">386</a>
}
[... 110 lines stripped ...]