Skip to content

Commit 6f5fced

Browse files
authored
psconvert: Do not raise an error when gs is not found in registry or GMT/bin (#9033)
1 parent 9615224 commit 6f5fced

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

src/psconvert.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1750,7 +1750,7 @@ EXTERN_MSC int GMT_psconvert(void *V_API, int mode, void *args) {
17501750
if ((error = parse (GMT, Ctrl, options)) != 0) Return (error);
17511751

17521752
/*---------------------------- This is the psconvert main code ----------------------------*/
1753-
1753+
17541754
gmt_M_tic(GMT);
17551755

17561756
if (!Ctrl->L.active && (GMT->current.setting.run_mode == GMT_CLASSIC) && (Ctrl->In.n_files == 0)) { /* No files given, bail */
@@ -2176,16 +2176,16 @@ EXTERN_MSC int GMT_psconvert(void *V_API, int mode, void *args) {
21762176
Return (API->error);
21772177
}
21782178
if ((error = GMT_Set_Columns (API, GMT_OUT, 6, GMT_COL_FIX_NO_TEXT)) != GMT_NOERROR) Return (error);
2179-
2179+
21802180
Out = gmt_new_record(GMT, out, NULL);
21812181
out[0] = (x1-x0) * 2.54/72.0; out[1] = (y1-y0) * 2.54/72.0; out[2] = x0 * 2.54/72.0;
21822182
out[3] = y0 * 2.54/72.0; out[4] = x1 * 2.54/72.0; out[5] = y1 * 2.54/72.0;
21832183
GMT_Put_Record(API, GMT_WRITE_DATA, Out);
2184-
2184+
21852185
if (GMT_End_IO (API, GMT_OUT, 0) != GMT_NOERROR) { /* Disables further data output */
21862186
Return (API->error);
21872187
}
2188-
2188+
21892189
Return(GMT_OK);
21902190
}
21912191
}
@@ -2734,7 +2734,7 @@ EXTERN_MSC int GMT_psconvert(void *V_API, int mode, void *args) {
27342734
if (!Ctrl->O.active && Ctrl->T.ps && GMT->current.setting.run_mode == GMT_CLASSIC) {
27352735
second_ps = true; /* Tell the renaming branch of modern mode to deal with this case too */
27362736
if (!Ctrl->F.file) {
2737-
size_t len = strlen(ps_file);
2737+
size_t len = strlen(ps_file);
27382738
Ctrl->F.file = strdup(ps_file);
27392739
Ctrl->F.file[len - 3] = '_'; /* Change the last ".ps" to "_2" */
27402740
Ctrl->F.file[len - 2] = '2'; Ctrl->F.file[len - 1] = '\0';
@@ -3222,7 +3222,7 @@ GMT_LOCAL int psconvert_ghostbuster(struct GMTAPI_CTRL *API, struct PSCONVERT_CT
32223222
}
32233223

32243224
if (!found) {
3225-
GMT_Report(API, GMT_MSG_ERROR, "Ghostscript not found in registry nor in GMT/bin. Fallback to PATH.\n");
3225+
GMT_Report(API, GMT_MSG_DEBUG, "Ghostscript not found in registry nor in GMT/bin. Fallback to PATH.\n");
32263226
return GMT_RUNTIME_ERROR;
32273227
}
32283228

0 commit comments

Comments
 (0)