From: Masamichi Hosoda <trueroad@trueroad.jp>
Date: Mon, 1 Jun 2015 13:15:09 +0000 (+0900)
Subject: Issue 4431 / 3: Add Netpbm commands search procedures
X-Git-Tag: release/2.19.22-1~46
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1585dd6c7b781e9f91490eb463b4aa96610b66fd;p=lilypond.git

Issue 4431 / 3: Add Netpbm commands search procedures

pngtopnm is obsoleted by pngtopam.
pnmscale is obsoleted by pamscale.
---

diff --git a/scm/ps-to-png.scm b/scm/ps-to-png.scm
index 20569ca358..0d1e174ed6 100644
--- a/scm/ps-to-png.scm
+++ b/scm/ps-to-png.scm
@@ -33,6 +33,24 @@
 (define-public (gulp-file file-name . max-size)
   (ly:gulp-file file-name (if (pair? max-size) (car max-size))))
 
+(define (search-pngtopam)
+  (search-executable
+   (if (eq? PLATFORM 'windows)
+       '("pngtopam.exe" "pngtopnm.exe")
+       '("pngtopam" "pngtopnm"))))
+
+(define (search-pamscale)
+  (search-executable
+   (if (eq? PLATFORM 'windows)
+       '("pamscale.exe" "pnmscale.exe")
+       '("pamscale" "pnmscale"))))
+
+(define (search-pnmtopng)
+  (search-executable
+   (if (eq? PLATFORM 'windows)
+       '("pnmtopng.exe")
+       '("pnmtopng"))))
+
 (define (scale-down-image factor file)
   (let* ((old (string-append file ".old"))
          ;; Netpbm commands (pngtopnm, pnmscale, pnmtopng)