summaryrefslogtreecommitdiff
blob: ddf3328de441611aa6f4efd260c9b61238329f5e (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
#! /bin/sh /usr/share/dpatch/dpatch-run
## 50_update_imagemagick_version_parser.dpatch by Joachim Breitner <nomeata@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad xaralx-0.7r1785~/wxOil/imgmgkft.cpp xaralx-0.7r1785/wxOil/imgmgkft.cpp
--- xaralx-0.7r1785~/wxOil/imgmgkft.cpp	2009-10-08 11:42:12.000000000 +0200
+++ xaralx-0.7r1785/wxOil/imgmgkft.cpp	2009-10-08 11:43:31.000000000 +0200
@@ -1490,14 +1490,14 @@
 		s_ImageMagickPath = DIP_QUOTE(DEFAULT_IMAGEMAGICK_PATH);
 
 	wxArrayString output;
-	long /*TYPENOTE: Correct*/ ret=::wxExecute(wxString((const TCHAR *)s_ImageMagickPath)/*+_T(" --version")*/, output, wxEXEC_SYNC | wxEXEC_NODISABLE);
+	long /*TYPENOTE: Correct*/ ret=::wxExecute(wxString((const TCHAR *)s_ImageMagickPath)+_T(" --version"), output, wxEXEC_SYNC | wxEXEC_NODISABLE);
 	if (!ret && output.GetCount()>0)
 	{
 		wxString check = output[0];
 		wxString version;
 		if (check.StartsWith(_T("Version: ImageMagick "),&version))
 		{
-			wxStringTokenizer tk(version, _T(".: "));
+			wxStringTokenizer tk(version, _T(".:- "));
 			if (tk.CountTokens()>=3)
 			{
 				long /*TYPENOTE: Correct*/ v1,v2,v3=0;