aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis CI <zmoelnig@travis-ci.umlaeute.mur.at>2017-12-05 16:53:07 +0000
committerTravis CI <zmoelnig@travis-ci.umlaeute.mur.at>2017-12-05 16:53:07 +0000
commit3c22e8b0b7a606465dc08dc05984f9b2b3fe3e3f (patch)
treed3de6ff6d9cc5f54b0d9e38d28c34cb5d21f6c76
parentdcf81eb1c38d8b75c08707a92d96508f5c257574 (diff)
Gem 37c8700166c6083ea863717ff4f8f8589cdcc3b2 linux/amd64
built 'master:37c8700166c6083ea863717ff4f8f8589cdcc3b2' for linux/amd64
-rwxr-xr-xGem/Gem.pd_linuxbin32810982 -> 32582611 bytes
-rw-r--r--Gem/develop/include/Gem/Utils/WorkerThread.h2
-rw-r--r--Gem/develop/include/Gem/plugins/imagesaver.h2
-rw-r--r--Gem/develop/include/Gem/plugins/video.h4
4 files changed, 3 insertions, 5 deletions
diff --git a/Gem/Gem.pd_linux b/Gem/Gem.pd_linux
index 73661c1..53efd80 100755
--- a/Gem/Gem.pd_linux
+++ b/Gem/Gem.pd_linux
Binary files differ
diff --git a/Gem/develop/include/Gem/Utils/WorkerThread.h b/Gem/develop/include/Gem/Utils/WorkerThread.h
index 9ab2285..36d4a4d 100644
--- a/Gem/develop/include/Gem/Utils/WorkerThread.h
+++ b/Gem/develop/include/Gem/Utils/WorkerThread.h
@@ -71,7 +71,7 @@ namespace gem { namespace thread {
// you can use it to set a semaphore in the main thread, to fetch
// the data
// it get's called once after process() has been successful
- // and will nott be called before dequeue has been called at least once
+ // and will not be called before dequeue has been called at least once
//
virtual void signal(void);
diff --git a/Gem/develop/include/Gem/plugins/imagesaver.h b/Gem/develop/include/Gem/plugins/imagesaver.h
index 4ba2515..e883669 100644
--- a/Gem/develop/include/Gem/plugins/imagesaver.h
+++ b/Gem/develop/include/Gem/plugins/imagesaver.h
@@ -106,7 +106,7 @@ namespace gem { namespace plugins {
*/
virtual void getWriteCapabilities(std::vector<std::string>&mimetypes, gem::Properties&props) = 0;
- /* returns TRUE, if it is save to use this backend from multple threads
+ /* returns TRUE, if it is save to use this backend from multiple threads
*/
virtual bool isThreadable(void) = 0;
};
diff --git a/Gem/develop/include/Gem/plugins/video.h b/Gem/develop/include/Gem/plugins/video.h
index 4944f94..a949c86 100644
--- a/Gem/develop/include/Gem/plugins/video.h
+++ b/Gem/develop/include/Gem/plugins/video.h
@@ -164,8 +164,6 @@ namespace gem { namespace plugins {
-
-
/**
* returns TRUE if the object can be used in a thread or FALSE otherwise
* if a backend implements threading itself, it should return FALSE
@@ -177,7 +175,7 @@ namespace gem { namespace plugins {
/** turn on/off "asynchronous"-grabbing
* default is "true"
* "asynchronous" means, that the device is constantly grabbing, and grabFrame() returns the current frame
- * non-"continuous" means, that the device will only issue a new grab when a frame has read
+ * non-"asynchronous" means, that the device will only issue a new grab when a frame has read
* (thus potentially reducing the CPU-load to what is needed, at the cost of slightly outdated images
* returns: the old state
*/