dia r4177 - in trunk: . plug-ins/wmf

[hans svn gnome org]

Author: hans
Date: Tue Jan  6 16:52:31 2009
New Revision: 4177
URL: http://svn.gnome.org/viewvc/dia?rev=4177&view=rev

Log:
2009-01-06  Hans Breuer  <hans breuer org>

	* plug-ins/wmf/Makefile.am : remove -lstdc++ from LIBADD line 
	(Matt Keenan, bug #558263); install the plug-in in case of 
	libEMF being available
	* plug-ins/wmf/wmf.cpp : avoid double close of 'ofile'



Modified:
   trunk/ChangeLog
   trunk/plug-ins/wmf/Makefile.am
   trunk/plug-ins/wmf/wmf.cpp

Modified: trunk/plug-ins/wmf/Makefile.am
==============================================================================
--- trunk/plug-ins/wmf/Makefile.am	(original)
+++ trunk/plug-ins/wmf/Makefile.am	Tue Jan  6 16:52:31 2009
@@ -8,7 +8,7 @@
 
 libwmf_filter_la_SOURCES = $(plugin_sources)
 libwmf_filter_la_LDFLAGS = -export-dynamic -module -avoid-version 
-libwmf_filter_la_LIBADD = -lstdc++ $(LIBEMF_LIBS)
+libwmf_filter_la_LIBADD = $(LIBEMF_LIBS)
 
 INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/lib \
   $(DEBUG_FLAGS) $(GTK_CFLAGS) $(LIBEMF_CFLAGS)
@@ -20,6 +20,8 @@
 	wmf_gdi.h \
 	libemf-todo.txt
 
+if !WITH_LIBEMF
 # Prevent installation
 install-pkglibLTLIBRARIES:
 	:
+endif

Modified: trunk/plug-ins/wmf/wmf.cpp
==============================================================================
--- trunk/plug-ins/wmf/wmf.cpp	(original)
+++ trunk/plug-ins/wmf/wmf.cpp	Tue Jan  6 16:52:31 2009
@@ -1247,6 +1247,7 @@
     FILE* ofile = g_fopen (filename, "w");
     if (ofile)
       file = CreateEnhMetaFileWithFILEA (refDC, ofile, &bbox, "Created with Dia/libEMF\0");
+      // file now owned by the metafile DC
 #else
     file = (W32::HDC)W32::CreateEnhMetaFile(
                     refDC, // handle to a reference device context
@@ -1353,10 +1354,6 @@
 
     g_object_unref(renderer);
     
-#if HAVE_LIBEMF
-    fclose (ofile);
-#endif
-
     W32::ReleaseDC (NULL, refDC);
 }