Commit b5c24476e7ac3a7f36b36c604934309187d5b9f8
Fixed merge
Showing
1 changed file
with
2 additions
and
1 deletions
openbr/plugins/imgproc/slidingwindow.cpp
| @@ -29,7 +29,8 @@ namespace br | @@ -29,7 +29,8 @@ namespace br | ||
| 29 | * \brief Sliding Window Framework | 29 | * \brief Sliding Window Framework |
| 30 | * \author Jordan Cheney | 30 | * \author Jordan Cheney |
| 31 | */ | 31 | */ |
| 32 | -class SlidingWindowTransform : public UntrainableMetaTransform | 32 | + |
| 33 | +class SlidingWindowTransform : public MetaTransform | ||
| 33 | { | 34 | { |
| 34 | Q_OBJECT | 35 | Q_OBJECT |
| 35 | 36 |