[Hdrflow-svn] SF.net SVN: hdrflow: [284] trunk/lib/extras

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 284
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=284&view=rev
Author:   glslang
Date:     2007-08-30 15:21:09 -0700 (Thu, 30 Aug 2007)

Log Message:
-----------
+ changes to allow dcraw to be used from a library (not reentrant or anything)

Modified Paths:
--------------
    trunk/lib/extras/extras_vc8.sln
    trunk/lib/extras/src/raw/Makefile.am
    trunk/lib/extras/src/raw/dcraw.c
    trunk/lib/extras/src/raw/raw.cpp
    trunk/lib/extras/src/raw/raw_vc8.vcproj

Removed Paths:
-------------
    trunk/lib/extras/src/raw/dcraw_vc8.vcproj

Modified: trunk/lib/extras/extras_vc8.sln
===================================================================

--- trunk/lib/extras/extras_vc8.sln	2007-08-27 18:24:17 UTC (rev 283)
+++ trunk/lib/extras/extras_vc8.sln	2007-08-30 22:21:09 UTC (rev 284)
@@ -10,8 +10,6 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "raw", "src\raw\raw_vc8.vcproj", "{B4CCC2D9-D505-4B08-B908-B2A38105ABC8}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dcraw", "src\raw\dcraw_vc8.vcproj", "{008BA3EE-35D6-432D-96B6-F65707CCCFBF}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PANORAMIC", "PANORAMIC", "{D133B05E-F174-4CDA-8FF4-C45C139CFACD}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "panoramic", "src\panoramic\panoramic_vc8.vcproj", "{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}"
@@ -22,44 +20,22 @@
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
 		Multi-threaded Debug DLL|Win32 = Multi-threaded Debug DLL|Win32
 		Multi-threaded Release DLL|Win32 = Multi-threaded Release DLL|Win32
-		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Debug|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Debug|Win32.Build.0 = Multi-threaded Release DLL|Win32
 		{B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
 		{B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
 		{B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Release|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Release|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Debug|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Debug|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Release|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Release|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Debug|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Debug|Win32.Build.0 = Multi-threaded Release DLL|Win32
 		{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
 		{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
 		{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Release|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Release|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{9A2197B4-ABC1-4047-A81B-15E9D228C108}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9A2197B4-ABC1-4047-A81B-15E9D228C108}.Debug|Win32.Build.0 = Debug|Win32
-		{9A2197B4-ABC1-4047-A81B-15E9D228C108}.Multi-threaded Debug DLL|Win32.ActiveCfg = Debug|Win32
-		{9A2197B4-ABC1-4047-A81B-15E9D228C108}.Multi-threaded Debug DLL|Win32.Build.0 = Debug|Win32
-		{9A2197B4-ABC1-4047-A81B-15E9D228C108}.Multi-threaded Release DLL|Win32.ActiveCfg = Release|Win32
-		{9A2197B4-ABC1-4047-A81B-15E9D228C108}.Multi-threaded Release DLL|Win32.Build.0 = Release|Win32
-		{9A2197B4-ABC1-4047-A81B-15E9D228C108}.Release|Win32.ActiveCfg = Release|Win32
-		{9A2197B4-ABC1-4047-A81B-15E9D228C108}.Release|Win32.Build.0 = Release|Win32
+		{9A2197B4-ABC1-4047-A81B-15E9D228C108}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
+		{9A2197B4-ABC1-4047-A81B-15E9D228C108}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
+		{9A2197B4-ABC1-4047-A81B-15E9D228C108}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+		{9A2197B4-ABC1-4047-A81B-15E9D228C108}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -70,7 +46,6 @@
 		{D133B05E-F174-4CDA-8FF4-C45C139CFACD} = {2644DB77-2096-4A50-A23F-C57D3C011FE2}
 		{CE7A290A-13C0-424E-A02A-96CDC6B0E6BE} = {2644DB77-2096-4A50-A23F-C57D3C011FE2}
 		{B4CCC2D9-D505-4B08-B908-B2A38105ABC8} = {675FBBBA-6681-49E3-AAC6-FE371310DA63}
-		{008BA3EE-35D6-432D-96B6-F65707CCCFBF} = {675FBBBA-6681-49E3-AAC6-FE371310DA63}
 		{C8F73831-1355-45C9-BD1B-C7AAB4CDE373} = {D133B05E-F174-4CDA-8FF4-C45C139CFACD}
 		{9A2197B4-ABC1-4047-A81B-15E9D228C108} = {CE7A290A-13C0-424E-A02A-96CDC6B0E6BE}
 	EndGlobalSection

Modified: trunk/lib/extras/src/raw/Makefile.am
===================================================================
--- trunk/lib/extras/src/raw/Makefile.am	2007-08-27 18:24:17 UTC (rev 283)
+++ trunk/lib/extras/src/raw/Makefile.am	2007-08-30 22:21:09 UTC (rev 284)
@@ -9,14 +9,13 @@
 
 bin_PROGRAMS = dcraw
 
-libhdrflow_extras_raw_la_SOURCES = \
-	raw.cpp
+libhdrflow_extras_raw_la_SOURCES =	\
+	raw.cpp							\
+	dcraw.c
 
 libhdrflow_extras_raw_la_CXXFLAGS = \
 	$(BOOST_INCLUDE_PATH)	    \
 	-I$(top_builddir)/../openlibraries/src \
-	$(OFX_INCLUDE_PATH)
-
-dcraw_CFLAGS = \
-	-DNO_JPEG \
+	$(OFX_INCLUDE_PATH)	\
+	-DNO_JPEG			\
 	-DNO_LCMS

Modified: trunk/lib/extras/src/raw/dcraw.c
===================================================================
--- trunk/lib/extras/src/raw/dcraw.c	2007-08-27 18:24:17 UTC (rev 283)
+++ trunk/lib/extras/src/raw/dcraw.c	2007-08-30 22:21:09 UTC (rev 284)
@@ -7395,7 +7395,7 @@
   free (ppm);
 }
 
-int CLASS main (int argc, char **argv)
+int CLASS main_ (int argc, char **argv)
 {
   int arg, status=0, user_flip=-1, user_black=-1, user_qual=-1;
   int timestamp_only=0, thumbnail_only=0, identify_only=0;

Deleted: trunk/lib/extras/src/raw/dcraw_vc8.vcproj
===================================================================
--- trunk/lib/extras/src/raw/dcraw_vc8.vcproj	2007-08-27 18:24:17 UTC (rev 283)
+++ trunk/lib/extras/src/raw/dcraw_vc8.vcproj	2007-08-30 22:21:09 UTC (rev 284)
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="dcraw"
-	ProjectGUID="{008BA3EE-35D6-432D-96B6-F65707CCCFBF}"
-	RootNamespace="dcraw"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Multi-threaded Debug DLL|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;C:\Program Files\HDR\include&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;NO_LCMS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				OpenMP="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/LARGEADDRESSAWARE"
-				AdditionalDependencies="libjpeg.lib"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\HDR\lib&quot;"
-				IgnoreDefaultLibraryNames="libc.lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Multi-threaded Release DLL|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;C:\Program Files\HDR\include&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;NO_LCMS"
-				ExceptionHandling="2"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				OpenMP="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/LARGEADDRESSAWARE"
-				AdditionalDependencies="libjpeg.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\HDR\lib&quot;"
-				IgnoreDefaultLibraryNames="libc.lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\dcraw.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

Modified: trunk/lib/extras/src/raw/raw.cpp
===================================================================
--- trunk/lib/extras/src/raw/raw.cpp	2007-08-27 18:24:17 UTC (rev 283)
+++ trunk/lib/extras/src/raw/raw.cpp	2007-08-30 22:21:09 UTC (rev 284)
@@ -20,6 +20,8 @@
 
 namespace hdrflow { namespace extras { namespace raw {
 
+extern "C" int main_( int argc, char** argv );
+
 namespace
 {
 	bool dcraw( pcos::property_container properties )

Modified: trunk/lib/extras/src/raw/raw_vc8.vcproj
===================================================================
--- trunk/lib/extras/src/raw/raw_vc8.vcproj	2007-08-27 18:24:17 UTC (rev 283)
+++ trunk/lib/extras/src/raw/raw_vc8.vcproj	2007-08-30 22:21:09 UTC (rev 284)
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\openlibraries\src&quot;;&quot;C:\Boost\include\boost-1_34&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;RAW_EXPORTS;HAVE_FLEX_STRING"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;RAW_EXPORTS;HAVE_FLEX_STRING;NO_JPEG;NO_LCMS"
 				MinimalRebuild="true"
 				ExceptionHandling="2"
 				BasicRuntimeChecks="3"
@@ -68,6 +68,7 @@
 				OutputFile="$(OutDir)\hdrflow_raw-vc80-d-0_1_0.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\Boost\lib;&quot;$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)&quot;;&quot;$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)&quot;;&quot;$(SolutionDir)\..\openlibraries\src\openmedialib\ml\$(ConfigurationName)&quot;"
+				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -123,7 +124,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\openlibraries\src&quot;;&quot;C:\Boost\include\boost-1_34&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;RAW_EXPORTS;HAVE_FLEX_STRING"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;RAW_EXPORTS;HAVE_FLEX_STRING;NO_JPEG;NO_LCMS"
 				ExceptionHandling="2"
 				RuntimeLibrary="2"
 				BufferSecurityCheck="false"
@@ -150,6 +151,7 @@
 				OutputFile="$(OutDir)\hdrflow_raw-vc80-r-0_1_0.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="C:\Boost\lib;&quot;$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)&quot;;&quot;$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)&quot;;&quot;$(SolutionDir)\..\openlibraries\src\openmedialib\ml\$(ConfigurationName)&quot;"
+				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -191,6 +193,10 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
+				RelativePath=".\dcraw.c"
+				>
+			</File>
+			<File
 				RelativePath=".\raw.cpp"
 				>
 			</File>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


