Merge branch 'master' into dev

diff --cc doc/html/group___turbo_j_p_e_g.html
index 49c54ca4b4f81c4848ff8a9c9f5a5e8d43c14c64,9363117ca77af6a2c2defb56c89dacfd0bd561f5..f5f63990519b407ca6b2407d3201c51456953ed3
--- 1/doc/html/group___turbo_j_p_e_g.html
--- 2/doc/html/group___turbo_j_p_e_g.html
+++ b/doc/html/group___turbo_j_p_e_g.html
@@@ -483,23 -455,8 +483,23 @@@ Variables</h2></td></tr
  </div><div class="memdoc">
  
  <p>Disable buffer (re)allocation. </p>
- <p>If passed to <a class="el" href="group___turbo_j_p_e_g.html#gaf38f2ed44bdc88e730e08b632fa6e88e" title="Compress an RGB, grayscale, or CMYK image into a JPEG image.">tjCompress2()</a> or <a class="el" href="group___turbo_j_p_e_g.html#gad02cd42b69f193a0623a9c801788df3a" title="Losslessly transform a JPEG image into another JPEG image.">tjTransform()</a>, this flag will cause those functions to generate an error if the JPEG image buffer is invalid or too small rather than attempting to allocate or reallocate that buffer. This reproduces the behavior of earlier versions of TurboJPEG. </p>
+ <p>If passed to one of the JPEG compression or transform functions, this flag will cause those functions to generate an error if the JPEG image buffer is invalid or too small rather than attempting to allocate or reallocate that buffer. This reproduces the behavior of earlier versions of TurboJPEG. </p>
  
 +</div>
 +</div>
 +<a class="anchor" id="ga519cfa4ef6c18d9e5b455fdf59306a3a"></a>
 +<div class="memitem">
 +<div class="memproto">
 +      <table class="memname">
 +        <tr>
 +          <td class="memname">#define TJFLAG_STOPONWARNING</td>
 +        </tr>
 +      </table>
 +</div><div class="memdoc">
 +
 +<p>Immediately discontinue the current compression/decompression/transform operation if the underlying codec throws a warning (non-fatal error). </p>
 +<p>The default behavior is to allow the operation to complete unless a fatal error is encountered. </p>
 +
  </div>
  </div>
  <a class="anchor" id="ga0aba955473315e405295d978f0c16511"></a>

diff --cc turbojpeg.h
Simple merge