$NetBSD: patch-ab,v 1.3 2011/09/12 16:52:56 taca Exp $ --- jpeg.c.orig 1995-08-04 23:35:07.000000000 +0000 +++ jpeg.c @@ -65,6 +65,7 @@ *==============*/ #include +#include #include "all.h" #include "mtypes.h" #include "frames.h" @@ -77,7 +78,7 @@ /* make it happier.... */ #undef DCTSIZE2 -#include "jpeg/jpeglib.h" +#include "jpeglib.h" /* Use system header! */ #define HEADER_SIZE 607 /*JFIF header size used on output images*/ @@ -514,7 +515,11 @@ ReadJPEG(mf, fp) #ifdef JPEG4 buffer_height = 8; /* could be 2, 4,8 rows high */ #else +# if JPEG_LIB_VERSION < 80 buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size; +# else + buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_v_scaled_size; +# endif #endif for(cp=0,compptr = cinfo.comp_info;cp