fix some warnings

Author: luigidr

docs/build/doctrees/02 - First Java Application with OpenCV.doctree

@@ -98,9 +98,8 @@ <h2>Create a simple application<a class="headerlink" href="#create-a-simple-appl
 <p>Then we can define a new Mat.</p>
 <div class="admonition note">
 <p class="first admonition-title">Note</p>
-<p class="last">The class <strong>Mat</strong> represents an n-dimensional dense numerical single-channel or multi-channel array. It can be used to store real or complex-valued vectors and matrices, grayscale or color images, voxel volumes, vector fields, point clouds, tensors, histograms.</p>
+<p class="last">The class <strong>Mat</strong> represents an n-dimensional dense numerical single-channel or multi-channel array. It can be used to store real or complex-valued vectors and matrices, grayscale or color images, voxel volumes, vector fields, point clouds, tensors, histograms. For more details check out the OpenCV <a class="reference external" href="http://docs.opencv.org/modules/core/doc/basic_structures.html">page</a>.</p>
 </div>
-<p>For more details check out the OpenCV <a class="reference external" href="http://docs.opencv.org/modules/core/doc/basic_structures.html">page</a>.</p>
 <div class="highlight-java"><div class="highlight"><pre><span class="n">Mat</span> <span class="n">mat</span> <span class="o">=</span> <span class="n">Mat</span><span class="o">.</span><span class="na">eye</span><span class="o">(</span><span class="mi">3</span><span class="o">,</span> <span class="mi">3</span><span class="o">,</span> <span class="n">CvType</span><span class="o">.</span><span class="na">CV_8UC1</span><span class="o">);</span>
 </pre></div>
 </div>

docs/build/doctrees/04 - OpenCV Basics.doctree

@@ -177,8 +177,28 @@ <h2>Load an Image and Add it to the Stream<a class="headerlink" href="#load-an-i
 </dd>
 </dl>
 <p>So we&#8217;ll have:</p>
+<div class="highlight-java"><div class="highlight"><pre><span class="n">Core</span><span class="o">.</span><span class="na">addWeighted</span><span class="o">(</span><span class="n">imageROI</span><span class="o">,</span> <span class="mf">1.0</span><span class="o">,</span> <span class="n">logo</span><span class="o">,</span> <span class="mf">0.7</span><span class="o">,</span> <span class="mf">0.0</span><span class="o">,</span> <span class="n">imageROI</span><span class="o">);</span>
+</pre></div>
+</div>
 <p>The second method (<code class="docutils literal"><span class="pre">copyTo</span></code>) simply copies a Mat into the other. We&#8217;ll have:</p>
+<div class="highlight-java"><div class="highlight"><pre><span class="n">Mat</span> <span class="n">mask</span> <span class="o">=</span> <span class="n">logo</span><span class="o">.</span><span class="na">clone</span><span class="o">();</span>
+<span class="n">logo</span><span class="o">.</span><span class="na">copyTo</span><span class="o">(</span><span class="n">imageROI</span><span class="o">,</span> <span class="n">mask</span><span class="o">);</span>
+</pre></div>
+</div>
 <p>Everything we have done so far to add the logo to the image has to perform only IF our checkbox is check and the image loading process has ended successfully. So we have to add an if condition:</p>
+<div class="highlight-java"><div class="highlight"><pre><span class="k">if</span> <span class="o">(</span><span class="n">logoCheckBox</span><span class="o">.</span><span class="na">isSelected</span><span class="o">()</span> <span class="o">&amp;&amp;</span> <span class="k">this</span><span class="o">.</span><span class="na">logo</span> <span class="o">!=</span> <span class="kc">null</span><span class="o">)</span>
+<span class="o">{</span>
+    <span class="n">Rect</span> <span class="n">roi</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Rect</span><span class="o">(</span><span class="n">frame</span><span class="o">.</span><span class="na">cols</span><span class="o">()</span> <span class="o">-</span> <span class="n">logo</span><span class="o">.</span><span class="na">cols</span><span class="o">(),</span> <span class="n">frame</span><span class="o">.</span><span class="na">rows</span><span class="o">()</span> <span class="o">-</span> <span class="n">logo</span><span class="o">.</span><span class="na">rows</span><span class="o">(),</span> <span class="n">logo</span><span class="o">.</span><span class="na">cols</span><span class="o">(),</span><span class="n">logo</span><span class="o">.</span><span class="na">rows</span><span class="o">());</span>
+    <span class="n">Mat</span> <span class="n">imageROI</span> <span class="o">=</span> <span class="n">frame</span><span class="o">.</span><span class="na">submat</span><span class="o">(</span><span class="n">roi</span><span class="o">);</span>
+    <span class="c1">// add the logo: method #1</span>
+
+    <span class="n">Core</span><span class="o">.</span><span class="na">addWeighted</span><span class="o">(</span><span class="n">imageROI</span><span class="o">,</span> <span class="mf">1.0</span><span class="o">,</span> <span class="n">logo</span><span class="o">,</span> <span class="mf">0.7</span><span class="o">,</span> <span class="mf">0.0</span><span class="o">,</span> <span class="n">imageROI</span><span class="o">);</span>
+    <span class="c1">// add the logo: method #2</span>
+    <span class="c1">// Mat mask = logo.clone();</span>
+    <span class="c1">// logo.copyTo(imageROI, mask);</span>
+<span class="o">}</span>
+</pre></div>
+</div>
 </div>
 <div class="section" id="calculate-a-histogram">
 <h2>Calculate a Histogram<a class="headerlink" href="#calculate-a-histogram" title="Permalink to this headline">¶</a></h2>