Commit d15634d66d4b7682c0703c5cc78d7bd10ff9d37f
1 parent
42f14ad5
Compress " * " to " *"
Surely this will save many bytes of source code.
Showing
10 changed files
with
90 additions
and
90 deletions
app/br/br.cpp
| @@ -178,7 +178,7 @@ public: | @@ -178,7 +178,7 @@ public: | ||
| 178 | } else if (!strcmp(fun, "objects")) { | 178 | } else if (!strcmp(fun, "objects")) { |
| 179 | check(parc <= 2, "Incorrect parameter count for 'objects'."); | 179 | check(parc <= 2, "Incorrect parameter count for 'objects'."); |
| 180 | int size = br_objects(NULL, 0, parc >= 1 ? parv[0] : ".*", parc >= 2 ? parv[1] : ".*"); | 180 | int size = br_objects(NULL, 0, parc >= 1 ? parv[0] : ".*", parc >= 2 ? parv[1] : ".*"); |
| 181 | - char * temp = new char[size]; | 181 | + char *temp = new char[size]; |
| 182 | br_objects(temp, size, parc >= 1 ? parv[0] : ".*", parc >= 2 ? parv[1] : ".*"); | 182 | br_objects(temp, size, parc >= 1 ? parv[0] : ".*", parc >= 2 ? parv[1] : ".*"); |
| 183 | printf("%s\n", temp); | 183 | printf("%s\n", temp); |
| 184 | delete [] temp; | 184 | delete [] temp; |
openbr/core/core.cpp
| @@ -49,7 +49,7 @@ struct AlgorithmCore | @@ -49,7 +49,7 @@ struct AlgorithmCore | ||
| 49 | 49 | ||
| 50 | QScopedPointer<Transform> trainingWrapper(Transform::make("DirectStream(readMode=DistributeFrames)", NULL)); | 50 | QScopedPointer<Transform> trainingWrapper(Transform::make("DirectStream(readMode=DistributeFrames)", NULL)); |
| 51 | 51 | ||
| 52 | - CompositeTransform * downcast = dynamic_cast<CompositeTransform *>(trainingWrapper.data()); | 52 | + CompositeTransform *downcast = dynamic_cast<CompositeTransform *>(trainingWrapper.data()); |
| 53 | if (downcast == NULL) | 53 | if (downcast == NULL) |
| 54 | qFatal("downcast failed?"); | 54 | qFatal("downcast failed?"); |
| 55 | downcast->transforms.append(this->transform.data()); | 55 | downcast->transforms.append(this->transform.data()); |
| @@ -144,7 +144,7 @@ struct AlgorithmCore | @@ -144,7 +144,7 @@ struct AlgorithmCore | ||
| 144 | fileExclusion = true; | 144 | fileExclusion = true; |
| 145 | } | 145 | } |
| 146 | 146 | ||
| 147 | - Gallery * temp = Gallery::make(input); | 147 | + Gallery *temp = Gallery::make(input); |
| 148 | qint64 total = temp->totalSize(); | 148 | qint64 total = temp->totalSize(); |
| 149 | 149 | ||
| 150 | Globals->currentStep = 0; | 150 | Globals->currentStep = 0; |
| @@ -156,13 +156,13 @@ struct AlgorithmCore | @@ -156,13 +156,13 @@ struct AlgorithmCore | ||
| 156 | 156 | ||
| 157 | if (!multiProcess) { | 157 | if (!multiProcess) { |
| 158 | basePipe.reset(Transform::make(pipeDesc,NULL)); | 158 | basePipe.reset(Transform::make(pipeDesc,NULL)); |
| 159 | - CompositeTransform * downcast = dynamic_cast<CompositeTransform *>(basePipe.data()); | 159 | + CompositeTransform *downcast = dynamic_cast<CompositeTransform *>(basePipe.data()); |
| 160 | 160 | ||
| 161 | if (downcast == NULL) qFatal("downcast failed?"); | 161 | if (downcast == NULL) qFatal("downcast failed?"); |
| 162 | 162 | ||
| 163 | downcast->transforms.prepend(this->transform.data()); | 163 | downcast->transforms.prepend(this->transform.data()); |
| 164 | if (fileExclusion) { | 164 | if (fileExclusion) { |
| 165 | - Transform * temp = Transform::make("FileExclusion(" + gallery.flat() + ")", downcast); | 165 | + Transform *temp = Transform::make("FileExclusion(" + gallery.flat() + ")", downcast); |
| 166 | downcast->transforms.prepend(temp); | 166 | downcast->transforms.prepend(temp); |
| 167 | } | 167 | } |
| 168 | 168 | ||
| @@ -180,7 +180,7 @@ struct AlgorithmCore | @@ -180,7 +180,7 @@ struct AlgorithmCore | ||
| 180 | // Next, we make a Stream (with placeholder transform) | 180 | // Next, we make a Stream (with placeholder transform) |
| 181 | QString streamDesc = "Stream(readMode=StreamGallery)"; | 181 | QString streamDesc = "Stream(readMode=StreamGallery)"; |
| 182 | QScopedPointer<Transform> baseStream(Transform::make(streamDesc, NULL)); | 182 | QScopedPointer<Transform> baseStream(Transform::make(streamDesc, NULL)); |
| 183 | - WrapperTransform * wrapper = dynamic_cast<WrapperTransform *> (baseStream.data()); | 183 | + WrapperTransform *wrapper = dynamic_cast<WrapperTransform *> (baseStream.data()); |
| 184 | 184 | ||
| 185 | // replace that placeholder with the pipe we built | 185 | // replace that placeholder with the pipe we built |
| 186 | wrapper->transform = basePipe.data(); | 186 | wrapper->transform = basePipe.data(); |
| @@ -373,7 +373,7 @@ struct AlgorithmCore | @@ -373,7 +373,7 @@ struct AlgorithmCore | ||
| 373 | File colGallery = targetGallery; | 373 | File colGallery = targetGallery; |
| 374 | qint64 rowSize; | 374 | qint64 rowSize; |
| 375 | 375 | ||
| 376 | - Gallery * temp; | 376 | + Gallery *temp; |
| 377 | if (transposeMode) | 377 | if (transposeMode) |
| 378 | { | 378 | { |
| 379 | rowGallery = targetGallery; | 379 | rowGallery = targetGallery; |
| @@ -456,7 +456,7 @@ struct AlgorithmCore | @@ -456,7 +456,7 @@ struct AlgorithmCore | ||
| 456 | { | 456 | { |
| 457 | compareRegionDesc = compareRegionDesc; | 457 | compareRegionDesc = compareRegionDesc; |
| 458 | compareRegion.reset(Transform::make(compareRegionDesc,NULL)); | 458 | compareRegion.reset(Transform::make(compareRegionDesc,NULL)); |
| 459 | - CompositeTransform * downcast = dynamic_cast<CompositeTransform *> (compareRegion.data()); | 459 | + CompositeTransform *downcast = dynamic_cast<CompositeTransform *> (compareRegion.data()); |
| 460 | if (downcast == NULL) | 460 | if (downcast == NULL) |
| 461 | qFatal("Pipe downcast failed in compare"); | 461 | qFatal("Pipe downcast failed in compare"); |
| 462 | 462 | ||
| @@ -496,7 +496,7 @@ struct AlgorithmCore | @@ -496,7 +496,7 @@ struct AlgorithmCore | ||
| 496 | 496 | ||
| 497 | // Assign the comparison transform we previously built, and the output transform we just built to | 497 | // Assign the comparison transform we previously built, and the output transform we just built to |
| 498 | // two stages of a pipe. | 498 | // two stages of a pipe. |
| 499 | - CompositeTransform * downcast = dynamic_cast<CompositeTransform *> (join.data()); | 499 | + CompositeTransform *downcast = dynamic_cast<CompositeTransform *> (join.data()); |
| 500 | downcast->transforms.append(compareRegion.data()); | 500 | downcast->transforms.append(compareRegion.data()); |
| 501 | downcast->transforms.append(outputTform.data()); | 501 | downcast->transforms.append(outputTform.data()); |
| 502 | 502 | ||
| @@ -508,7 +508,7 @@ struct AlgorithmCore | @@ -508,7 +508,7 @@ struct AlgorithmCore | ||
| 508 | // and pass the transforms it reads through the base algorithm. | 508 | // and pass the transforms it reads through the base algorithm. |
| 509 | QString streamDesc = "Stream(readMode=StreamGallery)"; | 509 | QString streamDesc = "Stream(readMode=StreamGallery)"; |
| 510 | QScopedPointer<Transform> streamBase(Transform::make(streamDesc, NULL)); | 510 | QScopedPointer<Transform> streamBase(Transform::make(streamDesc, NULL)); |
| 511 | - WrapperTransform * streamWrapper = dynamic_cast<WrapperTransform *> (streamBase.data()); | 511 | + WrapperTransform *streamWrapper = dynamic_cast<WrapperTransform *> (streamBase.data()); |
| 512 | streamWrapper->transform = join.data(); | 512 | streamWrapper->transform = join.data(); |
| 513 | 513 | ||
| 514 | // The transform we will use is now complete. | 514 | // The transform we will use is now complete. |
| @@ -687,7 +687,7 @@ void br::Convert(const File &fileType, const File &inputFile, const File &output | @@ -687,7 +687,7 @@ void br::Convert(const File &fileType, const File &inputFile, const File &output | ||
| 687 | 687 | ||
| 688 | if (targetFiles.size() != m.cols) | 688 | if (targetFiles.size() != m.cols) |
| 689 | { | 689 | { |
| 690 | - MatrixOutput * mOut = dynamic_cast<MatrixOutput *>(o.data()); | 690 | + MatrixOutput *mOut = dynamic_cast<MatrixOutput *>(o.data()); |
| 691 | if (mOut) | 691 | if (mOut) |
| 692 | mOut->data.create(queryFiles.size(), 1, CV_32FC1); | 692 | mOut->data.create(queryFiles.size(), 1, CV_32FC1); |
| 693 | } | 693 | } |
| @@ -730,7 +730,7 @@ QSharedPointer<br::Transform> br::Transform::fromAlgorithm(const QString &algori | @@ -730,7 +730,7 @@ QSharedPointer<br::Transform> br::Transform::fromAlgorithm(const QString &algori | ||
| 730 | else { | 730 | else { |
| 731 | QSharedPointer<Transform> orig_tform = AlgorithmManager::getAlgorithm(algorithm)->transform; | 731 | QSharedPointer<Transform> orig_tform = AlgorithmManager::getAlgorithm(algorithm)->transform; |
| 732 | QSharedPointer<Transform> newRoot = QSharedPointer<Transform>(Transform::make("Stream(readMode=DistributeFrames)", NULL)); | 732 | QSharedPointer<Transform> newRoot = QSharedPointer<Transform>(Transform::make("Stream(readMode=DistributeFrames)", NULL)); |
| 733 | - WrapperTransform * downcast = dynamic_cast<WrapperTransform *> (newRoot.data()); | 733 | + WrapperTransform *downcast = dynamic_cast<WrapperTransform *> (newRoot.data()); |
| 734 | downcast->transform = orig_tform.data(); | 734 | downcast->transform = orig_tform.data(); |
| 735 | downcast->init(); | 735 | downcast->init(); |
| 736 | return newRoot; | 736 | return newRoot; |
openbr/openbr_plugin.cpp
| @@ -1310,7 +1310,7 @@ QList<Transform *> Transform::getChildren() const | @@ -1310,7 +1310,7 @@ QList<Transform *> Transform::getChildren() const | ||
| 1310 | { | 1310 | { |
| 1311 | QList<Transform *> output; | 1311 | QList<Transform *> output; |
| 1312 | for (int i=0; i < metaObject()->propertyCount(); i++) { | 1312 | for (int i=0; i < metaObject()->propertyCount(); i++) { |
| 1313 | - const char * prop_name = metaObject()->property(i).name(); | 1313 | + const char *prop_name = metaObject()->property(i).name(); |
| 1314 | const QVariant &variant = this->property(prop_name); | 1314 | const QVariant &variant = this->property(prop_name); |
| 1315 | 1315 | ||
| 1316 | if (variant.canConvert<Transform *>()) | 1316 | if (variant.canConvert<Transform *>()) |
| @@ -1321,11 +1321,11 @@ QList<Transform *> Transform::getChildren() const | @@ -1321,11 +1321,11 @@ QList<Transform *> Transform::getChildren() const | ||
| 1321 | return output; | 1321 | return output; |
| 1322 | } | 1322 | } |
| 1323 | 1323 | ||
| 1324 | -TemplateEvent * Transform::getEvent(const QString &name) | 1324 | +TemplateEvent *Transform::getEvent(const QString &name) |
| 1325 | { | 1325 | { |
| 1326 | - foreach(Transform * child, getChildren()) | 1326 | + foreach(Transform *child, getChildren()) |
| 1327 | { | 1327 | { |
| 1328 | - TemplateEvent * probe = child->getEvent(name); | 1328 | + TemplateEvent *probe = child->getEvent(name); |
| 1329 | if (probe) | 1329 | if (probe) |
| 1330 | return probe; | 1330 | return probe; |
| 1331 | } | 1331 | } |
openbr/openbr_plugin.h
| @@ -1258,14 +1258,14 @@ public: | @@ -1258,14 +1258,14 @@ public: | ||
| 1258 | * and copy enough of their state that projectUpdate can safely be called on the original | 1258 | * and copy enough of their state that projectUpdate can safely be called on the original |
| 1259 | * instance, and the copy concurrently. | 1259 | * instance, and the copy concurrently. |
| 1260 | */ | 1260 | */ |
| 1261 | - virtual Transform * smartCopy(bool &newTransform) { newTransform=false; return this;} | 1261 | + virtual Transform *smartCopy(bool &newTransform) { newTransform=false; return this;} |
| 1262 | 1262 | ||
| 1263 | - virtual Transform * smartCopy() {bool junk; return smartCopy(junk);} | 1263 | + virtual Transform *smartCopy() {bool junk; return smartCopy(junk);} |
| 1264 | 1264 | ||
| 1265 | /*! | 1265 | /*! |
| 1266 | * \brief Recursively retrieve a named event, returns NULL if an event is not found. | 1266 | * \brief Recursively retrieve a named event, returns NULL if an event is not found. |
| 1267 | */ | 1267 | */ |
| 1268 | - virtual TemplateEvent * getEvent(const QString &name); | 1268 | + virtual TemplateEvent *getEvent(const QString &name); |
| 1269 | 1269 | ||
| 1270 | /*! | 1270 | /*! |
| 1271 | * \brief Get a list of child transforms of this transform, child transforms are considered to be | 1271 | * \brief Get a list of child transforms of this transform, child transforms are considered to be |
openbr/plugins/gui.cpp
| @@ -46,7 +46,7 @@ template<typename T> | @@ -46,7 +46,7 @@ template<typename T> | ||
| 46 | class ActualCreation : public NominalCreation | 46 | class ActualCreation : public NominalCreation |
| 47 | { | 47 | { |
| 48 | public: | 48 | public: |
| 49 | - T * basis; | 49 | + T *basis; |
| 50 | 50 | ||
| 51 | void creation() | 51 | void creation() |
| 52 | { | 52 | { |
| @@ -83,7 +83,7 @@ public: | @@ -83,7 +83,7 @@ public: | ||
| 83 | // the template with the NominalCreation interface, and call worker->creation | 83 | // the template with the NominalCreation interface, and call worker->creation |
| 84 | // in the slot. | 84 | // in the slot. |
| 85 | template<typename T> | 85 | template<typename T> |
| 86 | - T * getItem() | 86 | + T *getItem() |
| 87 | { | 87 | { |
| 88 | // If this is called by the main thread, we can just create the object | 88 | // If this is called by the main thread, we can just create the object |
| 89 | // it's important to check, otherwise we will have problems trying to | 89 | // it's important to check, otherwise we will have problems trying to |
| @@ -103,12 +103,12 @@ public: | @@ -103,12 +103,12 @@ public: | ||
| 103 | emit needCreation(); | 103 | emit needCreation(); |
| 104 | 104 | ||
| 105 | // collect the results, and return. | 105 | // collect the results, and return. |
| 106 | - T * output = actualWorker->basis; | 106 | + T *output = actualWorker->basis; |
| 107 | delete actualWorker; | 107 | delete actualWorker; |
| 108 | return output; | 108 | return output; |
| 109 | } | 109 | } |
| 110 | 110 | ||
| 111 | - NominalCreation * worker; | 111 | + NominalCreation *worker; |
| 112 | 112 | ||
| 113 | signals: | 113 | signals: |
| 114 | void needCreation(); | 114 | void needCreation(); |
| @@ -135,7 +135,7 @@ protected: | @@ -135,7 +135,7 @@ protected: | ||
| 135 | 135 | ||
| 136 | public: | 136 | public: |
| 137 | 137 | ||
| 138 | - DisplayWindow(QWidget * parent = NULL) : QLabel(parent) | 138 | + DisplayWindow(QWidget *parent = NULL) : QLabel(parent) |
| 139 | { | 139 | { |
| 140 | setFixedSize(200,200); | 140 | setFixedSize(200,200); |
| 141 | QApplication::instance()->installEventFilter(this); | 141 | QApplication::instance()->installEventFilter(this); |
| @@ -161,7 +161,7 @@ public slots: | @@ -161,7 +161,7 @@ public slots: | ||
| 161 | setFixedSize(temp); | 161 | setFixedSize(temp); |
| 162 | } | 162 | } |
| 163 | 163 | ||
| 164 | - bool eventFilter(QObject * obj, QEvent * event) | 164 | + bool eventFilter(QObject *obj, QEvent *event) |
| 165 | { | 165 | { |
| 166 | if (event->type() == QEvent::KeyPress) | 166 | if (event->type() == QEvent::KeyPress) |
| 167 | { | 167 | { |
| @@ -292,7 +292,7 @@ public: | @@ -292,7 +292,7 @@ public: | ||
| 292 | } else { | 292 | } else { |
| 293 | if (event->type() == QEvent::KeyPress) | 293 | if (event->type() == QEvent::KeyPress) |
| 294 | { | 294 | { |
| 295 | - QKeyEvent * kevent = (QKeyEvent *) event; | 295 | + QKeyEvent *kevent = (QKeyEvent *) event; |
| 296 | if (kevent->key() == Qt::Key_Enter || kevent->key() == Qt::Key_Return) { | 296 | if (kevent->key() == Qt::Key_Enter || kevent->key() == Qt::Key_Return) { |
| 297 | event->accept(); | 297 | event->accept(); |
| 298 | return true; | 298 | return true; |
| @@ -370,13 +370,13 @@ private: | @@ -370,13 +370,13 @@ private: | ||
| 370 | 370 | ||
| 371 | class PromptWindow : public DisplayWindow | 371 | class PromptWindow : public DisplayWindow |
| 372 | { | 372 | { |
| 373 | - bool eventFilter(QObject * obj, QEvent * event) | 373 | + bool eventFilter(QObject *obj, QEvent *event) |
| 374 | { | 374 | { |
| 375 | if (event->type() == QEvent::KeyPress) | 375 | if (event->type() == QEvent::KeyPress) |
| 376 | { | 376 | { |
| 377 | event->accept(); | 377 | event->accept(); |
| 378 | 378 | ||
| 379 | - QKeyEvent * key_event = dynamic_cast<QKeyEvent *> (event); | 379 | + QKeyEvent *key_event = dynamic_cast<QKeyEvent *> (event); |
| 380 | if (key_event == NULL) { | 380 | if (key_event == NULL) { |
| 381 | qDebug("failed to donwcast key event"); | 381 | qDebug("failed to donwcast key event"); |
| 382 | return true; | 382 | return true; |
| @@ -419,7 +419,7 @@ class GUIWindow : public QMainWindow | @@ -419,7 +419,7 @@ class GUIWindow : public QMainWindow | ||
| 419 | 419 | ||
| 420 | public: | 420 | public: |
| 421 | 421 | ||
| 422 | - GUIWindow(QWidget * parent = NULL) : QMainWindow(parent) | 422 | + GUIWindow(QWidget *parent = NULL) : QMainWindow(parent) |
| 423 | { | 423 | { |
| 424 | centralWidget = new QWidget(); | 424 | centralWidget = new QWidget(); |
| 425 | layout = new QHBoxLayout(); | 425 | layout = new QHBoxLayout(); |
| @@ -614,9 +614,9 @@ public: | @@ -614,9 +614,9 @@ public: | ||
| 614 | 614 | ||
| 615 | protected: | 615 | protected: |
| 616 | MainThreadCreator creator; | 616 | MainThreadCreator creator; |
| 617 | - DisplayWindow * window; | 617 | + DisplayWindow *window; |
| 618 | QImage qImageBuffer; | 618 | QImage qImageBuffer; |
| 619 | - QPixmap * displayBuffer; | 619 | + QPixmap *displayBuffer; |
| 620 | 620 | ||
| 621 | signals: | 621 | signals: |
| 622 | void updateImage(const QPixmap &input); | 622 | void updateImage(const QPixmap &input); |
| @@ -772,7 +772,7 @@ public: | @@ -772,7 +772,7 @@ public: | ||
| 772 | } | 772 | } |
| 773 | } | 773 | } |
| 774 | } | 774 | } |
| 775 | - RectMarkingWindow * trueWindow; | 775 | + RectMarkingWindow *trueWindow; |
| 776 | void init() | 776 | void init() |
| 777 | { | 777 | { |
| 778 | if (!Globals->useGui) | 778 | if (!Globals->useGui) |
| @@ -812,7 +812,7 @@ public: | @@ -812,7 +812,7 @@ public: | ||
| 812 | 812 | ||
| 813 | void project(const TemplateList &src, TemplateList &dst) const | 813 | void project(const TemplateList &src, TemplateList &dst) const |
| 814 | { | 814 | { |
| 815 | - Transform * non_const = (ElicitTransform *) this; | 815 | + Transform *non_const = (ElicitTransform *) this; |
| 816 | non_const->projectUpdate(src,dst); | 816 | non_const->projectUpdate(src,dst); |
| 817 | } | 817 | } |
| 818 | 818 | ||
| @@ -910,7 +910,7 @@ public: | @@ -910,7 +910,7 @@ public: | ||
| 910 | } | 910 | } |
| 911 | } | 911 | } |
| 912 | } | 912 | } |
| 913 | - PromptWindow * p_window; | 913 | + PromptWindow *p_window; |
| 914 | 914 | ||
| 915 | 915 | ||
| 916 | void init() | 916 | void init() |
openbr/plugins/meta.cpp
| @@ -185,7 +185,7 @@ class PipeTransform : public CompositeTransform | @@ -185,7 +185,7 @@ class PipeTransform : public CompositeTransform | ||
| 185 | QList<Transform *> flattened; | 185 | QList<Transform *> flattened; |
| 186 | for (int i=0;i < transforms.size(); i++) | 186 | for (int i=0;i < transforms.size(); i++) |
| 187 | { | 187 | { |
| 188 | - PipeTransform * probe = dynamic_cast<PipeTransform *> (transforms[i]); | 188 | + PipeTransform *probe = dynamic_cast<PipeTransform *> (transforms[i]); |
| 189 | if (!probe) { | 189 | if (!probe) { |
| 190 | flattened.append(transforms[i]); | 190 | flattened.append(transforms[i]); |
| 191 | continue; | 191 | continue; |
| @@ -641,7 +641,7 @@ class DistributeTemplateTransform : public MetaTransform | @@ -641,7 +641,7 @@ class DistributeTemplateTransform : public MetaTransform | ||
| 641 | 641 | ||
| 642 | public: | 642 | public: |
| 643 | 643 | ||
| 644 | - Transform * smartCopy(bool &newTransform) | 644 | + Transform *smartCopy(bool &newTransform) |
| 645 | { | 645 | { |
| 646 | if (!transform->timeVarying()) { | 646 | if (!transform->timeVarying()) { |
| 647 | newTransform = false; | 647 | newTransform = false; |
| @@ -649,7 +649,7 @@ public: | @@ -649,7 +649,7 @@ public: | ||
| 649 | } | 649 | } |
| 650 | newTransform = true; | 650 | newTransform = true; |
| 651 | 651 | ||
| 652 | - DistributeTemplateTransform * output = new DistributeTemplateTransform; | 652 | + DistributeTemplateTransform *output = new DistributeTemplateTransform; |
| 653 | bool newChild = false; | 653 | bool newChild = false; |
| 654 | output->transform = transform->smartCopy(newChild); | 654 | output->transform = transform->smartCopy(newChild); |
| 655 | if (newChild) | 655 | if (newChild) |
openbr/plugins/misc.cpp
| @@ -573,7 +573,7 @@ class EventTransform : public UntrainableMetaTransform | @@ -573,7 +573,7 @@ class EventTransform : public UntrainableMetaTransform | ||
| 573 | event.pulseSignal(dst); | 573 | event.pulseSignal(dst); |
| 574 | } | 574 | } |
| 575 | 575 | ||
| 576 | - TemplateEvent * getEvent(const QString &name) | 576 | + TemplateEvent *getEvent(const QString &name) |
| 577 | { | 577 | { |
| 578 | return name == eventName ? &event : NULL; | 578 | return name == eventName ? &event : NULL; |
| 579 | } | 579 | } |
openbr/plugins/openbr_internal.h
| @@ -48,8 +48,8 @@ protected: | @@ -48,8 +48,8 @@ protected: | ||
| 48 | class TransformCopier : public ResourceMaker<Transform> | 48 | class TransformCopier : public ResourceMaker<Transform> |
| 49 | { | 49 | { |
| 50 | public: | 50 | public: |
| 51 | - Transform * basis; | ||
| 52 | - TransformCopier(Transform * _basis) | 51 | + Transform *basis; |
| 52 | + TransformCopier(Transform *_basis) | ||
| 53 | { | 53 | { |
| 54 | basis = _basis; | 54 | basis = _basis; |
| 55 | } | 55 | } |
| @@ -66,7 +66,7 @@ class TimeInvariantWrapperTransform : public MetaTransform | @@ -66,7 +66,7 @@ class TimeInvariantWrapperTransform : public MetaTransform | ||
| 66 | public: | 66 | public: |
| 67 | Resource<Transform> transformSource; | 67 | Resource<Transform> transformSource; |
| 68 | 68 | ||
| 69 | - TimeInvariantWrapperTransform(Transform * basis) : transformSource(new TransformCopier(basis)) | 69 | + TimeInvariantWrapperTransform(Transform *basis) : transformSource(new TransformCopier(basis)) |
| 70 | { | 70 | { |
| 71 | if (!basis) | 71 | if (!basis) |
| 72 | qFatal("TimeInvariantWrapper created with NULL transform"); | 72 | qFatal("TimeInvariantWrapper created with NULL transform"); |
| @@ -76,14 +76,14 @@ public: | @@ -76,14 +76,14 @@ public: | ||
| 76 | 76 | ||
| 77 | virtual void project(const Template &src, Template &dst) const | 77 | virtual void project(const Template &src, Template &dst) const |
| 78 | { | 78 | { |
| 79 | - Transform * aTransform = transformSource.acquire(); | 79 | + Transform *aTransform = transformSource.acquire(); |
| 80 | aTransform->projectUpdate(src,dst); | 80 | aTransform->projectUpdate(src,dst); |
| 81 | transformSource.release(aTransform); | 81 | transformSource.release(aTransform); |
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | void project(const TemplateList &src, TemplateList &dst) const | 84 | void project(const TemplateList &src, TemplateList &dst) const |
| 85 | { | 85 | { |
| 86 | - Transform * aTransform = transformSource.acquire(); | 86 | + Transform *aTransform = transformSource.acquire(); |
| 87 | aTransform->projectUpdate(src,dst); | 87 | aTransform->projectUpdate(src,dst); |
| 88 | transformSource.release(aTransform); | 88 | transformSource.release(aTransform); |
| 89 | } | 89 | } |
| @@ -94,7 +94,7 @@ public: | @@ -94,7 +94,7 @@ public: | ||
| 94 | } | 94 | } |
| 95 | 95 | ||
| 96 | private: | 96 | private: |
| 97 | - Transform * baseTransform; | 97 | + Transform *baseTransform; |
| 98 | }; | 98 | }; |
| 99 | 99 | ||
| 100 | /*! | 100 | /*! |
| @@ -139,7 +139,7 @@ public: | @@ -139,7 +139,7 @@ public: | ||
| 139 | *\brief For transforms that don't do any training, this default implementation | 139 | *\brief For transforms that don't do any training, this default implementation |
| 140 | * which creates a new copy of the Transform from its description string is sufficient. | 140 | * which creates a new copy of the Transform from its description string is sufficient. |
| 141 | */ | 141 | */ |
| 142 | - virtual Transform * smartCopy(bool &newTransform) | 142 | + virtual Transform *smartCopy(bool &newTransform) |
| 143 | { | 143 | { |
| 144 | newTransform = true; | 144 | newTransform = true; |
| 145 | return this->clone(); | 145 | return this->clone(); |
| @@ -262,7 +262,7 @@ public: | @@ -262,7 +262,7 @@ public: | ||
| 262 | * it creates a new copy of its own class, and gives that copy the child transforms | 262 | * it creates a new copy of its own class, and gives that copy the child transforms |
| 263 | * returned by calling smartCopy on this transforms children | 263 | * returned by calling smartCopy on this transforms children |
| 264 | */ | 264 | */ |
| 265 | - Transform * smartCopy(bool &newTransform) | 265 | + Transform *smartCopy(bool &newTransform) |
| 266 | { | 266 | { |
| 267 | if (!timeVarying()) { | 267 | if (!timeVarying()) { |
| 268 | newTransform = false; | 268 | newTransform = false; |
| @@ -284,7 +284,7 @@ public: | @@ -284,7 +284,7 @@ public: | ||
| 284 | name += ")"; | 284 | name += ")"; |
| 285 | name.replace("br::",""); | 285 | name.replace("br::",""); |
| 286 | 286 | ||
| 287 | - CompositeTransform * output = dynamic_cast<CompositeTransform *>(Transform::make(name, NULL)); | 287 | + CompositeTransform *output = dynamic_cast<CompositeTransform *>(Transform::make(name, NULL)); |
| 288 | 288 | ||
| 289 | if (output == NULL) | 289 | if (output == NULL) |
| 290 | qFatal("Dynamic cast failed!"); | 290 | qFatal("Dynamic cast failed!"); |
| @@ -292,7 +292,7 @@ public: | @@ -292,7 +292,7 @@ public: | ||
| 292 | foreach(Transform* t, transforms ) | 292 | foreach(Transform* t, transforms ) |
| 293 | { | 293 | { |
| 294 | bool newItem = false; | 294 | bool newItem = false; |
| 295 | - Transform * maybe_copy = t->smartCopy(newItem); | 295 | + Transform *maybe_copy = t->smartCopy(newItem); |
| 296 | if (newItem) | 296 | if (newItem) |
| 297 | maybe_copy->setParent(output); | 297 | maybe_copy->setParent(output); |
| 298 | output->transforms.append(maybe_copy); | 298 | output->transforms.append(maybe_copy); |
| @@ -335,7 +335,7 @@ struct WorkerProcess | @@ -335,7 +335,7 @@ struct WorkerProcess | ||
| 335 | { | 335 | { |
| 336 | QString transform; | 336 | QString transform; |
| 337 | QString baseName; | 337 | QString baseName; |
| 338 | - EnrollmentWorker * processInterface; | 338 | + EnrollmentWorker *processInterface; |
| 339 | 339 | ||
| 340 | void mainLoop(); | 340 | void mainLoop(); |
| 341 | }; | 341 | }; |
openbr/plugins/slidingwindow.cpp
| @@ -428,9 +428,9 @@ private: | @@ -428,9 +428,9 @@ private: | ||
| 428 | // each input dimension. Each input dimension corresponds to | 428 | // each input dimension. Each input dimension corresponds to |
| 429 | // one of the input rect region. Thus, each eigenvector represents | 429 | // one of the input rect region. Thus, each eigenvector represents |
| 430 | // a set of overlaping regions. | 430 | // a set of overlaping regions. |
| 431 | - float * midX = new float[nRegions]; | ||
| 432 | - float * midY = new float[nRegions]; | ||
| 433 | - float * avgWidth = new float[nRegions]; | 431 | + float *midX = new float[nRegions]; |
| 432 | + float *midY = new float[nRegions]; | ||
| 433 | + float *avgWidth = new float[nRegions]; | ||
| 434 | float *avgHeight = new float[nRegions]; | 434 | float *avgHeight = new float[nRegions]; |
| 435 | float *confs = new float[nRegions]; | 435 | float *confs = new float[nRegions]; |
| 436 | int *cnts = new int[nRegions]; | 436 | int *cnts = new int[nRegions]; |
openbr/plugins/stream.cpp
| @@ -45,10 +45,10 @@ public: | @@ -45,10 +45,10 @@ public: | ||
| 45 | SharedBuffer() {} | 45 | SharedBuffer() {} |
| 46 | virtual ~SharedBuffer() {} | 46 | virtual ~SharedBuffer() {} |
| 47 | 47 | ||
| 48 | - virtual void addItem(FrameData * input)=0; | 48 | + virtual void addItem(FrameData *input)=0; |
| 49 | virtual void reset()=0; | 49 | virtual void reset()=0; |
| 50 | 50 | ||
| 51 | - virtual FrameData * tryGetItem()=0; | 51 | + virtual FrameData *tryGetItem()=0; |
| 52 | virtual int size()=0; | 52 | virtual int size()=0; |
| 53 | }; | 53 | }; |
| 54 | 54 | ||
| @@ -63,14 +63,14 @@ public: | @@ -63,14 +63,14 @@ public: | ||
| 63 | next_target = 0; | 63 | next_target = 0; |
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | - void addItem(FrameData * input) | 66 | + void addItem(FrameData *input) |
| 67 | { | 67 | { |
| 68 | QMutexLocker bufferLock(&bufferGuard); | 68 | QMutexLocker bufferLock(&bufferGuard); |
| 69 | 69 | ||
| 70 | buffer.insert(input->sequenceNumber, input); | 70 | buffer.insert(input->sequenceNumber, input); |
| 71 | } | 71 | } |
| 72 | 72 | ||
| 73 | - FrameData * tryGetItem() | 73 | + FrameData *tryGetItem() |
| 74 | { | 74 | { |
| 75 | QMutexLocker bufferLock(&bufferGuard); | 75 | QMutexLocker bufferLock(&bufferGuard); |
| 76 | 76 | ||
| @@ -86,7 +86,7 @@ public: | @@ -86,7 +86,7 @@ public: | ||
| 86 | 86 | ||
| 87 | next_target = next_target + 1; | 87 | next_target = next_target + 1; |
| 88 | 88 | ||
| 89 | - FrameData * output = result.value(); | 89 | + FrameData *output = result.value(); |
| 90 | buffer.erase(result); | 90 | buffer.erase(result); |
| 91 | return output; | 91 | return output; |
| 92 | } | 92 | } |
| @@ -134,19 +134,19 @@ public: | @@ -134,19 +134,19 @@ public: | ||
| 134 | } | 134 | } |
| 135 | 135 | ||
| 136 | // called from the producer thread | 136 | // called from the producer thread |
| 137 | - void addItem(FrameData * input) | 137 | + void addItem(FrameData *input) |
| 138 | { | 138 | { |
| 139 | QReadLocker readLock(&bufferGuard); | 139 | QReadLocker readLock(&bufferGuard); |
| 140 | inputBuffer->append(input); | 140 | inputBuffer->append(input); |
| 141 | } | 141 | } |
| 142 | 142 | ||
| 143 | - FrameData * tryGetItem() | 143 | + FrameData *tryGetItem() |
| 144 | { | 144 | { |
| 145 | QReadLocker readLock(&bufferGuard); | 145 | QReadLocker readLock(&bufferGuard); |
| 146 | 146 | ||
| 147 | // There is something for us to get | 147 | // There is something for us to get |
| 148 | if (!outputBuffer->empty()) { | 148 | if (!outputBuffer->empty()) { |
| 149 | - FrameData * output = outputBuffer->first(); | 149 | + FrameData *output = outputBuffer->first(); |
| 150 | outputBuffer->removeFirst(); | 150 | outputBuffer->removeFirst(); |
| 151 | return output; | 151 | return output; |
| 152 | } | 152 | } |
| @@ -165,7 +165,7 @@ public: | @@ -165,7 +165,7 @@ public: | ||
| 165 | std::swap(inputBuffer, outputBuffer); | 165 | std::swap(inputBuffer, outputBuffer); |
| 166 | 166 | ||
| 167 | // Return a frame | 167 | // Return a frame |
| 168 | - FrameData * output = outputBuffer->first(); | 168 | + FrameData *output = outputBuffer->first(); |
| 169 | outputBuffer->removeFirst(); | 169 | outputBuffer->removeFirst(); |
| 170 | return output; | 170 | return output; |
| 171 | } | 171 | } |
| @@ -563,7 +563,7 @@ private: | @@ -563,7 +563,7 @@ private: | ||
| 563 | // apparently the text in seq files is 16 bit characters (UTF-16?) | 563 | // apparently the text in seq files is 16 bit characters (UTF-16?) |
| 564 | // since we don't really need the last byte, snad since it gets interpreted as | 564 | // since we don't really need the last byte, snad since it gets interpreted as |
| 565 | // a terminating char, let's just grab the first byte for storage | 565 | // a terminating char, let's just grab the first byte for storage |
| 566 | - void readText(int bytes, char * buffer) | 566 | + void readText(int bytes, char *buffer) |
| 567 | { | 567 | { |
| 568 | seqFile.read(buffer, bytes); | 568 | seqFile.read(buffer, bytes); |
| 569 | for (int i=0; i<bytes; i+=2) { | 569 | for (int i=0; i<bytes; i+=2) { |
| @@ -601,7 +601,7 @@ public: | @@ -601,7 +601,7 @@ public: | ||
| 601 | { | 601 | { |
| 602 | while (true) | 602 | while (true) |
| 603 | { | 603 | { |
| 604 | - FrameData * frame = allFrames.tryGetItem(); | 604 | + FrameData *frame = allFrames.tryGetItem(); |
| 605 | if (frame == NULL) | 605 | if (frame == NULL) |
| 606 | break; | 606 | break; |
| 607 | delete frame; | 607 | delete frame; |
| @@ -655,7 +655,7 @@ public: | @@ -655,7 +655,7 @@ public: | ||
| 655 | // Returns a NULL FrameData if too many frames are out, or the | 655 | // Returns a NULL FrameData if too many frames are out, or the |
| 656 | // data source is broken. Sets last_frame to true iff the FrameData | 656 | // data source is broken. Sets last_frame to true iff the FrameData |
| 657 | // returned is the last valid frame, and the data source is now broken. | 657 | // returned is the last valid frame, and the data source is now broken. |
| 658 | - FrameData * tryGetFrame(bool &last_frame) | 658 | + FrameData *tryGetFrame(bool &last_frame) |
| 659 | { | 659 | { |
| 660 | last_frame = false; | 660 | last_frame = false; |
| 661 | 661 | ||
| @@ -665,7 +665,7 @@ public: | @@ -665,7 +665,7 @@ public: | ||
| 665 | 665 | ||
| 666 | // Try to get a FrameData from the pool, if we can't it means too many | 666 | // Try to get a FrameData from the pool, if we can't it means too many |
| 667 | // frames are already out, and we will return NULL to indicate failure | 667 | // frames are already out, and we will return NULL to indicate failure |
| 668 | - FrameData * aFrame = allFrames.tryGetItem(); | 668 | + FrameData *aFrame = allFrames.tryGetItem(); |
| 669 | if (aFrame == NULL) | 669 | if (aFrame == NULL) |
| 670 | return NULL; | 670 | return NULL; |
| 671 | 671 | ||
| @@ -691,7 +691,7 @@ public: | @@ -691,7 +691,7 @@ public: | ||
| 691 | 691 | ||
| 692 | // Return a frame to the pool, returns true if the frame returned was the last | 692 | // Return a frame to the pool, returns true if the frame returned was the last |
| 693 | // frame issued, false otherwise | 693 | // frame issued, false otherwise |
| 694 | - bool returnFrame(FrameData * inputFrame) | 694 | + bool returnFrame(FrameData *inputFrame) |
| 695 | { | 695 | { |
| 696 | int frameNumber = inputFrame->sequenceNumber; | 696 | int frameNumber = inputFrame->sequenceNumber; |
| 697 | 697 | ||
| @@ -832,7 +832,7 @@ protected: | @@ -832,7 +832,7 @@ protected: | ||
| 832 | TemplateList templates; | 832 | TemplateList templates; |
| 833 | 833 | ||
| 834 | // processor for the current template | 834 | // processor for the current template |
| 835 | - TemplateProcessor * frameSource; | 835 | + TemplateProcessor *frameSource; |
| 836 | 836 | ||
| 837 | int next_sequence_number; | 837 | int next_sequence_number; |
| 838 | int final_frame; | 838 | int final_frame; |
| @@ -859,7 +859,7 @@ public: | @@ -859,7 +859,7 @@ public: | ||
| 859 | 859 | ||
| 860 | QList<ProcessingStage *> * stages; | 860 | QList<ProcessingStage *> * stages; |
| 861 | int start_idx; | 861 | int start_idx; |
| 862 | - FrameData * startItem; | 862 | + FrameData *startItem; |
| 863 | }; | 863 | }; |
| 864 | 864 | ||
| 865 | class ProcessingStage | 865 | class ProcessingStage |
| @@ -873,7 +873,7 @@ public: | @@ -873,7 +873,7 @@ public: | ||
| 873 | } | 873 | } |
| 874 | virtual ~ProcessingStage() {} | 874 | virtual ~ProcessingStage() {} |
| 875 | 875 | ||
| 876 | - virtual FrameData* run(FrameData * input, bool &should_continue, bool &final)=0; | 876 | + virtual FrameData* run(FrameData *input, bool &should_continue, bool &final)=0; |
| 877 | 877 | ||
| 878 | virtual bool tryAcquireNextStage(FrameData *& input, bool &final)=0; | 878 | virtual bool tryAcquireNextStage(FrameData *& input, bool &final)=0; |
| 879 | 879 | ||
| @@ -886,11 +886,11 @@ public: | @@ -886,11 +886,11 @@ public: | ||
| 886 | protected: | 886 | protected: |
| 887 | int thread_count; | 887 | int thread_count; |
| 888 | 888 | ||
| 889 | - SharedBuffer * inputBuffer; | ||
| 890 | - ProcessingStage * nextStage; | 889 | + SharedBuffer *inputBuffer; |
| 890 | + ProcessingStage *nextStage; | ||
| 891 | QList<ProcessingStage *> * stages; | 891 | QList<ProcessingStage *> * stages; |
| 892 | - QThreadPool * threads; | ||
| 893 | - Transform * transform; | 892 | + QThreadPool *threads; |
| 893 | + Transform *transform; | ||
| 894 | 894 | ||
| 895 | }; | 895 | }; |
| 896 | 896 | ||
| @@ -901,7 +901,7 @@ public: | @@ -901,7 +901,7 @@ public: | ||
| 901 | 901 | ||
| 902 | // Not much to worry about here, we will project the input | 902 | // Not much to worry about here, we will project the input |
| 903 | // and try to continue to the next stage. | 903 | // and try to continue to the next stage. |
| 904 | - FrameData * run(FrameData * input, bool &should_continue, bool &final) | 904 | + FrameData *run(FrameData *input, bool &should_continue, bool &final) |
| 905 | { | 905 | { |
| 906 | if (input == NULL) { | 906 | if (input == NULL) { |
| 907 | qFatal("null input to multi-thread stage"); | 907 | qFatal("null input to multi-thread stage"); |
| @@ -974,7 +974,7 @@ public: | @@ -974,7 +974,7 @@ public: | ||
| 974 | QReadWriteLock statusLock; | 974 | QReadWriteLock statusLock; |
| 975 | Status currentStatus; | 975 | Status currentStatus; |
| 976 | 976 | ||
| 977 | - FrameData * run(FrameData * input, bool &should_continue, bool &final) | 977 | + FrameData *run(FrameData *input, bool &should_continue, bool &final) |
| 978 | { | 978 | { |
| 979 | if (input == NULL) | 979 | if (input == NULL) |
| 980 | qFatal("NULL input to stage %d", this->stage_id); | 980 | qFatal("NULL input to stage %d", this->stage_id); |
| @@ -995,7 +995,7 @@ public: | @@ -995,7 +995,7 @@ public: | ||
| 995 | 995 | ||
| 996 | // Is there anything on our input buffer? If so we should start a thread with that. | 996 | // Is there anything on our input buffer? If so we should start a thread with that. |
| 997 | QWriteLocker lock(&statusLock); | 997 | QWriteLocker lock(&statusLock); |
| 998 | - FrameData * newItem = inputBuffer->tryGetItem(); | 998 | + FrameData *newItem = inputBuffer->tryGetItem(); |
| 999 | if (!newItem) | 999 | if (!newItem) |
| 1000 | { | 1000 | { |
| 1001 | this->currentStatus = STOPPING; | 1001 | this->currentStatus = STOPPING; |
| @@ -1008,9 +1008,9 @@ public: | @@ -1008,9 +1008,9 @@ public: | ||
| 1008 | return input; | 1008 | return input; |
| 1009 | } | 1009 | } |
| 1010 | 1010 | ||
| 1011 | - void startThread(br::FrameData * newItem) | 1011 | + void startThread(br::FrameData *newItem) |
| 1012 | { | 1012 | { |
| 1013 | - BasicLoop * next = new BasicLoop(); | 1013 | + BasicLoop *next = new BasicLoop(); |
| 1014 | next->stages = stages; | 1014 | next->stages = stages; |
| 1015 | next->start_idx = this->stage_id; | 1015 | next->start_idx = this->stage_id; |
| 1016 | next->startItem = newItem; | 1016 | next->startItem = newItem; |
| @@ -1099,7 +1099,7 @@ public: | @@ -1099,7 +1099,7 @@ public: | ||
| 1099 | SingleThreadStage::reset(); | 1099 | SingleThreadStage::reset(); |
| 1100 | } | 1100 | } |
| 1101 | 1101 | ||
| 1102 | - FrameData * run(FrameData * input, bool &should_continue, bool &final) | 1102 | + FrameData *run(FrameData *input, bool &should_continue, bool &final) |
| 1103 | { | 1103 | { |
| 1104 | if (input == NULL) | 1104 | if (input == NULL) |
| 1105 | qFatal("NULL frame in input stage"); | 1105 | qFatal("NULL frame in input stage"); |
| @@ -1112,7 +1112,7 @@ public: | @@ -1112,7 +1112,7 @@ public: | ||
| 1112 | // frame if a frame is currently available. | 1112 | // frame if a frame is currently available. |
| 1113 | QWriteLocker lock(&statusLock); | 1113 | QWriteLocker lock(&statusLock); |
| 1114 | bool last_frame = false; | 1114 | bool last_frame = false; |
| 1115 | - FrameData * newFrame = dataSource.tryGetFrame(last_frame); | 1115 | + FrameData *newFrame = dataSource.tryGetFrame(last_frame); |
| 1116 | 1116 | ||
| 1117 | // Were we able to get a frame? | 1117 | // Were we able to get a frame? |
| 1118 | if (newFrame) startThread(newFrame); | 1118 | if (newFrame) startThread(newFrame); |
| @@ -1180,7 +1180,7 @@ public: | @@ -1180,7 +1180,7 @@ public: | ||
| 1180 | void BasicLoop::run() | 1180 | void BasicLoop::run() |
| 1181 | { | 1181 | { |
| 1182 | int current_idx = start_idx; | 1182 | int current_idx = start_idx; |
| 1183 | - FrameData * target_item = startItem; | 1183 | + FrameData *target_item = startItem; |
| 1184 | bool should_continue = true; | 1184 | bool should_continue = true; |
| 1185 | bool the_end = false; | 1185 | bool the_end = false; |
| 1186 | forever | 1186 | forever |
| @@ -1319,7 +1319,7 @@ public: | @@ -1319,7 +1319,7 @@ public: | ||
| 1319 | 1319 | ||
| 1320 | // We have to get a frame before starting the thread | 1320 | // We have to get a frame before starting the thread |
| 1321 | bool last_frame = false; | 1321 | bool last_frame = false; |
| 1322 | - FrameData * firstFrame = readStage->dataSource.tryGetFrame(last_frame); | 1322 | + FrameData *firstFrame = readStage->dataSource.tryGetFrame(last_frame); |
| 1323 | if (firstFrame == NULL) | 1323 | if (firstFrame == NULL) |
| 1324 | qFatal("Failed to read first frame of video"); | 1324 | qFatal("Failed to read first frame of video"); |
| 1325 | 1325 | ||
| @@ -1362,7 +1362,7 @@ public: | @@ -1362,7 +1362,7 @@ public: | ||
| 1362 | 1362 | ||
| 1363 | dst.append(final_output); | 1363 | dst.append(final_output); |
| 1364 | 1364 | ||
| 1365 | - foreach(ProcessingStage * stage, processingStages) { | 1365 | + foreach(ProcessingStage *stage, processingStages) { |
| 1366 | stage->reset(); | 1366 | stage->reset(); |
| 1367 | } | 1367 | } |
| 1368 | } | 1368 | } |
| @@ -1474,8 +1474,8 @@ public: | @@ -1474,8 +1474,8 @@ public: | ||
| 1474 | protected: | 1474 | protected: |
| 1475 | QList<bool> stage_variance; | 1475 | QList<bool> stage_variance; |
| 1476 | 1476 | ||
| 1477 | - ReadStage * readStage; | ||
| 1478 | - SingleThreadStage * collectionStage; | 1477 | + ReadStage *readStage; |
| 1478 | + SingleThreadStage *collectionStage; | ||
| 1479 | QSharedPointer<CollectSets> collector; | 1479 | QSharedPointer<CollectSets> collector; |
| 1480 | 1480 | ||
| 1481 | QList<ProcessingStage *> processingStages; | 1481 | QList<ProcessingStage *> processingStages; |
| @@ -1497,7 +1497,7 @@ protected: | @@ -1497,7 +1497,7 @@ protected: | ||
| 1497 | // number of jobs. | 1497 | // number of jobs. |
| 1498 | static QHash<QObject *, QThreadPool *> pools; | 1498 | static QHash<QObject *, QThreadPool *> pools; |
| 1499 | static QMutex poolsAccess; | 1499 | static QMutex poolsAccess; |
| 1500 | - QThreadPool * threads; | 1500 | + QThreadPool *threads; |
| 1501 | 1501 | ||
| 1502 | void _project(const Template &src, Template &dst) const | 1502 | void _project(const Template &src, Template &dst) const |
| 1503 | { | 1503 | { |
| @@ -1573,7 +1573,7 @@ public: | @@ -1573,7 +1573,7 @@ public: | ||
| 1573 | basis.readMode = this->readMode; | 1573 | basis.readMode = this->readMode; |
| 1574 | 1574 | ||
| 1575 | // We need at least a CompositeTransform * to acess transform's children. | 1575 | // We need at least a CompositeTransform * to acess transform's children. |
| 1576 | - CompositeTransform * downcast = dynamic_cast<CompositeTransform *> (transform); | 1576 | + CompositeTransform *downcast = dynamic_cast<CompositeTransform *> (transform); |
| 1577 | 1577 | ||
| 1578 | // If this isn't even a composite transform, or it's not a pipe, just set up | 1578 | // If this isn't even a composite transform, or it's not a pipe, just set up |
| 1579 | // basis with 1 stage. | 1579 | // basis with 1 stage. |
| @@ -1627,7 +1627,7 @@ public: | @@ -1627,7 +1627,7 @@ public: | ||
| 1627 | } | 1627 | } |
| 1628 | //otherwise we build a pipe | 1628 | //otherwise we build a pipe |
| 1629 | else { | 1629 | else { |
| 1630 | - CompositeTransform * pipe = dynamic_cast<CompositeTransform *>(Transform::make("Pipe([])", this)); | 1630 | + CompositeTransform *pipe = dynamic_cast<CompositeTransform *>(Transform::make("Pipe([])", this)); |
| 1631 | pipe->transforms = sets[i]; | 1631 | pipe->transforms = sets[i]; |
| 1632 | pipe->init(); | 1632 | pipe->init(); |
| 1633 | transform_set.append(pipe); | 1633 | transform_set.append(pipe); |
| @@ -1638,10 +1638,10 @@ public: | @@ -1638,10 +1638,10 @@ public: | ||
| 1638 | basis.init(); | 1638 | basis.init(); |
| 1639 | } | 1639 | } |
| 1640 | 1640 | ||
| 1641 | - Transform * smartCopy(bool &newTransform) | 1641 | + Transform *smartCopy(bool &newTransform) |
| 1642 | { | 1642 | { |
| 1643 | // We just want the DirectStream to begin with, so just return a copy of that. | 1643 | // We just want the DirectStream to begin with, so just return a copy of that. |
| 1644 | - DirectStreamTransform * res = (DirectStreamTransform *) basis.smartCopy(newTransform); | 1644 | + DirectStreamTransform *res = (DirectStreamTransform *) basis.smartCopy(newTransform); |
| 1645 | res->activeFrames = this->activeFrames; | 1645 | res->activeFrames = this->activeFrames; |
| 1646 | return res; | 1646 | return res; |
| 1647 | } | 1647 | } |