[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:36:54 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=0cab366
The following commit has been merged in the master branch:
commit 0cab366ec298dc80c9ca68e226dabb3bb0a65e95
Author: brad <chickb at gmail.com>
Date: Sun Jan 16 09:22:28 2005 +0000
Merges all changes from the insideout branch back into trunk. This includes the IO abstraction code, split-up of image.cpp, and inside-out design change (#402, #403, and #404).
---
msvc/exiv2.sln | 18 +
msvc/exiv2lib/exiv2lib.vcproj | 714 +++++++++----------
msvc/exivsimple/exivsimple.cpp | 117 ++--
.../ifd-test.vcproj => iotest/iotest.vcproj} | 15 +-
.../ifd-test.vcproj => iptceasy/iptceasy.vcproj} | 12 +-
src/Makefile | 6 +-
src/actions.cpp | 269 +++++---
src/actions.hpp | 6 +-
src/addmoddel.cpp | 19 +-
src/basicio.cpp | 427 ++++++++++++
src/basicio.hpp | 605 ++++++++++++++++
src/dataarea-test.cpp | 35 +-
src/exif.cpp | 79 +--
src/exif.hpp | 59 +-
src/exifcomment.cpp | 22 +-
src/exifprint.cpp | 15 +-
src/image.cpp | 761 +++------------------
src/image.hpp | 628 ++++++-----------
src/iotest.cpp | 217 ++++++
src/iptc.cpp | 71 +-
src/iptc.hpp | 64 +-
src/iptceasy.cpp | 20 +-
src/iptcprint.cpp | 15 +-
src/iptctest.cpp | 59 +-
src/{image.cpp => jpgimage.cpp} | 515 +++++---------
src/jpgimage.hpp | 418 +++++++++++
src/metacopy.cpp | 20 +-
src/types.hpp | 33 -
src/write-test.cpp | 42 +-
src/write2-test.cpp | 26 +-
test/data/glider.exv.irgd | 1 -
test/imagetest.sh | 2 +-
test/iotest.sh | 59 ++
test/iptctest.sh | 2 +-
34 files changed, 3103 insertions(+), 2268 deletions(-)
diff --git a/msvc/exiv2.sln b/msvc/exiv2.sln
index a51fb45..886b0bc 100644
--- a/msvc/exiv2.sln
+++ b/msvc/exiv2.sln
@@ -73,6 +73,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "write-test", "write-test\wr
{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iotest", "iotest\iotest.vcproj", "{5D43ECB3-681D-4732-9395-AB81CD283F6C}"
+ ProjectSection(ProjectDependencies) = postProject
+ {831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iptceasy", "iptceasy\iptceasy.vcproj", "{D8B36F3A-34BB-4540-A731-EEABF1DC2E05}"
+ ProjectSection(ProjectDependencies) = postProject
+ {831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
@@ -139,6 +149,14 @@ Global
{94A7505B-3A53-40F0-95A2-2ECB1CEC7C57}.Debug.Build.0 = Debug|Win32
{94A7505B-3A53-40F0-95A2-2ECB1CEC7C57}.Release.ActiveCfg = Release|Win32
{94A7505B-3A53-40F0-95A2-2ECB1CEC7C57}.Release.Build.0 = Release|Win32
+ {5D43ECB3-681D-4732-9395-AB81CD283F6C}.Debug.ActiveCfg = Debug|Win32
+ {5D43ECB3-681D-4732-9395-AB81CD283F6C}.Debug.Build.0 = Debug|Win32
+ {5D43ECB3-681D-4732-9395-AB81CD283F6C}.Release.ActiveCfg = Release|Win32
+ {5D43ECB3-681D-4732-9395-AB81CD283F6C}.Release.Build.0 = Release|Win32
+ {D8B36F3A-34BB-4540-A731-EEABF1DC2E05}.Debug.ActiveCfg = Debug|Win32
+ {D8B36F3A-34BB-4540-A731-EEABF1DC2E05}.Debug.Build.0 = Debug|Win32
+ {D8B36F3A-34BB-4540-A731-EEABF1DC2E05}.Release.ActiveCfg = Release|Win32
+ {D8B36F3A-34BB-4540-A731-EEABF1DC2E05}.Release.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
diff --git a/msvc/exiv2lib/exiv2lib.vcproj b/msvc/exiv2lib/exiv2lib.vcproj
index 95c55bd..4a32f0c 100644
--- a/msvc/exiv2lib/exiv2lib.vcproj
+++ b/msvc/exiv2lib/exiv2lib.vcproj
@@ -1,351 +1,363 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="exiv2lib"
- ProjectGUID="{831EF580-92C8-4CA8-B0CE-3D906280A54D}"
- Keyword="Win32Proj">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
- ConfigurationType="4"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\src;..\.."
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
- MinimalRebuild="TRUE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="5"
- BufferSecurityCheck="TRUE"
- RuntimeTypeInfo="TRUE"
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- WarningLevel="3"
- WarnAsError="TRUE"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="4"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)/exiv2.lib"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
- ConfigurationType="4"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\src;..\.."
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
- RuntimeLibrary="4"
- RuntimeTypeInfo="TRUE"
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- WarningLevel="3"
- WarnAsError="TRUE"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="3"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)/exiv2.lib"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
- <File
- RelativePath="..\..\src
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list