diff options
| author | mbansal <mayank.bansal@sri.com> | 2011-09-07 20:04:58 -0400 |
|---|---|---|
| committer | Wei-Ta Chen <weita@google.com> | 2011-09-09 10:39:01 -0700 |
| commit | e1178a73fd5756771d25d0b8375452450f509e99 (patch) | |
| tree | a5b77b36515e498f221b2427819efa651587fab1 /jni/feature_mos/src/mosaic/Mosaic.h | |
| parent | b332a22d55a38ee35008d98da3519730d1fa086b (diff) | |
| download | LegacyCamera-e1178a73fd5756771d25d0b8375452450f509e99.zip LegacyCamera-e1178a73fd5756771d25d0b8375452450f509e99.tar.gz LegacyCamera-e1178a73fd5756771d25d0b8375452450f509e99.tar.bz2 | |
Updates to allow cancellation of mosaic computation from a UI trigger.
1) reportProgress now takes a new boolean parameter that can be used to break out of the mosaic computation loop at the library level.
2) Added a cancel button to the progressDialog and a new Handler message to handle the button click so that the user can be taken back to the capture stage.
3) Updates to address the code review.
Change-Id: I0768da55dd6ccd9b1464d456ab41973779734c65
Diffstat (limited to 'jni/feature_mos/src/mosaic/Mosaic.h')
| -rw-r--r-- | jni/feature_mos/src/mosaic/Mosaic.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/jni/feature_mos/src/mosaic/Mosaic.h b/jni/feature_mos/src/mosaic/Mosaic.h index 25abc43..ecf0536 100644 --- a/jni/feature_mos/src/mosaic/Mosaic.h +++ b/jni/feature_mos/src/mosaic/Mosaic.h @@ -112,7 +112,7 @@ public: * \param progress Variable to set the current progress in. * \return Return code signifying success or failure. */ - int createMosaic(float &progress); + int createMosaic(float &progress, bool &cancelComputation); /*! * Obtains the resulting mosaic and its dimensions. @@ -141,6 +141,7 @@ public: */ static const int MOSAIC_RET_OK = 1; static const int MOSAIC_RET_ERROR = -1; + static const int MOSAIC_RET_CANCELLED = -2; protected: |