[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1469
Date       : Tue Jul 18 18:21:49 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/imgmgkft.cpp

Do not be needlessly specific about paths


Diff:
Index: Trunk/XaraLX/wxOil/imgmgkft.cpp
===================================================================
--- Trunk/XaraLX/wxOil/imgmgkft.cpp	(revision 1468)
+++ Trunk/XaraLX/wxOil/imgmgkft.cpp	(revision 1469)
@@ -132,7 +132,8 @@
 
 // Set the default path from a macro so it can be overridden at compile time
 #ifndef DEFAULT_IMAGEMAGICK_PATH
-	#define DEFAULT_IMAGEMAGICK_PATH "/usr/bin/convert"
+//	#define DEFAULT_IMAGEMAGICK_PATH "/usr/bin/convert"
+	#define DEFAULT_IMAGEMAGICK_PATH "convert"
 #endif
 
 #define DIP_QUOTE(x) _T(x) 
@@ -1501,6 +1502,7 @@
 				if (version>=060000.0)
 				{
 					s_HaveImageMagick = TRUE;
+					s_DoWarning = TRUE; // warn them again if it ever goes away
 				}
 			}
 		}


Xara