comparison src/glyphs-x.c @ 6:27bc7f280385 r19-15b4

Import from CVS: tag r19-15b4
author cvs
date Mon, 13 Aug 2007 08:47:15 +0200
parents ac2d302a0011
children 4b173ad71786
comparison
equal deleted inserted replaced
5:49b78a777eb4 6:27bc7f280385
1048 **********************************************************************/ 1048 **********************************************************************/
1049 1049
1050 #include "jpeglib.h" 1050 #include "jpeglib.h"
1051 #include "jerror.h" 1051 #include "jerror.h"
1052 1052
1053 /* The in-core jpeg code doesn't work, so I'm avoiding it for now. -sb */
1054 #define USE_TEMP_FILES_FOR_JPEG_IMAGES 1
1055
1053 static void 1056 static void
1054 jpeg_validate (Lisp_Object instantiator) 1057 jpeg_validate (Lisp_Object instantiator)
1055 { 1058 {
1056 file_or_data_must_be_present (instantiator); 1059 file_or_data_must_be_present (instantiator);
1057 } 1060 }
1267 1270
1268 memset (&unwind, 0, sizeof (unwind)); 1271 memset (&unwind, 0, sizeof (unwind));
1269 unwind.dpy = dpy; 1272 unwind.dpy = dpy;
1270 record_unwind_protect (jpeg_instantiate_unwind, make_opaque_ptr (&unwind)); 1273 record_unwind_protect (jpeg_instantiate_unwind, make_opaque_ptr (&unwind));
1271 1274
1272 #ifdef USE_TEMP_FILES_FOR_IMAGES 1275 #ifdef USE_TEMP_FILES_FOR_JPEG_IMAGES
1273 /* Step 0: Write out to a temp file. 1276 /* Step 0: Write out to a temp file.
1274 1277
1275 The JPEG routines require you to read from a file unless 1278 The JPEG routines require you to read from a file unless
1276 you provide your own special input handlers, which I don't 1279 you provide your own special input handlers, which I don't
1277 feel like doing. */ 1280 feel like doing. */
1323 jpeg_create_decompress (&cinfo); 1326 jpeg_create_decompress (&cinfo);
1324 unwind.cinfo_ptr = &cinfo; 1327 unwind.cinfo_ptr = &cinfo;
1325 1328
1326 /* Step 2: specify data source (eg, a file) */ 1329 /* Step 2: specify data source (eg, a file) */
1327 1330
1328 #ifdef USE_FILEIO_FOR_IMAGES 1331 #ifdef USE_TEMP_FILES_FOR_JPEG_IMAGES
1329 jpeg_stdio_src (&cinfo, unwind.instream); 1332 jpeg_stdio_src (&cinfo, unwind.instream);
1330 #else 1333 #else
1331 { 1334 {
1332 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); 1335 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
1333 Extbyte *bytes; 1336 Extbyte *bytes;