Merge branch 'grok2' into v2.17.xv2.17.8

This is the DoM support for Aaron Boxer's "grok" GPU J2K encoder,
with some cleanups and other assorted/related DoM changes.

1 files changed, 2 insertions, 1 deletions

diff --git a/src/lib/job.h b/src/lib/job.h
index dc5f7bc34..a4b7a319d 100644
--- a/src/lib/job.h
+++ b/src/lib/job.h
@@ -56,9 +56,10 @@ public:
 	}
 
 	void start ();
+	virtual void pause() {}
 	bool pause_by_user ();
 	void pause_by_priority ();
-	void resume ();
+	virtual void resume ();
 	void cancel ();
 
 	bool is_new () const;