[cpp-sp COMMIT] /branches/REL_2/shibsp/attribute/resolver/impl/MetadataAttributeExtractor.cpp

[noreply at shibboleth.net]

Author: scantor
Date: Wed May 15 17:29:04 2013
New Revision: 3847

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3847&view=rev
Log:
https://issues.shibboleth.net/jira/browse/SSPCPP-547

Modified:
    branches/REL_2/shibsp/attribute/resolver/impl/MetadataAttributeExtractor.cpp

Modified: branches/REL_2/shibsp/attribute/resolver/impl/MetadataAttributeExtractor.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/attribute/resolver/impl/MetadataAttributeExtractor.cpp?rev=3847&r1=3846&r2=3847&view=diff
==============================================================================
--- branches/REL_2/shibsp/attribute/resolver/impl/MetadataAttributeExtractor.cpp (original)
+++ branches/REL_2/shibsp/attribute/resolver/impl/MetadataAttributeExtractor.cpp Wed May 15 17:29:04 2013
@@ -288,7 +288,7 @@
     if (!match)
         match = objects.front();
 
-    auto_ptr_char temp(match->getTextContent());
+    auto_arrayptr<char> temp(toUTF8(match->getTextContent()));
     if (temp.get() && *temp.get()) {
         auto_ptr<SimpleAttribute> attr(new SimpleAttribute(vector<string>(1, id)));
         attr->getValues().push_back(temp.get());
@@ -314,7 +314,7 @@
                     sizediff = 0;
                     if (h > 0) {
                         dim = (*i)->getHeight();
-                        sizediff = abs(h - dim.second);
+                        sizediff += abs(h - dim.second);
                     }
                     if (w > 0) {
                         dim = (*i)->getWidth();
@@ -337,7 +337,7 @@
             sizediff = 0;
             if (h > 0) {
                 dim = (*i)->getHeight();
-                sizediff = abs(h - dim.second);
+                sizediff += abs(h - dim.second);
             }
             if (w > 0) {
                 dim = (*i)->getWidth();