Revision: 41981
http://brlcad.svn.sourceforge.net/brlcad/?rev=41981&view=rev
Author: starseeker
Date: 2011-01-06 20:05:20 +0000 (Thu, 06 Jan 2011)
Log Message:
-----------
Update cmake branch to r41979
Modified Paths:
--------------
brlcad/branches/cmake/NEWS
brlcad/branches/cmake/TODO
brlcad/branches/cmake/include/common.h
brlcad/branches/cmake/misc/win32-msvc8/brlcad/brlcad.sln
brlcad/branches/cmake/misc/win32-msvc8/libbu/libbu.vcproj
brlcad/branches/cmake/misc/win32-msvc8/tkpng/tkpng.vcproj
brlcad/branches/cmake/sh/conversion.sh
brlcad/branches/cmake/src/adrt/librender/camera.c
brlcad/branches/cmake/src/adrt/librender/component.c
brlcad/branches/cmake/src/adrt/librender/cut.c
brlcad/branches/cmake/src/adrt/librender/grid.c
brlcad/branches/cmake/src/adrt/librender/render_internal.h
brlcad/branches/cmake/src/adrt/librender/spall.c
brlcad/branches/cmake/src/adrt/librender/surfel.c
brlcad/branches/cmake/src/adrt/librender/texture_mix.c
brlcad/branches/cmake/src/libbu/Makefile.am
brlcad/branches/cmake/src/util/pixblend.c
Added Paths:
-----------
brlcad/branches/cmake/misc/win32-msvc8/pixblend/
brlcad/branches/cmake/misc/win32-msvc8/pixblend/pixblend.vcproj
brlcad/branches/cmake/src/libbu/timer.c
brlcad/branches/cmake/src/libbu/timetester.c
Removed Paths:
-------------
brlcad/branches/cmake/misc/win32-msvc8/pixblend/pixblend.vcproj
Modified: brlcad/branches/cmake/NEWS
===================================================================
--- brlcad/branches/cmake/NEWS 2011-01-06 19:56:37 UTC (rev 41980)
+++ brlcad/branches/cmake/NEWS 2011-01-06 20:05:20 UTC (rev 41981)
@@ -13,6 +13,8 @@
--- 2010-12-XX Release 7.18.2 ---
----------------------------------------------------------------------
+* disabled adrt_master and adrt_slave tools - Erik Greenwald
+* ported pixblend image processing tool to Windows - Erik Greenwald
* upgraded libpng to version 1.4.5 - Cliff Yapp
* upgraded zlib to version 1.2.5 - Cliff Yapp
* removed shell execution ! command from vdeck - Cliff Yapp
Modified: brlcad/branches/cmake/TODO
===================================================================
--- brlcad/branches/cmake/TODO 2011-01-06 19:56:37 UTC (rev 41980)
+++ brlcad/branches/cmake/TODO 2011-01-06 20:05:20 UTC (rev 41981)
@@ -17,11 +17,9 @@
THESE TASKS SHOULD HAPPEN BEFORE THE NEXT RELEASE
-------------------------------------------------
-* conversion.sh using signals for child->parent communication
+* TBD.
-* conversion.sh --not and --only options
-
THESE TASKS SHOULD HAPPEN WITHIN TWO RELEASE ITERATIONS
-------------------------------------------------------
@@ -46,6 +44,11 @@
THESE ARE UNSCHEDULED BACKLOG TASKS
-----------------------------------
+* deprecate dbcp and merge functionality (and improved
+ double-buffering) with the buffer tool
+
+* make the converters export all top-level objects by default
+
* investigate why solids.sh fails on three pixels on some 64-bit
platforms. it grazingly hits/misses a tgc causing a regression
failure.
Modified: brlcad/branches/cmake/include/common.h
===================================================================
--- brlcad/branches/cmake/include/common.h 2011-01-06 19:56:37 UTC (rev
41980)
+++ brlcad/branches/cmake/include/common.h 2011-01-06 20:05:20 UTC (rev
41981)
@@ -50,6 +50,7 @@
# ifndef HAVE_DRAND48
# define drand48() ((double)rand() / (double)(RAND_MAX + 1))
# define HAVE_DRAND48 1
+# define srand48(seed) (srand(seed))
# endif
#endif /* BRLCADBUILD & HAVE_CONFIG_H */
Modified: brlcad/branches/cmake/misc/win32-msvc8/brlcad/brlcad.sln
===================================================================
--- brlcad/branches/cmake/misc/win32-msvc8/brlcad/brlcad.sln 2011-01-06
19:56:37 UTC (rev 41980)
+++ brlcad/branches/cmake/misc/win32-msvc8/brlcad/brlcad.sln 2011-01-06
20:05:20 UTC (rev 41981)
@@ -1866,25 +1866,25 @@
{055F2F38-D3AB-4A30-A8C6-A7C9A393BB30} =
{055F2F38-D3AB-4A30-A8C6-A7C9A393BB30}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "librender",
"..\render\render.vcproj", "{069BA3F2-838A-4401-ACE6-BC687C57A243}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pixcmp",
"..\pixcmp\pixcmp.vcproj", "{8AAF9606-7C95-4BB1-8EB7-DDD3304D03C1}"
ProjectSection(WebsiteProperties) = preProject
Debug.AspNetCompiler.Debug = "True"
Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pixcmp",
"..\pixcmp\pixcmp.vcproj", "{8AAF9606-7C95-4BB1-8EB7-DDD3304D03C1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtie",
"..\libtie\libtie.vcproj", "{43DF8660-74E7-4371-BEC3-602E2E6481B5}"
ProjectSection(WebsiteProperties) = preProject
Debug.AspNetCompiler.Debug = "True"
Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtie",
"..\libtie\libtie.vcproj", "{43DF8660-74E7-4371-BEC3-602E2E6481B5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "librender",
"..\librender\librender.vcproj", "{DF9092D4-42CA-4532-BB96-EB5BBFA8308A}"
ProjectSection(WebsiteProperties) = preProject
Debug.AspNetCompiler.Debug = "True"
Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "librender",
"..\librender\librender.vcproj", "{DF9092D4-42CA-4532-BB96-EB5BBFA8308A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pixblend",
"..\pixblend\pixblend.vcproj", "{20068CD5-F9D4-414C-A4AD-D7188108E593}"
ProjectSection(WebsiteProperties) = preProject
Debug.AspNetCompiler.Debug = "True"
Release.AspNetCompiler.Debug = "False"
@@ -2628,6 +2628,10 @@
{DF9092D4-42CA-4532-BB96-EB5BBFA8308A}.Release|Win32.Build.0 =
Release|Win32
{DF9092D4-42CA-4532-BB96-EB5BBFA8308A}.Release|x64.ActiveCfg =
Release|x64
{DF9092D4-42CA-4532-BB96-EB5BBFA8308A}.Release|x64.Build.0 =
Release|x64
+ {20068CD5-F9D4-414C-A4AD-D7188108E593}.Release|Win32.ActiveCfg
= Release|Win32
+ {20068CD5-F9D4-414C-A4AD-D7188108E593}.Release|Win32.Build.0 =
Release|Win32
+ {20068CD5-F9D4-414C-A4AD-D7188108E593}.Release|x64.ActiveCfg =
Release|x64
+ {20068CD5-F9D4-414C-A4AD-D7188108E593}.Release|x64.Build.0 =
Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: brlcad/branches/cmake/misc/win32-msvc8/libbu/libbu.vcproj
===================================================================
--- brlcad/branches/cmake/misc/win32-msvc8/libbu/libbu.vcproj 2011-01-06
19:56:37 UTC (rev 41980)
+++ brlcad/branches/cmake/misc/win32-msvc8/libbu/libbu.vcproj 2011-01-06
20:05:20 UTC (rev 41981)
@@ -4,6 +4,7 @@
Version="8.00"
Name="libbu"
ProjectGUID="{D2A218BF-FAB3-4BEA-B288-E357FE003E29}"
+ RootNamespace="libbu"
>
<Platforms>
<Platform
@@ -1337,6 +1338,10 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\..\..\src\libbu\timer.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\libbu\units.c"
>
<FileConfiguration
Deleted: brlcad/branches/cmake/misc/win32-msvc8/pixblend/pixblend.vcproj
===================================================================
--- brlcad/trunk/misc/win32-msvc8/pixblend/pixblend.vcproj 2011-01-06
19:09:31 UTC (rev 41979)
+++ brlcad/branches/cmake/misc/win32-msvc8/pixblend/pixblend.vcproj
2011-01-06 20:05:20 UTC (rev 41981)
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="pixblend"
- ProjectGUID="{20068CD5-F9D4-414C-A4AD-D7188108E593}"
- RootNamespace="pixblend"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\$(PlatformName)\$(ConfigurationName)"
-
IntermediateDirectory=".\$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="1"
-
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
-
TypeLibraryName=".\$(PlatformName)\$(ConfigurationName)/pixblend.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
-
AdditionalIncludeDirectories="../../../include;../../../src/other/tcl/generic"
-
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;_CRT_SECURE_NO_WARNINGS"
- StringPooling="true"
- BasicRuntimeChecks="0"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- TreatWChar_tAsBuiltInType="false"
- UsePrecompiledHeader="0"
-
PrecompiledHeaderFile=".\$(PlatformName)\$(ConfigurationName)/pixblend.pch"
-
AssemblerListingLocation=".\$(PlatformName)\$(ConfigurationName)/"
-
ObjectFile=".\$(PlatformName)\$(ConfigurationName)/"
-
ProgramDataBaseFileName=".\$(PlatformName)\$(ConfigurationName)/"
- WarningLevel="4"
- SuppressStartupBanner="true"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="0"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="libbu.lib"
-
OutputFile="$(PlatformName)\$(ConfigurationName)/pixblend.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
-
AdditionalLibraryDirectories="../../../brlcadInstall/lib"
- GenerateDebugInformation="false"
-
ProgramDatabaseFile=".\$(PlatformName)\$(ConfigurationName)/pixblend.pdb"
- 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"
- CommandLine="copy "$(TargetPath)"
..\..\..\brlcadInstall\bin"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="1"
-
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
-
TypeLibraryName=".\$(PlatformName)\$(ConfigurationName)/pixblend.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../../../include"
-
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;_CRT_SECURE_NO_WARNINGS"
- StringPooling="true"
- BasicRuntimeChecks="0"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- TreatWChar_tAsBuiltInType="false"
- UsePrecompiledHeader="0"
-
PrecompiledHeaderFile=".\$(PlatformName)\$(ConfigurationName)/pixblend.pch"
-
AssemblerListingLocation=".\$(PlatformName)\$(ConfigurationName)/"
-
ObjectFile=".\$(PlatformName)\$(ConfigurationName)/"
-
ProgramDataBaseFileName=".\$(PlatformName)\$(ConfigurationName)/"
- WarningLevel="3"
- SuppressStartupBanner="true"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="0"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
-
OutputFile="$(PlatformName)\$(ConfigurationName)/pixblend.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
-
AdditionalLibraryDirectories="../../../brlcadInstall$(PlatformName)/lib"
- GenerateDebugInformation="false"
-
ProgramDatabaseFile=".\$(PlatformName)\$(ConfigurationName)/pixblend.pdb"
- SubSystem="1"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="copy "$(TargetPath)"
..\..\..\brlcadInstall$(PlatformName)\bin"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
-
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
- >
- <File
- RelativePath="..\..\..\src\util\pixblend.c"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;fi;fd"
- >
- </Filter>
- <Filter
- Name="Resource Files"
-
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Copied: brlcad/branches/cmake/misc/win32-msvc8/pixblend/pixblend.vcproj (from
rev 41979, brlcad/trunk/misc/win32-msvc8/pixblend/pixblend.vcproj)
===================================================================
--- brlcad/branches/cmake/misc/win32-msvc8/pixblend/pixblend.vcproj
(rev 0)
+++ brlcad/branches/cmake/misc/win32-msvc8/pixblend/pixblend.vcproj
2011-01-06 20:05:20 UTC (rev 41981)
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="pixblend"
+ ProjectGUID="{20068CD5-F9D4-414C-A4AD-D7188108E593}"
+ RootNamespace="pixblend"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\$(PlatformName)\$(ConfigurationName)"
+
IntermediateDirectory=".\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+
TypeLibraryName=".\$(PlatformName)\$(ConfigurationName)/pixblend.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+
AdditionalIncludeDirectories="../../../include;../../../src/other/tcl/generic"
+
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;_CRT_SECURE_NO_WARNINGS"
+ StringPooling="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ TreatWChar_tAsBuiltInType="false"
+ UsePrecompiledHeader="0"
+
PrecompiledHeaderFile=".\$(PlatformName)\$(ConfigurationName)/pixblend.pch"
+
AssemblerListingLocation=".\$(PlatformName)\$(ConfigurationName)/"
+
ObjectFile=".\$(PlatformName)\$(ConfigurationName)/"
+
ProgramDataBaseFileName=".\$(PlatformName)\$(ConfigurationName)/"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libbu.lib"
+
OutputFile="$(PlatformName)\$(ConfigurationName)/pixblend.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+
AdditionalLibraryDirectories="../../../brlcadInstall/lib"
+ GenerateDebugInformation="false"
+
ProgramDatabaseFile=".\$(PlatformName)\$(ConfigurationName)/pixblend.pdb"
+ 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"
+ CommandLine="copy "$(TargetPath)"
..\..\..\brlcadInstall\bin"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+
TypeLibraryName=".\$(PlatformName)\$(ConfigurationName)/pixblend.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="../../../include"
+
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;_CRT_SECURE_NO_WARNINGS"
+ StringPooling="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ TreatWChar_tAsBuiltInType="false"
+ UsePrecompiledHeader="0"
+
PrecompiledHeaderFile=".\$(PlatformName)\$(ConfigurationName)/pixblend.pch"
+
AssemblerListingLocation=".\$(PlatformName)\$(ConfigurationName)/"
+
ObjectFile=".\$(PlatformName)\$(ConfigurationName)/"
+
ProgramDataBaseFileName=".\$(PlatformName)\$(ConfigurationName)/"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+
OutputFile="$(PlatformName)\$(ConfigurationName)/pixblend.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+
AdditionalLibraryDirectories="../../../brlcadInstall$(PlatformName)/lib"
+ GenerateDebugInformation="false"
+
ProgramDatabaseFile=".\$(PlatformName)\$(ConfigurationName)/pixblend.pdb"
+ SubSystem="1"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy "$(TargetPath)"
..\..\..\brlcadInstall$(PlatformName)\bin"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
+ >
+ <File
+ RelativePath="..\..\..\src\util\pixblend.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;fi;fd"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Modified: brlcad/branches/cmake/misc/win32-msvc8/tkpng/tkpng.vcproj
===================================================================
--- brlcad/branches/cmake/misc/win32-msvc8/tkpng/tkpng.vcproj 2011-01-06
19:56:37 UTC (rev 41980)
+++ brlcad/branches/cmake/misc/win32-msvc8/tkpng/tkpng.vcproj 2011-01-06
20:05:20 UTC (rev 41981)
@@ -233,11 +233,11 @@
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
>
<File
-
RelativePath="..\..\..\src\other\tkpng\tkImgPNG.c"
+
RelativePath="..\..\..\src\other\tkpng\generic\tkImgPNG.c"
>
</File>
<File
-
RelativePath="..\..\..\src\other\tkpng\tkImgPNGInit.c"
+
RelativePath="..\..\..\src\other\tkpng\generic\tkImgPNGInit.c"
>
</File>
</Filter>
Modified: brlcad/branches/cmake/sh/conversion.sh
===================================================================
--- brlcad/branches/cmake/sh/conversion.sh 2011-01-06 19:56:37 UTC (rev
41980)
+++ brlcad/branches/cmake/sh/conversion.sh 2011-01-06 20:05:20 UTC (rev
41981)
@@ -61,7 +61,9 @@
LC_ALL=C
# force posix behavior
-set -o posix >/dev/null 2>&1
+POSIX_PEDANTIC=1
+POSIXLY_CORRECT=1
+export POSIX_PEDANTIC POSIXLY_CORRECT
#######################
@@ -497,7 +499,7 @@
fi
count=`expr $count + 1`
- $ECHO "%-4s\tnmg: %s %s\tbot: %s %s %6lds %*s%ld %s:%s" $status $nmg
$real_nmg $bot $real_bot $SECONDS \"`expr 7 - $count : '.*'`\" \"#\" $count
\"$file\" \"$object\"
+ $ECHO "%-4s\tnmg: %s %s\tbot: %s %s %6.0fs %*s%.0f %s:%s" \"$status\"
\"$nmg\" \"$real_nmg\" \"$bot\" \"$real_bot\" \"$SECONDS\" \"`expr 7 - $count :
'.*'`\" \"#\" $count \"$file\" \"$object\"
done
# restore stdin
Modified: brlcad/branches/cmake/src/adrt/librender/camera.c
===================================================================
--- brlcad/branches/cmake/src/adrt/librender/camera.c 2011-01-06 19:56:37 UTC
(rev 41980)
+++ brlcad/branches/cmake/src/adrt/librender/camera.c 2011-01-06 20:05:20 UTC
(rev 41981)
@@ -44,20 +44,20 @@
#define TIE_SEM_LAST (TIE_SEM_WORKER+1)
struct render_shader_s {
- char *name;
- void (*init)(render_t *, char *);
+ const char *name;
+ void (*init)(render_t *, const char *);
void *dlh; /* dynamic library handle */
struct render_shader_s *next;
};
static struct render_shader_s *shaders = NULL;
-void* render_camera_render_thread(int cpu, void *ptr); /* for bu_parallel */
+void render_camera_render_thread(int cpu, genptr_t ptr); /* for
bu_parallel */
static void render_camera_prep_ortho(render_camera_t *camera);
static void render_camera_prep_persp(render_camera_t *camera);
static void render_camera_prep_persp_dof(render_camera_t *camera);
-static struct render_shader_s *render_shader_register (const char *name, void
(*init)(render_t *, char *));
+static struct render_shader_s *render_shader_register (const char *name, void
(*init)(render_t *, const char *));
void
render_camera_init(render_camera_t *camera, int threads)
@@ -408,7 +408,7 @@
void
-*render_camera_render_thread(int cpu, void *ptr)
+render_camera_render_thread(int cpu, genptr_t ptr)
{
render_camera_thread_data_t *td;
int d, n, res_ind, scanline, v_scanline;
@@ -436,7 +436,7 @@
if (*td->scanline == td->tile->size_y)
{
bu_semaphore_release(TIE_SEM_WORKER);
- return 0;
+ return;
}
else
{
@@ -479,7 +479,7 @@
VSCALE(v1.v, td->camera->view_list[d].step_x.v, n);
VADD2(ray.dir.v, ray.dir.v, v1.v);
- VSET(pixel.v, RENDER_CAMERA_BGR, RENDER_CAMERA_BGG,
RENDER_CAMERA_BGB);
+ VSET(pixel.v, (tfloat)RENDER_CAMERA_BGR,
(tfloat)RENDER_CAMERA_BGG, (tfloat)RENDER_CAMERA_BGB);
ray.pos = td->camera->view_list[d].pos;
ray.depth = 0;
@@ -501,7 +501,7 @@
VSCALE(v2.v, td->camera->view_list[0].step_x.v, n);
VADD2(ray.dir.v, v1.v, v2.v);
- VSET(pixel.v, RENDER_CAMERA_BGR, RENDER_CAMERA_BGG,
RENDER_CAMERA_BGB);
+ VSET(pixel.v, (tfloat)RENDER_CAMERA_BGR,
(tfloat)RENDER_CAMERA_BGG, (tfloat)RENDER_CAMERA_BGB);
ray.pos = td->camera->view_list[0].pos;
ray.depth = 0;
@@ -518,7 +518,7 @@
VADD2(ray.pos.v, ray.pos.v, v1.v);
VADD2(ray.pos.v, ray.pos.v, v2.v);
- VSET(pixel.v, RENDER_CAMERA_BGR, RENDER_CAMERA_BGG,
RENDER_CAMERA_BGB);
+ VSET(pixel.v, (tfloat)RENDER_CAMERA_BGR,
(tfloat)RENDER_CAMERA_BGG, (tfloat)RENDER_CAMERA_BGB);
ray.depth = 0;
/* Compute pixel value using this ray */
@@ -554,8 +554,6 @@
}
}
-
- return 0;
}
@@ -563,7 +561,7 @@
render_camera_render(render_camera_t *camera, tie_t *tie, camera_tile_t *tile,
tienet_buffer_t *result)
{
render_camera_thread_data_t td;
- unsigned int i, scanline, ind;
+ unsigned int scanline, ind;
ind = result->ind;
@@ -597,7 +595,7 @@
}
struct render_shader_s *
-render_shader_register(const char *name, void (*init)(render_t *, char *))
+render_shader_register(const char *name, void (*init)(render_t *, const char
*))
{
struct render_shader_s *shader = (struct render_shader_s
*)bu_malloc(sizeof(struct render_shader_s), "shader");
if(shader == NULL)
Modified: brlcad/branches/cmake/src/adrt/librender/component.c
===================================================================
--- brlcad/branches/cmake/src/adrt/librender/component.c 2011-01-06
19:56:37 UTC (rev 41980)
+++ brlcad/branches/cmake/src/adrt/librender/component.c 2011-01-06
20:05:20 UTC (rev 41981)
@@ -55,15 +55,15 @@
/* shade solid */
pixel->v[0] = mesh->flags & ADRT_MESH_HIT ? 0.8 : 0.2;
- pixel->v[1] = 0.2;
+ pixel->v[1] = (tfloat)0.2;
pixel->v[2] = mesh->flags & ADRT_MESH_SELECT ? 0.8 : 0.2;
VSUB2(vec.v, ray->pos.v, id.pos.v);
VUNITIZE(vec.v);
VSCALE((*pixel).v, (*pixel).v, VDOT(vec.v, id.norm.v) * 0.8);
} else if (ray->depth) {
- pixel->v[0] += 0.2;
- pixel->v[1] += 0.2;
- pixel->v[2] += 0.2;
+ pixel->v[0] += (tfloat)0.2;
+ pixel->v[1] += (tfloat)0.2;
+ pixel->v[2] += (tfloat)0.2;
}
}
Modified: brlcad/branches/cmake/src/adrt/librender/cut.c
===================================================================
--- brlcad/branches/cmake/src/adrt/librender/cut.c 2011-01-06 19:56:37 UTC
(rev 41980)
+++ brlcad/branches/cmake/src/adrt/librender/cut.c 2011-01-06 20:05:20 UTC
(rev 41981)
@@ -148,7 +148,7 @@
dot = fabs(VDOT( ray->dir.v, hit.id.norm.v));
if (hit.mesh->flags & (ADRT_MESH_SELECT|ADRT_MESH_HIT)) {
- VSET(color.v, hit.mesh->flags & ADRT_MESH_HIT ? 0.9 : 0.2, 0.2,
hit.mesh->flags & ADRT_MESH_SELECT ? 0.9 : 0.2);
+ VSET(color.v, hit.mesh->flags & ADRT_MESH_HIT ? (tfloat)0.9 :
(tfloat)0.2, (tfloat)0.2, hit.mesh->flags & ADRT_MESH_SELECT ? (tfloat)0.9 :
(tfloat)0.2);
} else {
/* Mix actual color with white 4:1, shade 50% darker */
#if 0
@@ -157,7 +157,7 @@
VADD2(color.v, color.v, hit.mesh->attributes->color.v);
VSCALE(color.v, color.v, 0.125);
#else
- VSET(color.v, 0.8, 0.8, 0.7);
+ VSET(color.v, (tfloat)0.8, (tfloat)0.8, (tfloat)0.7);
#endif
}
@@ -178,9 +178,9 @@
}
#endif
- pixel->v[0] += 0.1;
- pixel->v[1] += 0.1;
- pixel->v[2] += 0.1;
+ pixel->v[0] += (tfloat)0.1;
+ pixel->v[1] += (tfloat)0.1;
+ pixel->v[2] += (tfloat)0.1;
}
int
Modified: brlcad/branches/cmake/src/adrt/librender/grid.c
===================================================================
--- brlcad/branches/cmake/src/adrt/librender/grid.c 2011-01-06 19:56:37 UTC
(rev 41980)
+++ brlcad/branches/cmake/src/adrt/librender/grid.c 2011-01-06 20:05:20 UTC
(rev 41981)
@@ -45,13 +45,13 @@
if ((m = (adrt_mesh_t *)tie_work(tie, ray, &id, render_hit, NULL))) {
/* if X or Y lie in the grid paint it white else make it gray */
if (fabs(GRID*id.pos.v[0] - (int)(GRID*id.pos.v[0])) < 0.2*LINE ||
fabs(GRID*id.pos.v[1] - (int)(GRID*id.pos.v[1])) < 0.2*LINE) {
- pixel->v[0] = 0.9;
- pixel->v[1] = 0.9;
- pixel->v[2] = 0.9;
+ pixel->v[0] = (tfloat)0.9;
+ pixel->v[1] = (tfloat)0.9;
+ pixel->v[2] = (tfloat)0.9;
} else {
- pixel->v[0] = 0.1;
- pixel->v[1] = 0.1;
- pixel->v[2] = 0.1;
+ pixel->v[0] = (tfloat)0.1;
+ pixel->v[1] = (tfloat)0.1;
+ pixel->v[2] = (tfloat)0.1;
}
} else {
return;
@@ -62,9 +62,9 @@
angle = VDOT( vec.v, id.norm.v);
VSCALE((*pixel).v, (*pixel).v, (angle*0.9));
- pixel->v[0] += 0.1;
- pixel->v[1] += 0.1;
- pixel->v[2] += 0.1;
+ pixel->v[0] += (tfloat)0.1;
+ pixel->v[1] += (tfloat)0.1;
+ pixel->v[2] += (tfloat)0.1;
}
int
Modified: brlcad/branches/cmake/src/adrt/librender/render_internal.h
===================================================================
--- brlcad/branches/cmake/src/adrt/librender/render_internal.h 2011-01-06
19:56:37 UTC (rev 41980)
+++ brlcad/branches/cmake/src/adrt/librender/render_internal.h 2011-01-06
20:05:20 UTC (rev 41981)
@@ -57,7 +57,7 @@
render_free_t *free;
void *data;
struct render_s *next;
- char *shader;
+ const char *shader;
} render_t;
#endif
Modified: brlcad/branches/cmake/src/adrt/librender/spall.c
===================================================================
--- brlcad/branches/cmake/src/adrt/librender/spall.c 2011-01-06 19:56:37 UTC
(rev 41980)
+++ brlcad/branches/cmake/src/adrt/librender/spall.c 2011-01-06 20:05:20 UTC
(rev 41981)
@@ -94,9 +94,9 @@
/* Draw spall Cone */
if (tie_work(&rd->tie, ray, &id, render_arrow_hit, NULL)) {
- pixel->v[0] = 0.4;
- pixel->v[1] = 0.4;
- pixel->v[2] = 0.4;
+ pixel->v[0] = (tfloat)0.4;
+ pixel->v[1] = (tfloat)0.4;
+ pixel->v[2] = (tfloat)0.4;
}
/*
@@ -148,13 +148,13 @@
if (hit.mesh->flags == 1) {
- VSET(color.v, 0.9, 0.2, 0.2);
+ VSET(color.v, (tfloat)0.9, (tfloat)0.2, (tfloat)0.2);
} else {
/* Mix actual color with white 4:1, shade 50% darker */
- VSET(color.v, 1.0, 1.0, 1.0);
- VSCALE(color.v, color.v, 3.0);
+ VSET(color.v, (tfloat)1.0, (tfloat)1.0, (tfloat)1.0);
+ VSCALE(color.v, color.v, (tfloat)3.0);
VADD2(color.v, color.v, hit.mesh->attributes->color.v);
- VSCALE(color.v, color.v, 0.125);
+ VSCALE(color.v, color.v, (tfloat)0.125);
}
#if 0
@@ -173,9 +173,9 @@
}
#endif
- pixel->v[0] += 0.1;
- pixel->v[1] += 0.1;
- pixel->v[2] += 0.1;
+ pixel->v[0] += (tfloat)0.1;
+ pixel->v[1] += (tfloat)0.1;
+ pixel->v[2] += (tfloat)0.1;
}
int
Modified: brlcad/branches/cmake/src/adrt/librender/surfel.c
===================================================================
--- brlcad/branches/cmake/src/adrt/librender/surfel.c 2011-01-06 19:56:37 UTC
(rev 41980)
+++ brlcad/branches/cmake/src/adrt/librender/surfel.c 2011-01-06 20:05:20 UTC
(rev 41981)
@@ -77,7 +77,7 @@
}
}
- VSET((*pixel).v, 0.8, 0.8, 0.8);
+ VSET((*pixel).v, (tfloat)0.8, (tfloat)0.8, (tfloat)0.8);
}
}
Modified: brlcad/branches/cmake/src/adrt/librender/texture_mix.c
===================================================================
--- brlcad/branches/cmake/src/adrt/librender/texture_mix.c 2011-01-06
19:56:37 UTC (rev 41980)
+++ brlcad/branches/cmake/src/adrt/librender/texture_mix.c 2011-01-06
20:05:20 UTC (rev 41981)
@@ -52,9 +52,7 @@
void texture_mix_work(__TEXTURE_WORK_PROTOTYPE__) {
texture_mix_t *td;
TIE_3 t;
- int i;
-
td = (texture_mix_t *)texture->data;
td->texture1->work(td->texture1, ADRT_MESH(mesh), ray, id, pixel);
Modified: brlcad/branches/cmake/src/libbu/Makefile.am
===================================================================
--- brlcad/branches/cmake/src/libbu/Makefile.am 2011-01-06 19:56:37 UTC (rev
41980)
+++ brlcad/branches/cmake/src/libbu/Makefile.am 2011-01-06 20:05:20 UTC (rev
41981)
@@ -2,7 +2,7 @@
lib_LTLIBRARIES = libbu.la
noinst_LTLIBRARIES = libbu_nil.la
-noinst_PROGRAMS = htester
+noinst_PROGRAMS = htester timetester
libbu_nil_la_SOURCES = \
argv.c \
@@ -70,6 +70,7 @@
str.c \
tcl.c \
temp.c \
+ timer.c \
units.c \
vers.c \
vfont.c \
@@ -90,6 +91,11 @@
libbu.la \
${BU_LIBS}
+timetester_SOURCES = timetester.c
+timetester_LDADD = \
+ libbu.la \
+ ${BU_LIBS}
+
noinst_HEADERS = \
rb_internals.h \
uce-dirent.h
@@ -101,6 +107,7 @@
EXTRA_DIST = \
$(man_MANS) \
+ timetester.c
CMakeLists.txt
AM_CPPFLAGS = \
Copied: brlcad/branches/cmake/src/libbu/timer.c (from rev 41979,
brlcad/trunk/src/libbu/timer.c)
===================================================================
--- brlcad/branches/cmake/src/libbu/timer.c (rev 0)
+++ brlcad/branches/cmake/src/libbu/timer.c 2011-01-06 20:05:20 UTC (rev
41981)
@@ -0,0 +1,81 @@
+/* T I M E R . C
+ * BRL-CAD
+ *
+ * Copyright (c) 2011 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ * Copyright (c) Tim Riker
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; see the file named COPYING for more
+ * information.
+ */
+
+#include "common.h"
+
+#include <time.h>
+#if !defined(_WIN32)
+# ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+# endif
+# ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+# endif
+# ifdef HAVE_SCHED_H
+# include <sched.h>
+# endif
+#else /* !defined(_WIN32) */
+# include <windows.h>
+# include <mmsystem.h>
+#endif /* !defined(_WIN32) */
+
+#include "bu.h"
+
+int64_t bu_gettime(void)
+{
+#if !defined(_WIN32)
+ struct timeval nowTime;
+
+ gettimeofday(&nowTime, NULL);
+ return ((int64_t)nowTime.tv_sec * (int64_t)1000000
+ + (int64_t)nowTime.tv_usec);
+#else /* !defined(_WIN32) */
+ LARGE_INTEGER count;
+ static LARGE_INTEGER freq = {0};
+
+ if(freq.QuadPart == 0)
+ if(QueryPerformanceFrequency(&freq) == 0) {
+ bu_log("QueryPerformanceFrequency failed\n");
+ return -1;
+ }
+
+ if(QueryPerformanceCounter(&count) == 0) {
+ bu_log("QueryPerformanceCounter failed\n");
+ return -1;
+ }
+
+ return 1e6*count.QuadPart/freq.QuadPart;
+
+#endif /* !defined(_WIN32) */
+
+ bu_log("This should never happen.\n");
+ return -1;
+}
+
+/*
+ * Local Variables:
+ * mode: C
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * c-file-style: "stroustrup"
+ * End:
+ * ex: shiftwidth=4 tabstop=8
+ */
Copied: brlcad/branches/cmake/src/libbu/timetester.c (from rev 41979,
brlcad/trunk/src/libbu/timetester.c)
===================================================================
--- brlcad/branches/cmake/src/libbu/timetester.c
(rev 0)
+++ brlcad/branches/cmake/src/libbu/timetester.c 2011-01-06 20:05:20 UTC
(rev 41981)
@@ -0,0 +1,56 @@
+/* T I M E T E S T E R . C
+ * BRL-CAD
+ *
+ * Copyright (c) 2011 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; see the file named COPYING for more
+ * information.
+ */
+
+#include "common.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+#include <inttypes.h>
+
+#include "bu.h"
+
+int
+main(int argc, char **argv)
+{
+ int64_t time1, time2;
+ int i = 0;
+ time1 = bu_gettime();
+ while (i < 1.0e6) {
+ time2 = bu_gettime();
+ i = time2 - time1;
+ }
+ printf("Time delta: %i\n", i);
+ printf("time1: %" PRIi64 "\n", time1);
+ printf("time2: %" PRIi64 "\n", time2);
+ exit(0);
+}
+
+/** @} */
+/*
+ * Local Variables:
+ * mode: C
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * c-file-style: "stroustrup"
+ * End:
+ * ex: shiftwidth=4 tabstop=8
+ */
Modified: brlcad/branches/cmake/src/util/pixblend.c
===================================================================
--- brlcad/branches/cmake/src/util/pixblend.c 2011-01-06 19:56:37 UTC (rev
41980)
+++ brlcad/branches/cmake/src/util/pixblend.c 2011-01-06 20:05:20 UTC (rev
41981)
@@ -39,6 +39,7 @@
# include <sys/time.h>
#endif
#include <string.h>
+#include <time.h>
#include "bio.h"
#include "bu.h"
@@ -65,9 +66,7 @@
int
timeseed(void)
{
- struct timeval tv;
- gettimeofday(&tv, (struct timezone *)NULL);
- return (int)tv.tv_usec;
+ return time(0);
}
@@ -180,7 +179,7 @@
}
if (rflg) {
-#ifdef HAVE_SRAND48
+#ifdef HAVE_DRAND48
srand48((long)seed);
#else
threshold = (int) (value * 65536.0);
@@ -199,7 +198,7 @@
while (1) {
unsigned char *cb1, *cb2; /* current input buf ptrs */
unsigned char *cb3; /* current output buf ptr */
- int r1, r2, len, todo;
+ size_t r1, r2, len, todo;
++c;
r1 = fread(b1, 1, CHUNK, f1);
@@ -234,7 +233,6 @@
} else {
#ifdef HAVE_DRAND48
double d;
- extern double drand48(void);
d = drand48();
if (d >= value)
#else
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
