[Libreoffice-commits] .: 2 commits - sal/inc vcl/source

[Caolán McNamara]

 sal/inc/sal/types.h                   |    2 +-
 vcl/source/glyphs/graphite_layout.cxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 3323ab3730a37566146f09fefbe77d4f1be8ba1e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Sep 22 20:09:17 2011 +0100

    bah, >= 4.6 then

diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h
index 22bad17..2dc3eaa 100644
--- a/sal/inc/sal/types.h
+++ b/sal/inc/sal/types.h
@@ -466,7 +466,7 @@ template< typename T1, typename T2 > inline T1 static_int_cast(T2 n) {
         SAL_WNODEPRECATED_DECLARATIONS_POP
 */
 
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5))
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
 #define SAL_WNODEPRECATED_DECLARATIONS_PUSH \
     _Pragma(SAL_STRINGIFY_ARG(GCC diagnostic push)) \
     _Pragma(SAL_STRINGIFY_ARG(GCC diagnostic ignored "-Wdeprecated-declarations"))
commit 8251f0b954fa33bf43824d6d77d31ee8de4f3e77
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Sep 22 17:25:00 2011 +0100

    WaE: signed/unsigned error

diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index a0f48c8..0085906 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -329,7 +329,7 @@ GraphiteLayout::fillFrom(gr_segment * pSegment, ImplLayoutArgs &rArgs, float fSc
             float leftBoundary = gr_slot_origin_X(clusterFirst);
             float rightBoundary = (clusterAfter)?
                 gr_slot_origin_X(clusterAfter) : gr_seg_advance_X(pSegment);
-            size_t bFirstChar = gr_cinfo_base(gr_seg_cinfo(pSegment, nFirstCharInCluster));
+            int bFirstChar = gr_cinfo_base(gr_seg_cinfo(pSegment, nFirstCharInCluster));
             if (mnSegCharOffset + bFirstChar >= mnMinCharPos &&
                 mnSegCharOffset + bFirstChar < mnEndCharPos)
             {
@@ -339,7 +339,7 @@ GraphiteLayout::fillFrom(gr_segment * pSegment, ImplLayoutArgs &rArgs, float fSc
                 {
                     for (int i = nFirstCharInCluster; i <= nLastCharInCluster; i++)
                     {
-                        size_t ibase = gr_cinfo_base(gr_seg_cinfo(pSegment, i));
+                        int ibase = gr_cinfo_base(gr_seg_cinfo(pSegment, i));
                         if (mnSegCharOffset + ibase >= mnEndCharPos)
                             break;
                         // from the point of view of the dx array, the xpos is