Merge branch 'master' into dev

2019-12-31 00:42:53 -06:00
parent 80acd5c4a7 6367924ac6
commit c4675d62e8
8 changed files with 368 additions and 346 deletions
--- a/djpeg.c
+++ b/djpeg.c
@@ -538,7 +538,9 @@ main(int argc, char **argv)
  FILE *input_file;
  FILE *output_file;
  unsigned char *inbuffer = NULL;
+#if JPEG_LIB_VERSION >= 80 || defined(MEM_SRCDST_SUPPORTED)
  unsigned long insize = 0;
+#endif
  JDIMENSION num_scanlines;

  /* On Mac, fetch a command line. */