Showing with 13 additions and 19 deletions.
  1. +4 −7 ms-windows/osgeo4w/package-nightly64.cmd
  2. +5 −8 ms-windows/osgeo4w/package64.cmd
  3. +1 −1 src/core/composer/qgscomposition.cpp
  4. +3 −3 src/core/qgsvectorlayereditutils.cpp
11 changes: 4 additions & 7 deletions ms-windows/osgeo4w/package-nightly64.cmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,15 @@ if "%VERSION%"=="" goto error
if "%PACKAGE%"=="" goto error
if "%PACKAGENAME%"=="" set PACKAGENAME=qgis-dev

path %SYSTEMROOT%\system32;%SYSTEMROOT%;%SYSTEMROOT%\System32\Wbem;%PROGRAMFILES(X86)%\CMake 2.8\bin
set PYTHONPATH=

call "%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64
path %PATH%;%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\Common7\IDE

if "%OSGEO4W_ROOT%"=="" set OSGEO4W_ROOT=C:\OSGeo4W64
if not exist "%OSGEO4W_ROOT%\bin\o4w_env.bat" goto error
call "%OSGEO4W_ROOT%\bin\o4w_env.bat"
path %PATH%;c:\cygwin\bin
echo on

set PYTHONPATH=
call "%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64
path %PROGRAMFILES(X86)%\CMake 2.8\bin;%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\Common7\IDE;%PATH%;c:\cygwin\bin

set O4W_ROOT=%OSGEO4W_ROOT:\=/%
set LIB_DIR=%O4W_ROOT%

Expand Down
13 changes: 5 additions & 8 deletions ms-windows/osgeo4w/package64.cmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ REM ***************************************************************************
set GRASS_VERSION=6.4.3

set BUILDDIR=%CD%\build64
REM set BUILDDIR=%TEMP%\qgis_unstable
set LOG=%BUILDDIR%\build.log

if not exist "%BUILDDIR%" mkdir %BUILDDIR%
Expand All @@ -29,16 +28,14 @@ if "%VERSION%"=="" goto error
if "%PACKAGE%"=="" goto error
if "%PACKAGENAME%"=="" set PACKAGENAME=qgis

path %SYSTEMROOT%\system32;%SYSTEMROOT%;%SYSTEMROOT%\System32\Wbem;%PROGRAMFILES(X86)%\CMake 2.8\bin
set PYTHONPATH=

call "%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64
path %PATH%;%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\Common7\IDE

if "%OSGEO4W_ROOT%"=="" set OSGEO4W_ROOT=C:\OSGeo4W64
if not exist "%OSGEO4W_ROOT%\bin\o4w_env.bat" goto error
call "%OSGEO4W_ROOT%\bin\o4w_env.bat"
path %PATH%;c:\cygwin\bin
echo on

set PYTHONPATH=
call "%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64
path %PROGRAMFILES(X86)%\CMake 2.8\bin;%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\Common7\IDE;%PATH%;c:\cygwin\bin

set O4W_ROOT=%OSGEO4W_ROOT:\=/%
set LIB_DIR=%O4W_ROOT%
Expand Down
2 changes: 1 addition & 1 deletion src/core/composer/qgscomposition.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -963,7 +963,7 @@ void QgsComposition::selectNextByZOrder( ZValueDirection direction )
}

//select item with target z value
QgsComposerItem* selectedItem;
QgsComposerItem* selectedItem = 0;
switch ( direction )
{
case QgsComposition::ZValueBelow:
Expand Down
6 changes: 3 additions & 3 deletions src/core/qgsvectorlayereditutils.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ int QgsVectorLayerEditUtils::splitParts( const QList<QgsPoint>& splitLine, bool
featureList << QgsFeature( f );
}

int addPartRet;
int addPartRet = 0;
foreach ( const QgsFeature& feat, featureList )
{
QList<QgsGeometry*> newGeometries;
Expand All @@ -364,14 +364,14 @@ int QgsVectorLayerEditUtils::splitParts( const QList<QgsPoint>& splitLine, bool
for ( int i = 0; i < newGeometries.size(); ++i )
{
addPartRet = feat.geometry()->addPart( newGeometries.at( i ) );
if ( addPartRet != 0 )
if ( addPartRet )
break;
}

// For test only: Exception already thrown here...
// feat.geometry()->asWkb();

if ( addPartRet == 0 )
if ( !addPartRet )
{
L->editBuffer()->changeGeometry( feat.id(), feat.geometry() );
}
Expand Down