unflatten and gvpack fixes + gdiplus plugin added

diff --git a/cmd/tools/unflatten.vcproj b/cmd/tools/unflatten.vcproj
index 3c759472cd3c83211e8e61c04ca9dd0919cb0c38..9da9a17552f276870ad5481618d59be1a63670b4 100644 (file)
--- a/cmd/tools/unflatten.vcproj
+++ b/cmd/tools/unflatten.vcproj
@@ -60,10 +60,10 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="cgraph.lib  ingraphs.lib"
+                               AdditionalDependencies="gtk-win32-2.0.lib asprintf.lib atk-1.0.lib bz2.lib cairo.lib charset.lib croco-0.6.lib expat.lib expatw.lib glade-2.0.lib fontconfig.lib freetype.lib gdk_pixbuf-2.0.lib gdkglext-win32-1.0.lib gdk-win32-2.0.lib glib-2.0.lib pathplan.lib gmodule-2.0.lib gobject-2.0.lib gsf-1.lib gsf-win32-1.lib gthread-2.0.lib gtkglext-win32-1.0.lib iconv.lib intl.lib jpeg.lib libexpat.lib libexpatw.lib pango-1.0.lib pangocairo-1.0.lib pangoft2-1.0.lib pangowin32-1.0.lib popt.lib rsvg-2.lib tiff.lib xml2.lib libgdkglext-win32-1.0.dll.a libgtkglext-win32-1.0.dll.a glu32.lib opengl32.lib ltdl.lib hs_regex.lib zdll.lib cdt.lib gvc.lib circogen.lib neatogen.lib fdpgen.lib patchwork.lib sparse.lib twopigen.lib cgraph.lib ingraphs.lib"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
-                               AdditionalLibraryDirectories="C:\graphviz-ms\bin"
+                               AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"
                                GenerateDebugInformation="true"
                                SubSystem="1"
                                TargetMachine="1"
@@ -197,11 +197,11 @@
                        </File>
                </Filter>
                <File
-                       RelativePath=".\debug\BuildLog.htm"
+                       RelativePath=".\release\BuildLog.htm"
                        >
                </File>
                <File
-                       RelativePath=".\release\BuildLog.htm"
+                       RelativePath=".\debug\BuildLog.htm"
                        >
                </File>
        </Files>

diff --git a/graphviz.sln b/graphviz.sln
index 8dbb38a3bf8681927b33cf2cdbdea9fd2a53669b..e506ae7c636eea41a8e1a5dc1dae4e0e7e95f030 100644 (file)
--- a/graphviz.sln
+++ b/graphviz.sln
@@ -369,8 +369,8 @@ Global
                {23D7A1F0-621B-474A-A45F-2490C9935C1E}.Release|Win32.Build.0 = Release|Win32
                {0062B64B-88F1-4104-A063-3823925A7A34}.Debug|Win32.ActiveCfg = Debug|Win32
                {0062B64B-88F1-4104-A063-3823925A7A34}.Debug|Win32.Build.0 = Debug|Win32
-               {0062B64B-88F1-4104-A063-3823925A7A34}.Release|Win32.ActiveCfg = Debug|Win32
-               {0062B64B-88F1-4104-A063-3823925A7A34}.Release|Win32.Build.0 = Debug|Win32
+               {0062B64B-88F1-4104-A063-3823925A7A34}.Release|Win32.ActiveCfg = Release|Win32
+               {0062B64B-88F1-4104-A063-3823925A7A34}.Release|Win32.Build.0 = Release|Win32
                {1F1136E6-D04B-4B7D-A2A7-78A3887F8A3A}.Debug|Win32.ActiveCfg = Debug|Win32
                {1F1136E6-D04B-4B7D-A2A7-78A3887F8A3A}.Debug|Win32.Build.0 = Debug|Win32
                {1F1136E6-D04B-4B7D-A2A7-78A3887F8A3A}.Release|Win32.ActiveCfg = Release|Win32

diff --git a/lib/common/utils.c b/lib/common/utils.c
index 6f0fe5c2a11536e977278b4021f0929cf41abbc5..9b80e665fe212e0b65fce53152a463f4da2f09e6 100644 (file)
--- a/lib/common/utils.c
+++ b/lib/common/utils.c
@@ -585,8 +585,7 @@ int test_toggle()
 void common_init_node(node_t * n)
 {
     char *str;
-
-    ND_width(n) =
+       ND_width(n) =
        late_double(n, N_width, DEFAULT_NODEWIDTH, MIN_NODEWIDTH);
     ND_height(n) =
        late_double(n, N_height, DEFAULT_NODEHEIGHT, MIN_NODEHEIGHT);