Fix logo matching algorithm

git-svn-id: https://svn.shibboleth.net/cpp-sp/branches/REL_2@3565 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/shibsp/attribute/resolver/impl/MetadataAttributeExtractor.cpp b/shibsp/attribute/resolver/impl/MetadataAttributeExtractor.cpp
index ceccdb0..0244d17 100644 (file)
--- a/shibsp/attribute/resolver/impl/MetadataAttributeExtractor.cpp
+++ b/shibsp/attribute/resolver/impl/MetadataAttributeExtractor.cpp
@@ -321,18 +321,15 @@ void MetadataExtractor::doLogo(
                         dim = (*i)->getWidth();
                         sizediff += abs(w - dim.second);
                     }
-                    if (sizediff > 0) {
-                        if (sizediff < bestdiff)
-                            match = *i;
-                    }
-                    else {
+                    if (sizediff < bestdiff) {
                         match = *i;
+                        bestdiff = sizediff;
                     }
                 }
-                if (match && h == 0 && w == 0)
+                if (match && bestdiff == 0)
                     break;
             }
-            if (match && h == 0 && w == 0)
+            if (match && bestdiff == 0)
                 break;
         } while (request->continueLangMatching());
     }
@@ -347,18 +344,17 @@ void MetadataExtractor::doLogo(
                 dim = (*i)->getWidth();
                 sizediff += abs(w - dim.second);
             }
-            if (sizediff > 0) {
-                if (sizediff < bestdiff)
-                    match = *i;
-            }
-            else {
+            if (sizediff < bestdiff) {
                 match = *i;
+                bestdiff = sizediff;
             }
+            if (match && bestdiff == 0)
+                break;
         }
     }
-    else {
+
+    if (!match)
         match = logos.front();
-    }
 
     if (!match->getDOM()) {
         match->marshall();