liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7080 from Benitoite/patch-37

Browse Source 
Fix linking with jpeg-turbo
This commit is contained in:
Lawrence37 2024-05-20 21:24:40 -07:00 committed by GitHub
commit 6b9f45c69c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
rtengine/jdatasrc.cc
View File

@ -247,20 +247,6 @@ my_error_exit (j_common_ptr cinfo)
#endif #endif
} }
#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. * Actual output of an error or trace message.
* Applications may override this method to send JPEG messages somewhere * Applications may override this method to send JPEG messages somewhere
@ -409,24 +395,10 @@ reset_error_mgr (j_common_ptr cinfo)
GLOBAL(struct jpeg_error_mgr *) GLOBAL(struct jpeg_error_mgr *)
my_jpeg_std_error (struct jpeg_error_mgr * err) my_jpeg_std_error (struct jpeg_error_mgr * err)
{ {
err = jpeg_std_error(err);
/* override these functions */
err->error_exit = my_error_exit; err->error_exit = my_error_exit;
err->emit_message = emit_message;
err->output_message = output_message;
err->format_message = format_message;
err->reset_error_mgr = reset_error_mgr;
err->trace_level = 0; /* default = no tracing */
err->num_warnings = 0; /* no warnings emitted yet */
err->msg_code = 0; /* may be useful as a flag for "no error" */
/* Initialize message table pointers */
err->jpeg_message_table = jpeg_std_message_table;
err->last_jpeg_message = (int) JMSG_LASTMSGCODE - 1;
err->addon_message_table = nullptr;
err->first_addon_message = 0; /* for safety */
err->last_addon_message = 0;
return err; return err;
} }