From ffa974cd8dbace984f3879ae280650a3dbeff78a Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Sat, 26 May 2012 01:32:52 +0200
Subject: mesh gradient: fix bad indexing

(bzr r11417)
---
 build.xml                  | 5 ++---
 src/gradient-chemistry.cpp | 3 +++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index 884324907..1217f736d 100755
--- a/build.xml
+++ b/build.xml
@@ -31,7 +31,7 @@
 ## P R O J E C T   :   I N K S C A P E
 ########################################################################
 -->
-<project name="Inkscape" default="dist-all" basedir=".">
+<project name="Inkscape" default="dist-inkscape" basedir=".">
     <description>
         Build file for the Inkscape SVG editor.  This file
         was written for GTK-2.10 on Win32, but it should work
@@ -344,6 +344,7 @@
             -O2
             -mms-bitfields
             -fopenmp
+            -march=native
         </flags>
         <defines>
             -DVERSION=\"${version}\"
@@ -451,7 +452,6 @@
               stripcommand="${archutil}strip"
               objcopycommand="${archutil}objcopy">
        <flags>
-           -mwindows
            -mthreads
        </flags>
        <fileset dir="${build}">
@@ -524,7 +524,6 @@
               stripcommand="${archutil}strip"
               objcopycommand="${archutil}objcopy">
        <flags>
-           -mwindows
            -mthreads
        </flags>
        <fileset dir="${build}">
diff --git a/src/gradient-chemistry.cpp b/src/gradient-chemistry.cpp
index 6b1fcd627..6b1376fb5 100644
--- a/src/gradient-chemistry.cpp
+++ b/src/gradient-chemistry.cpp
@@ -717,6 +717,9 @@ guint32 sp_item_gradient_stop_query_style(SPItem *item, GrPointType point_type,
 
         switch (point_type) {
             case POINT_MG_CORNER: {
+                if (point_i >= mg->array.corners.size()) {
+                    return 0;
+                }
                 SPMeshNode const* cornerpoint = mg->array.corners[ point_i ];
 
                 if (cornerpoint) {
-- 
cgit v1.2.3