From be67261d0bdeb21ffe15fe968dd5bc16edd407e0 Mon Sep 17 00:00:00 2001 From: Ingo Weyrich Date: Wed, 14 Oct 2020 09:10:58 +0200 Subject: [PATCH] Workaround to allow building on msys2 with libjpeg-turbo, #4713 --- rtengine/jdatasrc.cc | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/rtengine/jdatasrc.cc b/rtengine/jdatasrc.cc index a5008b00f..f9256899d 100644 --- a/rtengine/jdatasrc.cc +++ b/rtengine/jdatasrc.cc @@ -248,12 +248,18 @@ my_error_exit (j_common_ptr cinfo) } -//const char * const jpeg_std_message_table[] = { -//#include "jerror.h" -// NULL -//}; -extern const char * const jpeg_std_message_table[]; +#ifdef WIN32 +#define JVERSION "6b 27-Mar-1998" +#define JCOPYRIGHT_SHORT "(C) 1998, Thomas G. Lane" +#define JMESSAGE(code,string) string , +const char * const jpeg_std_message_table[] = { +#include "jerror.h" + NULL +}; +#else +extern const char * const jpeg_std_message_table[]; +#endif /* * Actual output of an error or trace message.