third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#640 and # 751. Fixing linux build-breaker.

Browse Source
This commit is contained in:
Robin Mills
2015-08-29 20:00:26 +00:00
parent a26cc8d585
commit 03e51ab470
3 changed files with 48 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/exiv2json.cpp
+1 -3
View File
@@ -317,9 +317,7 @@ try {
}
// get the namespace dictionary from XMP
typedef std::map<std::string,std::string> dict_t;
typedef std::map<std::string,std::string>::const_iterator dict_i;
dict_t nsDict;
std::map<std::string,std::string> nsDict;
Exiv2::XmpParser::getRegisteredNamespaces(nsDict);
// create and populate a Jzon::Object for the namespaces
src/xmp.cpp
+3 -2
View File
@@ -15,7 +15,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* along with this f; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
*/
/*
@@ -446,7 +446,8 @@ namespace Exiv2 {
// pop trailing ':' on a namespace
if ( bNS ) {
if ( out[out.length()-1] == ':' ) out.pop_back();
std::size_t length = out.length();
if ( out[length-1] == ':' ) out = out.substr(0,length-1);
}
if ( bURI || bNS ) {
test/data/xmpparser-test.out
+44
View File
@@ -36,6 +36,50 @@ Xmp.exif.NativeDigest XmpText 414 36864,40960,40961,37
< <rdf:li xml:lang="en-US">Blue Square Test File - .jpg</rdf:li>
36a36
> <rdf:li xml:lang="en-US">Blue Square Test File - .jpg</rdf:li>
67,87c67,87
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
---
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
-----> Decoding XMP data read from StaffPhotographer-Example.xmp <-----
Xmp.iptc.IntellectualGenre XmpText 7 Profile
Xmp.iptc.Location XmpText 17 Moore family farm