[Libreoffice-commits] core.git: canvas/source

Mike Kaganski mike.kaganski at collabora.com
Wed Dec 20 03:56:04 UTC 2017


 canvas/source/cairo/cairo_canvashelper.cxx |    2 +-
 canvas/source/tools/canvastools.cxx        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0545c1ad981a3dcb8264da3215bc069b03f4d988
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Fri Dec 15 14:42:06 2017 +0200

    Properly skip ignored value
    
    Change-Id: I1ac75cde58a52f87ef6825baa2e689dbc449c8f0
    Reviewed-on: https://gerrit.libreoffice.org/46547
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index 06c07665a831..74b612928ffd 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -2097,7 +2097,7 @@ namespace cairocanvas
                         *pOut++ = vcl::unotools::toDoubleColor(*pIn++);
                         *pOut++ = vcl::unotools::toDoubleColor(*pIn++);
                         *pOut++ = vcl::unotools::toDoubleColor(*pIn++);
-                        *pOut++ = 1.0; // the value does not matter
+                        *pOut++ = 1.0; pIn++; // the value does not matter
                     }
                     return aRes;
                 }
diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx
index a80f23b3f2f4..d1155243275c 100644
--- a/canvas/source/tools/canvastools.cxx
+++ b/canvas/source/tools/canvastools.cxx
@@ -678,7 +678,7 @@ namespace canvas
                             *pOut++ = vcl::unotools::toDoubleColor(*pIn++);
                             *pOut++ = vcl::unotools::toDoubleColor(*pIn++);
                             *pOut++ = vcl::unotools::toDoubleColor(*pIn++);
-                            *pOut++ = 1.0;
+                            *pOut++ = 1.0; pIn++;
                         }
                         return aRes;
                     }


More information about the Libreoffice-commits mailing list