From 755b71c49a82ea2b8dd726d73a4eed41fb9464c3 Mon Sep 17 00:00:00 2001 From: Josh Klontz Date: Sat, 1 Nov 2014 12:30:32 -0400 Subject: [PATCH] .ut should also count as a pre-enrolled format (continued) --- openbr/core/core.cpp | 4 ++-- openbr/plugins/gallery.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openbr/core/core.cpp b/openbr/core/core.cpp index 795bffc..a58cd4d 100644 --- a/openbr/core/core.cpp +++ b/openbr/core/core.cpp @@ -413,7 +413,7 @@ struct AlgorithmCore colEnrolledGallery = colGallery.baseName() + colGallery.hash() + '.' + targetExtension; // Check if we have to do real enrollment, and not just convert the gallery's type. - if (!(QStringList() << "gal" << "template" << "mem").contains(colGallery.suffix())) + if (!(QStringList() << "gal" << "template" << "mem" << "ut").contains(colGallery.suffix())) enroll(colGallery, colEnrolledGallery); // If the gallery does have enrolled templates, but is not the right type, we do a simple @@ -435,7 +435,7 @@ struct AlgorithmCore // which compares incoming templates against a gallery, we will handle enrollment of the row set by simply // building a transform that does enrollment (using the current algorithm), then does the comparison in one // step. This way, we don't have to retain the complete enrolled row gallery in memory, or on disk. - else if (!(QStringList() << "gal" << "mem" << "template").contains(rowGallery.suffix())) + else if (!(QStringList() << "gal" << "mem" << "template" << "ut").contains(rowGallery.suffix())) needEnrollRows = true; // At this point, we have decided how we will structure the comparison (either in transpose mode, or not), diff --git a/openbr/plugins/gallery.cpp b/openbr/plugins/gallery.cpp index ba7ddf3..aa76720 100644 --- a/openbr/plugins/gallery.cpp +++ b/openbr/plugins/gallery.cpp @@ -791,7 +791,7 @@ FileList FileList::fromGallery(const File &file, bool cache) TemplateList templates; // OK we read the data in some form, does the gallery type containing matrices? - if ((QStringList() << "gal" << "mem" << "template").contains(file.suffix())) { + if ((QStringList() << "gal" << "mem" << "template" << "ut").contains(file.suffix())) { // Retrieve it block by block, dropping matrices from read templates. QScopedPointer gallery(Gallery::make(file)); gallery->set_readBlockSize(10); -- libgit2 0.21.4