mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-14 00:07:35 -04:00
Fix some warnings and test failures on nightlies
This commit is contained in:
parent
f5373ac3b9
commit
c452c3d85f
@ -84,7 +84,7 @@ class Merge(GeoAlgorithm):
|
||||
total = 100.0 / float(totalFeatureCount)
|
||||
writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
|
||||
fields.toList(), layers[0].dataProvider().geometryType(),
|
||||
layers[0].crs())
|
||||
layers[0].crs())
|
||||
|
||||
featureCount = 0
|
||||
for layer in layers:
|
||||
|
@ -307,7 +307,7 @@ void qgisCrash( int signal )
|
||||
if ( gdbpid == 0 )
|
||||
{
|
||||
// attach, backtrace and continue
|
||||
execl( "/usr/bin/gdb", "gdb", "-q", "-batch", "-n", pidstr, "-ex", "thread", "-ex", "bt full", exename, nullptr );
|
||||
execl( "/usr/bin/gdb", "gdb", "-q", "-batch", "-n", pidstr, "-ex", "thread", "-ex", "bt full", exename, NULL );
|
||||
perror( "cannot exec gdb" );
|
||||
exit( 1 );
|
||||
}
|
||||
|
BIN
tests/testdata/control_images/expected_geometry_part_count/expected_geometry_part_count_mask.png
vendored
Normal file
BIN
tests/testdata/control_images/expected_geometry_part_count/expected_geometry_part_count_mask.png
vendored
Normal file
Binary file not shown.
After Width: | Height: | Size: 5.4 KiB |
BIN
tests/testdata/control_images/expected_geometry_part_num/expected_geometry_part_num_mask.png
vendored
Normal file
BIN
tests/testdata/control_images/expected_geometry_part_num/expected_geometry_part_num_mask.png
vendored
Normal file
Binary file not shown.
After Width: | Height: | Size: 5.4 KiB |
Binary file not shown.
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 29 KiB |
Loading…
x
Reference in New Issue
Block a user