[Libreoffice-commits] core.git: 3 commits - editeng/source vcl/source

[Stephan Bergmann]

 editeng/source/misc/hangulhanja.cxx |    8 +++-----
 vcl/source/filter/jpeg/transupp.c   |   12 ++++++++++++
 2 files changed, 15 insertions(+), 5 deletions(-)

New commits:
commit 6e2bc6403be0f9cf4cf324f870623c87f45cfa93
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Apr 22 09:20:09 2013 +0200

    -Werror=unused-parameter
    
    Change-Id: I01995091350ed4a4edefa13ca6946d23062112a1

diff --git a/vcl/source/filter/jpeg/transupp.c b/vcl/source/filter/jpeg/transupp.c
index a1c3416..54472ff 100644
--- a/vcl/source/filter/jpeg/transupp.c
+++ b/vcl/source/filter/jpeg/transupp.c
@@ -1594,6 +1594,8 @@ jcopy_markers_setup (j_decompress_ptr srcinfo, JCOPY_OPTION option)
     for (m = 0; m < 16; m++)
       jpeg_save_markers(srcinfo, JPEG_APP0 + m, 0xFFFF);
   }
+#else
+  (void) srcinfo; (void) option;
 #endif /* SAVE_MARKERS_SUPPORTED */
 }
 
commit 2a65f0e1857fccd4427eed733a49d8a4c2f67856
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Apr 22 09:17:06 2013 +0200

    Make jdiv_round_up available (-Werror=implicit-function-declaration)
    
    ...apparently caused by 845456565db945ffd2a1551ab86446fcd1717021 "DO NOT use
    internal headers of jpeg."  The warning there "I am not sure if it is all right
    to include parts of jpeg directly into our code" still holds, of course.
    
    Change-Id: I4754dbcd9b2c3eafc64d32c3b83faa53cf913abd

diff --git a/vcl/source/filter/jpeg/transupp.c b/vcl/source/filter/jpeg/transupp.c
index 500b0a2..a1c3416 100644
--- a/vcl/source/filter/jpeg/transupp.c
+++ b/vcl/source/filter/jpeg/transupp.c
@@ -21,6 +21,16 @@
 #include "jpegcomp.h"
 #include <ctype.h>      /* to declare isdigit() */
 
+/* Definition of jdiv_round_up is copied here from jutils.c in jpeg-8c.tar.gz,
+   just as the rest of this file appears to be copied here from transupp.c in
+   jpeg-8c.tar.gz: */
+static long
+jdiv_round_up (long a, long b)
+/* Compute a/b rounded up to next integer, ie, ceil(a/b) */
+/* Assumes a >= 0, b > 0 */
+{
+  return (a + b - 1L) / b;
+}
 
 #if JPEG_LIB_VERSION >= 70
 #define dstinfo_min_DCT_h_scaled_size dstinfo->min_DCT_h_scaled_size
commit 684aff90b0657cc46f1f453b8de4b3bdcb2f543e
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date:   Sun Apr 21 17:48:41 2013 +0200

    Slightly simplify loop
    
    Change-Id: If44e86ceecd4a407d3b4e294a03a84ad010f95e1
    Reviewed-on: https://gerrit.libreoffice.org/3539
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx
index 4f7189a..7d2c01e 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -534,9 +534,7 @@ namespace editeng
 
     bool HangulHanjaConversion_Impl::ContinueConversion( bool _bRepeatCurrentUnit )
     {
-        bool bNeedUserInteraction = false;  // when we leave here, do we need user interaction?
-
-        while ( !bNeedUserInteraction && implNextConvertible( _bRepeatCurrentUnit ) )
+        while ( implNextConvertible( _bRepeatCurrentUnit ) )
         {
             OUString sCurrentUnit( GetCurrentUnit() );
 
@@ -576,11 +574,11 @@ namespace editeng
 
                 // do not look for the next convertible: We have to wait for the user to interactivly
                 // decide what happens with the current convertible
-                bNeedUserInteraction = true;
+                return false;
             }
         }
 
-        return !bNeedUserInteraction;
+        return true;
     }
 
     bool HangulHanjaConversion_Impl::implGetConversionDirectionForCurrentPortion( HHC::ConversionDirection& rDirection )