From 9b6ea46fc8c19eb4ac8bbb3a4e6ae1747f6f99d4 Mon Sep 17 00:00:00 2001
From: Josh Klontz <josh.klontz@gmail.com>
Date: Thu, 11 Apr 2013 22:34:29 -0400
Subject: [PATCH] minor bug fixes

---
 openbr/core/common.h           | 4 ++--
 openbr/plugins/independent.cpp | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/openbr/core/common.h b/openbr/core/common.h
index 4bb9620..5154c7c 100644
--- a/openbr/core/common.h
+++ b/openbr/core/common.h
@@ -102,7 +102,7 @@ void MinMax(const QList<T> &vals, T *min, T *max)
 template <typename T>
 T Min(const QList<T> &vals)
 {
-    int min, max;
+    T min, max;
     MinMax(vals, &min, &max);
     return min;
 }
@@ -110,7 +110,7 @@ T Min(const QList<T> &vals)
 template <typename T>
 T Max(const QList<T> &vals)
 {
-    int min, max;
+    T min, max;
     MinMax(vals, &min, &max);
     return max;
 }
diff --git a/openbr/plugins/independent.cpp b/openbr/plugins/independent.cpp
index 138fcbc..0fe335c 100644
--- a/openbr/plugins/independent.cpp
+++ b/openbr/plugins/independent.cpp
@@ -173,8 +173,8 @@ class SingletonTransform : public MetaTransform
     Q_PROPERTY(QString description READ get_description WRITE set_description RESET reset_description STORED false)
     BR_PROPERTY(QString, description, "Identity")
 
+    static QMutex mutex;
     static QHash<QString,Transform*> transforms;
-    static QMutex trainingMutex;
     static QHash<QString,int> trainingReferenceCounts;
     static QHash<QString,TemplateList> trainingData;
 
@@ -182,6 +182,7 @@ class SingletonTransform : public MetaTransform
 
     void init()
     {
+        QMutexLocker locker(&mutex);
         if (!transforms.contains(description)) {
             transforms.insert(description, make(description));
             trainingReferenceCounts.insert(description, 0);
@@ -193,7 +194,7 @@ class SingletonTransform : public MetaTransform
 
     void train(const TemplateList &data)
     {
-        QMutexLocker locker(&trainingMutex);
+        QMutexLocker locker(&mutex);
         trainingData[description].append(data);
         trainingReferenceCounts[description]--;
         if (trainingReferenceCounts[description] > 0) return;
@@ -219,8 +220,8 @@ class SingletonTransform : public MetaTransform
     }
 };
 
+QMutex SingletonTransform::mutex;
 QHash<QString,Transform*> SingletonTransform::transforms;
-QMutex SingletonTransform::trainingMutex;
 QHash<QString,int> SingletonTransform::trainingReferenceCounts;
 QHash<QString,TemplateList> SingletonTransform::trainingData;
 
--
libgit2 0.21.4