Skip to content
Permalink
Browse files

fix Pal::registerCancellationCallback spelling

  • Loading branch information
jef-n committed Feb 24, 2019
1 parent 3711763 commit 918f5f393d73f84195dbdb6fb844a1cc2203f505
Showing with 3 additions and 4 deletions.
  1. +1 −1 src/core/pal/pal.cpp
  2. +1 −1 src/core/pal/pal.h
  3. +1 −2 src/core/qgslabelingengine.cpp
@@ -441,7 +441,7 @@ std::unique_ptr<Problem> Pal::extract( const QgsRectangle &extent, const QgsGeom
return prob;
}

void Pal::registerCancelationCallback( Pal::FnIsCanceled fnCanceled, void *context )
void Pal::registerCancellationCallback( Pal::FnIsCanceled fnCanceled, void *context )
{
fnIsCanceled = fnCanceled;
fnIsCanceledContext = context;
@@ -129,7 +129,7 @@ namespace pal
typedef bool ( *FnIsCanceled )( void *ctx );

//! Register a function that returns whether this job has been canceled - PAL calls it during the computation
void registerCancelationCallback( FnIsCanceled fnCanceled, void *context );
void registerCancellationCallback( FnIsCanceled fnCanceled, void *context );

//! Check whether the job has been canceled
inline bool isCanceled() { return fnIsCanceled ? fnIsCanceled( fnIsCanceledContext ) : false; }
@@ -283,8 +283,7 @@ void QgsLabelingEngine::run( QgsRenderContext &context )

QgsRectangle extent = extentGeom.boundingBox();


p.registerCancelationCallback( &_palIsCanceled, reinterpret_cast< void * >( &context ) );
p.registerCancellationCallback( &_palIsCanceled, reinterpret_cast< void * >( &context ) );

QTime t;
t.start();

0 comments on commit 918f5f3

Please sign in to comment.
You can’t perform that action at this time.