Another pass trying to get the Windows build right.

diff --git a/graphviz.sln b/graphviz.sln
index 1fdcb9dc2d4d19fea8cf5d416e604d443d82fec1..599e7043ee0b77ab3b3a39379696ad911e5b5f0b 100644 (file)
--- a/graphviz.sln
+++ b/graphviz.sln
@@ -280,6 +280,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mingle", "cmd\mingle\mingle
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libann", "lib\ann\MS_Win32\dll\dll.vcproj", "{A7D00B21-CB9C-4BBB-8DEE-51025104F867}"\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "edgepaintlib", "lib\edgepaint\edgepaintlib.vcproj", "{B1AA9FD1-0D24-44DF-8CAD-AEA73B52B3EC}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "edgepaint", "cmd\edgepaint\edgepaint.vcproj", "{B7A03994-C134-4FF7-98B4-97B5579EF13D}"\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r
@@ -291,7 +295,6 @@ Global
                {BD347753-A09D-48B4-8752-F1D8D9CF235D}.Release|Win32.ActiveCfg = Release|Win32\r
                {BD347753-A09D-48B4-8752-F1D8D9CF235D}.Release|Win32.Build.0 = Release|Win32\r
                {83CF0498-7884-49D3-8B3C-263C5AF5FE1B}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {83CF0498-7884-49D3-8B3C-263C5AF5FE1B}.Debug|Win32.Build.0 = Debug|Win32\r
                {83CF0498-7884-49D3-8B3C-263C5AF5FE1B}.Release|Win32.ActiveCfg = Release|Win32\r
                {83CF0498-7884-49D3-8B3C-263C5AF5FE1B}.Release|Win32.Build.0 = Release|Win32\r
                {15229511-9F6C-48A5-9194-660CA6492563}.Debug|Win32.ActiveCfg = Debug|Win32\r
@@ -303,27 +306,21 @@ Global
                {C0663A08-F276-4DD6-B17C-E501EE066F7C}.Release|Win32.ActiveCfg = Release|Win32\r
                {C0663A08-F276-4DD6-B17C-E501EE066F7C}.Release|Win32.Build.0 = Release|Win32\r
                {AE706502-3203-4815-BF50-4D73BF96BA58}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {AE706502-3203-4815-BF50-4D73BF96BA58}.Debug|Win32.Build.0 = Debug|Win32\r
                {AE706502-3203-4815-BF50-4D73BF96BA58}.Release|Win32.ActiveCfg = Release|Win32\r
                {AE706502-3203-4815-BF50-4D73BF96BA58}.Release|Win32.Build.0 = Release|Win32\r
                {189E64E3-8A67-4477-8B18-3B174C03F6B9}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {189E64E3-8A67-4477-8B18-3B174C03F6B9}.Debug|Win32.Build.0 = Debug|Win32\r
                {189E64E3-8A67-4477-8B18-3B174C03F6B9}.Release|Win32.ActiveCfg = Release|Win32\r
                {189E64E3-8A67-4477-8B18-3B174C03F6B9}.Release|Win32.Build.0 = Release|Win32\r
                {A334BA89-79FC-40E4-8D42-4852ECD2505B}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {A334BA89-79FC-40E4-8D42-4852ECD2505B}.Debug|Win32.Build.0 = Debug|Win32\r
                {A334BA89-79FC-40E4-8D42-4852ECD2505B}.Release|Win32.ActiveCfg = Release|Win32\r
                {A334BA89-79FC-40E4-8D42-4852ECD2505B}.Release|Win32.Build.0 = Release|Win32\r
                {92EA9398-9244-4DAA-8E7D-2F6BEC338CAB}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {92EA9398-9244-4DAA-8E7D-2F6BEC338CAB}.Debug|Win32.Build.0 = Debug|Win32\r
                {92EA9398-9244-4DAA-8E7D-2F6BEC338CAB}.Release|Win32.ActiveCfg = Release|Win32\r
                {92EA9398-9244-4DAA-8E7D-2F6BEC338CAB}.Release|Win32.Build.0 = Release|Win32\r
                {6BD77BDE-151D-4824-A8BC-9F067662F7AB}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {6BD77BDE-151D-4824-A8BC-9F067662F7AB}.Debug|Win32.Build.0 = Debug|Win32\r
                {6BD77BDE-151D-4824-A8BC-9F067662F7AB}.Release|Win32.ActiveCfg = Release|Win32\r
                {6BD77BDE-151D-4824-A8BC-9F067662F7AB}.Release|Win32.Build.0 = Release|Win32\r
                {5EC4407D-0DCD-47E0-9FDB-09011EFA6382}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {5EC4407D-0DCD-47E0-9FDB-09011EFA6382}.Debug|Win32.Build.0 = Debug|Win32\r
                {5EC4407D-0DCD-47E0-9FDB-09011EFA6382}.Release|Win32.ActiveCfg = Release|Win32\r
                {5EC4407D-0DCD-47E0-9FDB-09011EFA6382}.Release|Win32.Build.0 = Release|Win32\r
                {3A011065-B75E-49C8-B480-1A7C8EBD6699}.Debug|Win32.ActiveCfg = Debug|Win32\r
@@ -331,11 +328,9 @@ Global
                {3A011065-B75E-49C8-B480-1A7C8EBD6699}.Release|Win32.ActiveCfg = Release|Win32\r
                {3A011065-B75E-49C8-B480-1A7C8EBD6699}.Release|Win32.Build.0 = Release|Win32\r
                {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F}.Debug|Win32.Build.0 = Debug|Win32\r
                {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F}.Release|Win32.ActiveCfg = Release|Win32\r
                {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F}.Release|Win32.Build.0 = Release|Win32\r
                {24E8C882-CD11-475A-A383-FF52AC05DFE3}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {24E8C882-CD11-475A-A383-FF52AC05DFE3}.Debug|Win32.Build.0 = Debug|Win32\r
                {24E8C882-CD11-475A-A383-FF52AC05DFE3}.Release|Win32.ActiveCfg = Release|Win32\r
                {24E8C882-CD11-475A-A383-FF52AC05DFE3}.Release|Win32.Build.0 = Release|Win32\r
                {B76BCE8C-63CC-4A99-88B5-D621D563E699}.Debug|Win32.ActiveCfg = Debug|Win32\r
@@ -343,23 +338,18 @@ Global
                {B76BCE8C-63CC-4A99-88B5-D621D563E699}.Release|Win32.ActiveCfg = Release|Win32\r
                {B76BCE8C-63CC-4A99-88B5-D621D563E699}.Release|Win32.Build.0 = Release|Win32\r
                {42C526F9-36E5-4B20-92CA-265C90058651}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {42C526F9-36E5-4B20-92CA-265C90058651}.Debug|Win32.Build.0 = Debug|Win32\r
                {42C526F9-36E5-4B20-92CA-265C90058651}.Release|Win32.ActiveCfg = Release|Win32\r
                {42C526F9-36E5-4B20-92CA-265C90058651}.Release|Win32.Build.0 = Release|Win32\r
                {2FDDC7C5-66E5-4520-B735-FD1A065AA9BA}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {2FDDC7C5-66E5-4520-B735-FD1A065AA9BA}.Debug|Win32.Build.0 = Debug|Win32\r
                {2FDDC7C5-66E5-4520-B735-FD1A065AA9BA}.Release|Win32.ActiveCfg = Release|Win32\r
                {2FDDC7C5-66E5-4520-B735-FD1A065AA9BA}.Release|Win32.Build.0 = Release|Win32\r
                {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC}.Debug|Win32.Build.0 = Debug|Win32\r
                {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC}.Release|Win32.ActiveCfg = Release|Win32\r
                {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC}.Release|Win32.Build.0 = Release|Win32\r
                {7DC8987A-C87D-465A-94CF-1F6DF59B38FB}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {7DC8987A-C87D-465A-94CF-1F6DF59B38FB}.Debug|Win32.Build.0 = Debug|Win32\r
                {7DC8987A-C87D-465A-94CF-1F6DF59B38FB}.Release|Win32.ActiveCfg = Release|Win32\r
                {7DC8987A-C87D-465A-94CF-1F6DF59B38FB}.Release|Win32.Build.0 = Release|Win32\r
                {7D3723C5-06C8-4730-BDA1-1B61D6CCBEB8}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {7D3723C5-06C8-4730-BDA1-1B61D6CCBEB8}.Debug|Win32.Build.0 = Debug|Win32\r
                {7D3723C5-06C8-4730-BDA1-1B61D6CCBEB8}.Release|Win32.ActiveCfg = Release|Win32\r
                {7D3723C5-06C8-4730-BDA1-1B61D6CCBEB8}.Release|Win32.Build.0 = Release|Win32\r
                {5A6981A7-A652-4187-B636-3E5120C7CE52}.Debug|Win32.ActiveCfg = Debug|Win32\r
@@ -367,11 +357,9 @@ Global
                {5A6981A7-A652-4187-B636-3E5120C7CE52}.Release|Win32.ActiveCfg = Release|Win32\r
                {5A6981A7-A652-4187-B636-3E5120C7CE52}.Release|Win32.Build.0 = Release|Win32\r
                {2F5A730B-132C-4319-A1B3-DCBE05E2E1B1}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {2F5A730B-132C-4319-A1B3-DCBE05E2E1B1}.Debug|Win32.Build.0 = Debug|Win32\r
                {2F5A730B-132C-4319-A1B3-DCBE05E2E1B1}.Release|Win32.ActiveCfg = Release|Win32\r
                {2F5A730B-132C-4319-A1B3-DCBE05E2E1B1}.Release|Win32.Build.0 = Release|Win32\r
                {397C6B2C-B305-4CB2-B8CE-2366B508AB7C}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {397C6B2C-B305-4CB2-B8CE-2366B508AB7C}.Debug|Win32.Build.0 = Debug|Win32\r
                {397C6B2C-B305-4CB2-B8CE-2366B508AB7C}.Release|Win32.ActiveCfg = Release|Win32\r
                {397C6B2C-B305-4CB2-B8CE-2366B508AB7C}.Release|Win32.Build.0 = Release|Win32\r
                {D6FD0DE5-5305-458E-8CA5-FCA4B8E05B04}.Debug|Win32.ActiveCfg = Debug|Win32\r
@@ -379,35 +367,27 @@ Global
                {D6FD0DE5-5305-458E-8CA5-FCA4B8E05B04}.Release|Win32.ActiveCfg = Release|Win32\r
                {D6FD0DE5-5305-458E-8CA5-FCA4B8E05B04}.Release|Win32.Build.0 = Release|Win32\r
                {1A6CABA9-DA28-4BC1-9DF4-F809231221BC}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {1A6CABA9-DA28-4BC1-9DF4-F809231221BC}.Debug|Win32.Build.0 = Debug|Win32\r
                {1A6CABA9-DA28-4BC1-9DF4-F809231221BC}.Release|Win32.ActiveCfg = Release|Win32\r
                {1A6CABA9-DA28-4BC1-9DF4-F809231221BC}.Release|Win32.Build.0 = Release|Win32\r
                {E72DB0B2-A9B1-47D0-B6CE-563A20434F6E}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {E72DB0B2-A9B1-47D0-B6CE-563A20434F6E}.Debug|Win32.Build.0 = Debug|Win32\r
                {E72DB0B2-A9B1-47D0-B6CE-563A20434F6E}.Release|Win32.ActiveCfg = Release|Win32\r
                {E72DB0B2-A9B1-47D0-B6CE-563A20434F6E}.Release|Win32.Build.0 = Release|Win32\r
                {98127EF3-6289-4251-A057-D7C34B1B67AC}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {98127EF3-6289-4251-A057-D7C34B1B67AC}.Debug|Win32.Build.0 = Debug|Win32\r
                {98127EF3-6289-4251-A057-D7C34B1B67AC}.Release|Win32.ActiveCfg = Release|Win32\r
                {98127EF3-6289-4251-A057-D7C34B1B67AC}.Release|Win32.Build.0 = Release|Win32\r
                {1B030847-602F-4095-8FA2-E8B5CF793F60}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {1B030847-602F-4095-8FA2-E8B5CF793F60}.Debug|Win32.Build.0 = Debug|Win32\r
                {1B030847-602F-4095-8FA2-E8B5CF793F60}.Release|Win32.ActiveCfg = Release|Win32\r
                {1B030847-602F-4095-8FA2-E8B5CF793F60}.Release|Win32.Build.0 = Release|Win32\r
                {E7BAB639-AECF-4E03-A0A2-B9C8D25E1AB0}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {E7BAB639-AECF-4E03-A0A2-B9C8D25E1AB0}.Debug|Win32.Build.0 = Debug|Win32\r
                {E7BAB639-AECF-4E03-A0A2-B9C8D25E1AB0}.Release|Win32.ActiveCfg = Release|Win32\r
                {E7BAB639-AECF-4E03-A0A2-B9C8D25E1AB0}.Release|Win32.Build.0 = Release|Win32\r
                {D470C91D-70E3-4FC8-AFCB-0B615A2EA15D}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {D470C91D-70E3-4FC8-AFCB-0B615A2EA15D}.Debug|Win32.Build.0 = Debug|Win32\r
                {D470C91D-70E3-4FC8-AFCB-0B615A2EA15D}.Release|Win32.ActiveCfg = Release|Win32\r
                {D470C91D-70E3-4FC8-AFCB-0B615A2EA15D}.Release|Win32.Build.0 = Release|Win32\r
                {5CCA377A-754B-45AD-B46D-DE10C2635184}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {5CCA377A-754B-45AD-B46D-DE10C2635184}.Debug|Win32.Build.0 = Debug|Win32\r
                {5CCA377A-754B-45AD-B46D-DE10C2635184}.Release|Win32.ActiveCfg = Release|Win32\r
                {5CCA377A-754B-45AD-B46D-DE10C2635184}.Release|Win32.Build.0 = Release|Win32\r
                {2EF2B285-6C4F-4707-A584-FF76727C4775}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {2EF2B285-6C4F-4707-A584-FF76727C4775}.Debug|Win32.Build.0 = Debug|Win32\r
                {2EF2B285-6C4F-4707-A584-FF76727C4775}.Release|Win32.ActiveCfg = Release|Win32\r
                {2EF2B285-6C4F-4707-A584-FF76727C4775}.Release|Win32.Build.0 = Release|Win32\r
                {BD15CF1D-DAD5-4AF2-A2AA-AEEAAF44C415}.Debug|Win32.ActiveCfg = Debug|Win32\r
@@ -415,75 +395,57 @@ Global
                {BD15CF1D-DAD5-4AF2-A2AA-AEEAAF44C415}.Release|Win32.ActiveCfg = Release|Win32\r
                {BD15CF1D-DAD5-4AF2-A2AA-AEEAAF44C415}.Release|Win32.Build.0 = Release|Win32\r
                {A37FB355-3178-4008-8E11-E7E21AE660DA}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {A37FB355-3178-4008-8E11-E7E21AE660DA}.Debug|Win32.Build.0 = Debug|Win32\r
                {A37FB355-3178-4008-8E11-E7E21AE660DA}.Release|Win32.ActiveCfg = Release|Win32\r
                {A37FB355-3178-4008-8E11-E7E21AE660DA}.Release|Win32.Build.0 = Release|Win32\r
                {659CCC36-163F-4681-AA1C-654CD2B0D151}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {659CCC36-163F-4681-AA1C-654CD2B0D151}.Debug|Win32.Build.0 = Debug|Win32\r
                {659CCC36-163F-4681-AA1C-654CD2B0D151}.Release|Win32.ActiveCfg = Release|Win32\r
                {659CCC36-163F-4681-AA1C-654CD2B0D151}.Release|Win32.Build.0 = Release|Win32\r
                {907889A8-EAC3-450D-BA29-A7DBE3712142}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {907889A8-EAC3-450D-BA29-A7DBE3712142}.Debug|Win32.Build.0 = Debug|Win32\r
                {907889A8-EAC3-450D-BA29-A7DBE3712142}.Release|Win32.ActiveCfg = Release|Win32\r
                {907889A8-EAC3-450D-BA29-A7DBE3712142}.Release|Win32.Build.0 = Release|Win32\r
                {AC65B4FC-EF7C-4321-B201-62B57ED254DB}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {AC65B4FC-EF7C-4321-B201-62B57ED254DB}.Debug|Win32.Build.0 = Debug|Win32\r
                {AC65B4FC-EF7C-4321-B201-62B57ED254DB}.Release|Win32.ActiveCfg = Release|Win32\r
                {AC65B4FC-EF7C-4321-B201-62B57ED254DB}.Release|Win32.Build.0 = Release|Win32\r
                {AC95C5B1-0EDB-4127-858E-0F08A3FC7B69}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {AC95C5B1-0EDB-4127-858E-0F08A3FC7B69}.Debug|Win32.Build.0 = Debug|Win32\r
                {AC95C5B1-0EDB-4127-858E-0F08A3FC7B69}.Release|Win32.ActiveCfg = Release|Win32\r
                {AC95C5B1-0EDB-4127-858E-0F08A3FC7B69}.Release|Win32.Build.0 = Release|Win32\r
                {40597156-1B95-4A22-8F2B-D6B81B747CF0}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {40597156-1B95-4A22-8F2B-D6B81B747CF0}.Debug|Win32.Build.0 = Debug|Win32\r
                {40597156-1B95-4A22-8F2B-D6B81B747CF0}.Release|Win32.ActiveCfg = Release|Win32\r
                {40597156-1B95-4A22-8F2B-D6B81B747CF0}.Release|Win32.Build.0 = Release|Win32\r
                {863A7931-DC7C-47C4-94E6-3D053BFE771A}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {863A7931-DC7C-47C4-94E6-3D053BFE771A}.Debug|Win32.Build.0 = Debug|Win32\r
                {863A7931-DC7C-47C4-94E6-3D053BFE771A}.Release|Win32.ActiveCfg = Release|Win32\r
                {863A7931-DC7C-47C4-94E6-3D053BFE771A}.Release|Win32.Build.0 = Release|Win32\r
                {23D7A1F0-621B-474A-A45F-2490C9935C1E}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {23D7A1F0-621B-474A-A45F-2490C9935C1E}.Debug|Win32.Build.0 = Debug|Win32\r
                {23D7A1F0-621B-474A-A45F-2490C9935C1E}.Release|Win32.ActiveCfg = Release|Win32\r
                {23D7A1F0-621B-474A-A45F-2490C9935C1E}.Release|Win32.Build.0 = Release|Win32\r
                {0062B64B-88F1-4104-A063-3823925A7A34}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {0062B64B-88F1-4104-A063-3823925A7A34}.Debug|Win32.Build.0 = Debug|Win32\r
                {0062B64B-88F1-4104-A063-3823925A7A34}.Release|Win32.ActiveCfg = Release|Win32\r
                {0062B64B-88F1-4104-A063-3823925A7A34}.Release|Win32.Build.0 = Release|Win32\r
                {1F1136E6-D04B-4B7D-A2A7-78A3887F8A3A}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {1F1136E6-D04B-4B7D-A2A7-78A3887F8A3A}.Debug|Win32.Build.0 = Debug|Win32\r
                {1F1136E6-D04B-4B7D-A2A7-78A3887F8A3A}.Release|Win32.ActiveCfg = Release|Win32\r
                {1F1136E6-D04B-4B7D-A2A7-78A3887F8A3A}.Release|Win32.Build.0 = Release|Win32\r
                {89ED80CE-5DEF-46B1-9A12-1D991236EE3E}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {89ED80CE-5DEF-46B1-9A12-1D991236EE3E}.Debug|Win32.Build.0 = Debug|Win32\r
                {89ED80CE-5DEF-46B1-9A12-1D991236EE3E}.Release|Win32.ActiveCfg = Release|Win32\r
                {89ED80CE-5DEF-46B1-9A12-1D991236EE3E}.Release|Win32.Build.0 = Release|Win32\r
                {CCEF85C9-BC40-4C26-8755-581276C8B7DA}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {CCEF85C9-BC40-4C26-8755-581276C8B7DA}.Debug|Win32.Build.0 = Debug|Win32\r
                {CCEF85C9-BC40-4C26-8755-581276C8B7DA}.Release|Win32.ActiveCfg = Release|Win32\r
                {CCEF85C9-BC40-4C26-8755-581276C8B7DA}.Release|Win32.Build.0 = Release|Win32\r
                {C99C1195-2032-408B-9822-F09F49006A3C}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {C99C1195-2032-408B-9822-F09F49006A3C}.Debug|Win32.Build.0 = Debug|Win32\r
                {C99C1195-2032-408B-9822-F09F49006A3C}.Release|Win32.ActiveCfg = Release|Win32\r
                {C99C1195-2032-408B-9822-F09F49006A3C}.Release|Win32.Build.0 = Release|Win32\r
                {13145C00-3694-4342-AFBE-4FAA7E1086BC}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {13145C00-3694-4342-AFBE-4FAA7E1086BC}.Debug|Win32.Build.0 = Debug|Win32\r
                {13145C00-3694-4342-AFBE-4FAA7E1086BC}.Release|Win32.ActiveCfg = Release|Win32\r
                {13145C00-3694-4342-AFBE-4FAA7E1086BC}.Release|Win32.Build.0 = Release|Win32\r
                {3CD86498-8B4C-4018-A9BF-F9E008F376DD}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {3CD86498-8B4C-4018-A9BF-F9E008F376DD}.Debug|Win32.Build.0 = Debug|Win32\r
                {3CD86498-8B4C-4018-A9BF-F9E008F376DD}.Release|Win32.ActiveCfg = Release|Win32\r
                {3CD86498-8B4C-4018-A9BF-F9E008F376DD}.Release|Win32.Build.0 = Release|Win32\r
                {0F4D5D8F-F4D6-4A5D-97E0-9B482257F493}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {0F4D5D8F-F4D6-4A5D-97E0-9B482257F493}.Debug|Win32.Build.0 = Debug|Win32\r
                {0F4D5D8F-F4D6-4A5D-97E0-9B482257F493}.Release|Win32.ActiveCfg = Release|Win32\r
                {0F4D5D8F-F4D6-4A5D-97E0-9B482257F493}.Release|Win32.Build.0 = Release|Win32\r
                {8E82D6BD-74D0-48C3-887A-1754EA71DA5A}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {8E82D6BD-74D0-48C3-887A-1754EA71DA5A}.Debug|Win32.Build.0 = Debug|Win32\r
                {8E82D6BD-74D0-48C3-887A-1754EA71DA5A}.Release|Win32.ActiveCfg = Release|Win32\r
                {8E82D6BD-74D0-48C3-887A-1754EA71DA5A}.Release|Win32.Build.0 = Release|Win32\r
                {443EB1A7-C634-4292-9F2D-C752BB2BF40F}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {443EB1A7-C634-4292-9F2D-C752BB2BF40F}.Debug|Win32.Build.0 = Debug|Win32\r
                {443EB1A7-C634-4292-9F2D-C752BB2BF40F}.Release|Win32.ActiveCfg = Release|Win32\r
                {443EB1A7-C634-4292-9F2D-C752BB2BF40F}.Release|Win32.Build.0 = Release|Win32\r
                {D6CEB142-BF8E-471C-AE16-4300F2D5DEDA}.Debug|Win32.ActiveCfg = Debug|Win32\r
@@ -495,49 +457,47 @@ Global
                {0DEA7FAC-4190-4B39-BEF0-1C055758FED3}.Release|Win32.ActiveCfg = Release|Win32\r
                {0DEA7FAC-4190-4B39-BEF0-1C055758FED3}.Release|Win32.Build.0 = Release|Win32\r
                {8C103DE9-BC35-4173-A08D-63906EC5EEFD}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {8C103DE9-BC35-4173-A08D-63906EC5EEFD}.Debug|Win32.Build.0 = Debug|Win32\r
                {8C103DE9-BC35-4173-A08D-63906EC5EEFD}.Release|Win32.ActiveCfg = Release|Win32\r
                {8C103DE9-BC35-4173-A08D-63906EC5EEFD}.Release|Win32.Build.0 = Release|Win32\r
                {4B6103EF-590B-4916-92CB-D06934459928}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {4B6103EF-590B-4916-92CB-D06934459928}.Debug|Win32.Build.0 = Debug|Win32\r
                {4B6103EF-590B-4916-92CB-D06934459928}.Release|Win32.ActiveCfg = Release|Win32\r
                {4B6103EF-590B-4916-92CB-D06934459928}.Release|Win32.Build.0 = Release|Win32\r
                {2D29953F-2D74-471E-A064-5D184E762DFF}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {2D29953F-2D74-471E-A064-5D184E762DFF}.Debug|Win32.Build.0 = Debug|Win32\r
                {2D29953F-2D74-471E-A064-5D184E762DFF}.Release|Win32.ActiveCfg = Release|Win32\r
                {2D29953F-2D74-471E-A064-5D184E762DFF}.Release|Win32.Build.0 = Release|Win32\r
                {2C551E96-B2EE-48B2-84BF-F6494AF7C004}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {2C551E96-B2EE-48B2-84BF-F6494AF7C004}.Debug|Win32.Build.0 = Debug|Win32\r
                {2C551E96-B2EE-48B2-84BF-F6494AF7C004}.Release|Win32.ActiveCfg = Release|Win32\r
                {2C551E96-B2EE-48B2-84BF-F6494AF7C004}.Release|Win32.Build.0 = Release|Win32\r
                {10015250-7CFF-45BE-90F3-13648727C0A0}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {10015250-7CFF-45BE-90F3-13648727C0A0}.Debug|Win32.Build.0 = Debug|Win32\r
                {10015250-7CFF-45BE-90F3-13648727C0A0}.Release|Win32.ActiveCfg = Release|Win32\r
                {10015250-7CFF-45BE-90F3-13648727C0A0}.Release|Win32.Build.0 = Release|Win32\r
                {DE3057E9-F665-4691-929D-4A7DDED63F73}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {DE3057E9-F665-4691-929D-4A7DDED63F73}.Debug|Win32.Build.0 = Debug|Win32\r
                {DE3057E9-F665-4691-929D-4A7DDED63F73}.Release|Win32.ActiveCfg = Release|Win32\r
                {DE3057E9-F665-4691-929D-4A7DDED63F73}.Release|Win32.Build.0 = Release|Win32\r
                {58E6D7CC-5122-4830-B841-D6FB796B00E8}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {58E6D7CC-5122-4830-B841-D6FB796B00E8}.Debug|Win32.Build.0 = Debug|Win32\r
                {58E6D7CC-5122-4830-B841-D6FB796B00E8}.Release|Win32.ActiveCfg = Release|Win32\r
                {58E6D7CC-5122-4830-B841-D6FB796B00E8}.Release|Win32.Build.0 = Release|Win32\r
                {33E97266-F213-3639-BCAB-2F3F95E15B16}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {33E97266-F213-3639-BCAB-2F3F95E15B16}.Debug|Win32.Build.0 = Debug|Win32\r
                {33E97266-F213-3639-BCAB-2F3F95E15B16}.Release|Win32.ActiveCfg = Release|Win32\r
                {33E97266-F213-3639-BCAB-2F3F95E15B16}.Release|Win32.Build.0 = Release|Win32\r
                {70575BD2-A532-41B8-9A17-B9876E992A84}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {70575BD2-A532-41B8-9A17-B9876E992A84}.Debug|Win32.Build.0 = Debug|Win32\r
                {70575BD2-A532-41B8-9A17-B9876E992A84}.Release|Win32.ActiveCfg = Release|Win32\r
                {70575BD2-A532-41B8-9A17-B9876E992A84}.Release|Win32.Build.0 = Release|Win32\r
                {A6DF0D74-E4D1-4EF4-A642-59B0CF3E74BB}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {A6DF0D74-E4D1-4EF4-A642-59B0CF3E74BB}.Debug|Win32.Build.0 = Debug|Win32\r
                {A6DF0D74-E4D1-4EF4-A642-59B0CF3E74BB}.Release|Win32.ActiveCfg = Release|Win32\r
                {A6DF0D74-E4D1-4EF4-A642-59B0CF3E74BB}.Release|Win32.Build.0 = Release|Win32\r
                {A7D00B21-CB9C-4BBB-8DEE-51025104F867}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {A7D00B21-CB9C-4BBB-8DEE-51025104F867}.Debug|Win32.Build.0 = Debug|Win32\r
                {A7D00B21-CB9C-4BBB-8DEE-51025104F867}.Release|Win32.ActiveCfg = Release|Win32\r
                {A7D00B21-CB9C-4BBB-8DEE-51025104F867}.Release|Win32.Build.0 = Release|Win32\r
+               {B1AA9FD1-0D24-44DF-8CAD-AEA73B52B3EC}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {B1AA9FD1-0D24-44DF-8CAD-AEA73B52B3EC}.Debug|Win32.Build.0 = Debug|Win32\r
+               {B1AA9FD1-0D24-44DF-8CAD-AEA73B52B3EC}.Release|Win32.ActiveCfg = Release|Win32\r
+               {B1AA9FD1-0D24-44DF-8CAD-AEA73B52B3EC}.Release|Win32.Build.0 = Release|Win32\r
+               {B7A03994-C134-4FF7-98B4-97B5579EF13D}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {B7A03994-C134-4FF7-98B4-97B5579EF13D}.Debug|Win32.Build.0 = Debug|Win32\r
+               {B7A03994-C134-4FF7-98B4-97B5579EF13D}.Release|Win32.ActiveCfg = Release|Win32\r
+               {B7A03994-C134-4FF7-98B4-97B5579EF13D}.Release|Win32.Build.0 = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/lib/edgepaint/edge_distinct_coloring.c b/lib/edgepaint/edge_distinct_coloring.c
index 41a5c002eb0cbc9fb94479dcb3f675117a56f5f5..ac62c2a057110fcd42479c00094b6b26815b2f98 100644 (file)
--- a/lib/edgepaint/edge_distinct_coloring.c
+++ b/lib/edgepaint/edge_distinct_coloring.c
@@ -80,14 +80,14 @@ static int splines_intersect(int dim, int u1, int v1, int u2, int v2,
     if (!xsplines1) break;
     xsplines1++;
     if (ns1*dim >= len1){
-      len1 = ns1*dim + MAX(10, 0.2*ns1*dim);
+      len1 = ns1*dim + (int)MAX(10, 0.2*ns1*dim);
       x1 = REALLOC(x1, sizeof(real)*len1);
     }
   }
   if (endp1){/* pad the end point at the last position */
     ns1++;
     if (ns1*dim >= len1){
-      len1 = ns1*dim + MAX(10, 0.2*ns1*dim);
+      len1 = ns1*dim + (int)MAX(10, 0.2*ns1*dim);
       x1 = REALLOC(x1, sizeof(real)*len1);
     }
     x1[(ns1-1)*dim] = tmp[0];  x1[(ns1-1)*dim + 1] = tmp[1]; 
@@ -118,14 +118,14 @@ static int splines_intersect(int dim, int u1, int v1, int u2, int v2,
     if (!xsplines2) break;
     xsplines2++;
     if (ns2*dim >= len2){
-      len2 = ns2*dim + MAX(10, 0.2*ns2*dim);
+      len2 = ns2*dim + (int)MAX(10, 0.2*ns2*dim);
       x2 = REALLOC(x2, sizeof(real)*len2);
     }
   }
   if (endp2){/* pad the end point at the last position */
     ns2++;
     if (ns2*dim >= len2){
-      len2 = ns2*dim + MAX(10, 0.2*ns2*dim);
+      len2 = ns2*dim + (int)MAX(10, 0.2*ns2*dim);
       x2 = REALLOC(x2, sizeof(real)*len2);
     }
     x2[(ns2-1)*dim] = tmp[0];  x2[(ns2-1)*dim + 1] = tmp[1]; 
@@ -156,7 +156,7 @@ for (i = 0; i < ns1 - 1; i++){
 }
 
 
-Agraph_t* edge_distinct_coloring(char *color_scheme, char *lightness, Agraph_t* g, real angle, real accuracy, real check_edges_with_same_endpoint, int seed){
+Agraph_t* edge_distinct_coloring(char *color_scheme, char *lightness, Agraph_t* g, real angle, real accuracy, int check_edges_with_same_endpoint, int seed){
   /* color the edges of a graph so that conflicting edges are as dinstrinct in color as possibl.
      color_scheme: rgb, lab, gray, or a list of comma separaterd RGB colors in hex, like #ff0000,#00ff00
      lightness: of the form 0,70, specifying the range of lightness of LAB color. Ignored if scheme is not COLOR_LAB.

diff --git a/lib/edgepaint/edgepaintlib.vcproj b/lib/edgepaint/edgepaintlib.vcproj
index b09831ca73ab314b38e91fcbccab369c6f7309e8..84f700c2b5a98aca01e417ea94bd75d85927cf0f 100644 (file)
--- a/lib/edgepaint/edgepaintlib.vcproj
+++ b/lib/edgepaint/edgepaintlib.vcproj
@@ -3,7 +3,7 @@
        ProjectType="Visual C++"
        Version="9.00"
        Name="edgepaintlib"
-       ProjectGUID="{70575BD2-A532-41B8-9A17-B9876E992A84}"
+       ProjectGUID="{B1AA9FD1-0D24-44DF-8CAD-AEA73B52B3EC}"
        RootNamespace="edgepaintlib"
        Keyword="Win32Proj"
        TargetFrameworkVersion="196613"
@@ -194,6 +194,10 @@
                                RelativePath=".\lab.h"
                                >
                        </File>
+                       <File
+                               RelativePath=".\lab_gamut.h"
+                               >
+                       </File>
                        <File
                                RelativePath=".\node_distinct_coloring.h"
                                >

diff --git a/lib/edgepaint/furtherest_point.c b/lib/edgepaint/furtherest_point.c
index 77d0336b23a37dbd6f7383e1be2e1639c61f8638..73daf2230d6b3b07295bf3ce80daec006d85f21b 100644 (file)
--- a/lib/edgepaint/furtherest_point.c
+++ b/lib/edgepaint/furtherest_point.c
@@ -134,7 +134,7 @@ void furtherest_point(int k, int dim, real *wgt, real *pts, real *center, real w
        }
        if (!pruned){
          if (ncandidates2 >= ncandidates2_max){
-           ncandidates2_max = ncandidates2_max + MAX(0.2*ncandidates2_max, 10);
+           ncandidates2_max += (int)MAX(0.2*ncandidates2_max, 10);
            candidates2 = REALLOC(candidates2, sizeof(QuadTree)*ncandidates2_max);
          }
          candidates2[ncandidates2++] = qt->qts[ii];
@@ -266,7 +266,7 @@ void furtherest_point_in_list(int k, int dim, real *wgt, real *pts, QuadTree qt,
        }
        if (!pruned){
          if (ncandidates2 >= ncandidates2_max){
-           ncandidates2_max = ncandidates2_max + MAX(0.2*ncandidates2_max, 10);
+           ncandidates2_max += (int)MAX(0.2*ncandidates2_max, 10);
            candidates2 = REALLOC(candidates2, sizeof(QuadTree)*ncandidates2_max);
          }
          candidates2[ncandidates2++] = qt->qts[ii];

diff --git a/lib/edgepaint/node_distinct_coloring.c b/lib/edgepaint/node_distinct_coloring.c
index 399553861836040d79f56a9f177fa1a74717b852..73d73ba80af8d76baa31f50fba607b40657e489d 100644 (file)
--- a/lib/edgepaint/node_distinct_coloring.c
+++ b/lib/edgepaint/node_distinct_coloring.c
@@ -15,7 +15,10 @@
 #include "furtherest_point.h"
 #include "color_palette.h"
 
-inline static real mydist(int dim, real *x, real *y){
+#ifndef WIN32
+inline 
+#endif
+static real mydist(int dim, real *x, real *y){
   int k;
   real d = 0;
   for (k = 0; k < dim; k++) d += (x[k] - y[k])*(x[k]-y[k]);