From a07769c1168a80ae7786348f0e53cfb63002f990 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Tue, 28 Apr 2015 08:55:39 +0000 Subject: [PATCH] #1071 msvc2003 added exiv2json and minor changes to build and pass test. There's a strange test exception which seems to be related to daylight saving time. 1931c1931 < "DateTime": "2005:09:07 23:09:51", --- > "DateTime": "2005:09:08 00:09:51", --- msvc2003/exiv2.sln | 12 + msvc2003/exiv2/exiv2.vcproj | 2 +- msvc2003/exiv2json/exiv2json.vcproj | 1 + msvc2003/exiv2lib/exiv2lib.vcproj | 567 +++++++++++++++++++++++++++- msvc2003/path-test/path-test.vcproj | 2 +- src/Jzon.cpp | 4 +- 6 files changed, 583 insertions(+), 5 deletions(-) create mode 100644 msvc2003/exiv2json/exiv2json.vcproj diff --git a/msvc2003/exiv2.sln b/msvc2003/exiv2.sln index 824af7bb..dd6aa865 100644 --- a/msvc2003/exiv2.sln +++ b/msvc2003/exiv2.sln @@ -166,6 +166,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exifvalue", "exifvalue\exif {831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exiv2json", "exiv2json\exiv2json.vcproj", "{8391174F-52D5-4111-A0FE-E87135301CFB}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject Global GlobalSection(SolutionConfiguration) = preSolution Debug = Debug @@ -440,6 +444,14 @@ Global {D8B36F3A-34BB-4540-A731-EEABF1DC2E05}.Release.Build.0 = Release|Win32 {D8B36F3A-34BB-4540-A731-EEABF1DC2E05}.ReleaseDLL.ActiveCfg = ReleaseDLL|Win32 {D8B36F3A-34BB-4540-A731-EEABF1DC2E05}.ReleaseDLL.Build.0 = ReleaseDLL|Win32 + {8391174F-52D5-4111-A0FE-E87135301CFB}.Debug.ActiveCfg = Debug|Win32 + {8391174F-52D5-4111-A0FE-E87135301CFB}.Debug.Build.0 = Debug|Win32 + {8391174F-52D5-4111-A0FE-E87135301CFB}.DebugDLL.ActiveCfg = DebugDLL|Win32 + {8391174F-52D5-4111-A0FE-E87135301CFB}.DebugDLL.Build.0 = DebugDLL|Win32 + {8391174F-52D5-4111-A0FE-E87135301CFB}.Release.ActiveCfg = Release|Win32 + {8391174F-52D5-4111-A0FE-E87135301CFB}.Release.Build.0 = Release|Win32 + {8391174F-52D5-4111-A0FE-E87135301CFB}.ReleaseDLL.ActiveCfg = ReleaseDLL|Win32 + {8391174F-52D5-4111-A0FE-E87135301CFB}.ReleaseDLL.Build.0 = ReleaseDLL|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection diff --git a/msvc2003/exiv2/exiv2.vcproj b/msvc2003/exiv2/exiv2.vcproj index 9770ee50..dcfe5991 100644 --- a/msvc2003/exiv2/exiv2.vcproj +++ b/msvc2003/exiv2/exiv2.vcproj @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/msvc2003/exiv2json/exiv2json.vcproj b/msvc2003/exiv2json/exiv2json.vcproj new file mode 100644 index 00000000..de2d1b20 --- /dev/null +++ b/msvc2003/exiv2json/exiv2json.vcproj @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/msvc2003/exiv2lib/exiv2lib.vcproj b/msvc2003/exiv2lib/exiv2lib.vcproj index 7d5649d6..306c5862 100644 --- a/msvc2003/exiv2lib/exiv2lib.vcproj +++ b/msvc2003/exiv2lib/exiv2lib.vcproj @@ -1 +1,566 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc2003/path-test/path-test.vcproj b/msvc2003/path-test/path-test.vcproj index 55b4cf66..ac0549f1 100644 --- a/msvc2003/path-test/path-test.vcproj +++ b/msvc2003/path-test/path-test.vcproj @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Jzon.cpp b/src/Jzon.cpp index 89463f79..4435f699 100644 --- a/src/Jzon.cpp +++ b/src/Jzon.cpp @@ -845,12 +845,12 @@ namespace Jzon for (Object::const_iterator it = node.begin(); it != node.end(); ++it) { const std::string &name = (*it).first; - const Node &value = (*it).second; + // const Node &value = (*it).second; if (it != node.begin()) result += "," + fi->GetNewline(); result += fi->GetIndentation(level+1) + "\""+name+"\"" + ":" + fi->GetSpacing(); - writeNode(value, level+1); + writeNode((*it).second, level+1); } result += fi->GetNewline() + fi->GetIndentation(level) + "}";