Commit 755b71c49a82ea2b8dd726d73a4eed41fb9464c3
1 parent
7b5006c0
.ut should also count as a pre-enrolled format (continued)
Showing
2 changed files
with
3 additions
and
3 deletions
openbr/core/core.cpp
| @@ -413,7 +413,7 @@ struct AlgorithmCore | @@ -413,7 +413,7 @@ struct AlgorithmCore | ||
| 413 | colEnrolledGallery = colGallery.baseName() + colGallery.hash() + '.' + targetExtension; | 413 | colEnrolledGallery = colGallery.baseName() + colGallery.hash() + '.' + targetExtension; |
| 414 | 414 | ||
| 415 | // Check if we have to do real enrollment, and not just convert the gallery's type. | 415 | // Check if we have to do real enrollment, and not just convert the gallery's type. |
| 416 | - if (!(QStringList() << "gal" << "template" << "mem").contains(colGallery.suffix())) | 416 | + if (!(QStringList() << "gal" << "template" << "mem" << "ut").contains(colGallery.suffix())) |
| 417 | enroll(colGallery, colEnrolledGallery); | 417 | enroll(colGallery, colEnrolledGallery); |
| 418 | 418 | ||
| 419 | // If the gallery does have enrolled templates, but is not the right type, we do a simple | 419 | // If the gallery does have enrolled templates, but is not the right type, we do a simple |
| @@ -435,7 +435,7 @@ struct AlgorithmCore | @@ -435,7 +435,7 @@ struct AlgorithmCore | ||
| 435 | // which compares incoming templates against a gallery, we will handle enrollment of the row set by simply | 435 | // which compares incoming templates against a gallery, we will handle enrollment of the row set by simply |
| 436 | // building a transform that does enrollment (using the current algorithm), then does the comparison in one | 436 | // building a transform that does enrollment (using the current algorithm), then does the comparison in one |
| 437 | // step. This way, we don't have to retain the complete enrolled row gallery in memory, or on disk. | 437 | // step. This way, we don't have to retain the complete enrolled row gallery in memory, or on disk. |
| 438 | - else if (!(QStringList() << "gal" << "mem" << "template").contains(rowGallery.suffix())) | 438 | + else if (!(QStringList() << "gal" << "mem" << "template" << "ut").contains(rowGallery.suffix())) |
| 439 | needEnrollRows = true; | 439 | needEnrollRows = true; |
| 440 | 440 | ||
| 441 | // At this point, we have decided how we will structure the comparison (either in transpose mode, or not), | 441 | // At this point, we have decided how we will structure the comparison (either in transpose mode, or not), |
openbr/plugins/gallery.cpp
| @@ -791,7 +791,7 @@ FileList FileList::fromGallery(const File &file, bool cache) | @@ -791,7 +791,7 @@ FileList FileList::fromGallery(const File &file, bool cache) | ||
| 791 | 791 | ||
| 792 | TemplateList templates; | 792 | TemplateList templates; |
| 793 | // OK we read the data in some form, does the gallery type containing matrices? | 793 | // OK we read the data in some form, does the gallery type containing matrices? |
| 794 | - if ((QStringList() << "gal" << "mem" << "template").contains(file.suffix())) { | 794 | + if ((QStringList() << "gal" << "mem" << "template" << "ut").contains(file.suffix())) { |
| 795 | // Retrieve it block by block, dropping matrices from read templates. | 795 | // Retrieve it block by block, dropping matrices from read templates. |
| 796 | QScopedPointer<Gallery> gallery(Gallery::make(file)); | 796 | QScopedPointer<Gallery> gallery(Gallery::make(file)); |
| 797 | gallery->set_readBlockSize(10); | 797 | gallery->set_readBlockSize(10); |