| OLD | NEW |
| 1 /* $Id: tif_ojpeg.c,v 1.56 2012-05-24 03:15:18 fwarmerdam Exp $ */ | 1 /* $Id: tif_ojpeg.c,v 1.56 2012-05-24 03:15:18 fwarmerdam Exp $ */ |
| 2 | 2 |
| 3 /* WARNING: The type of JPEG encapsulation defined by the TIFF Version 6.0 | 3 /* WARNING: The type of JPEG encapsulation defined by the TIFF Version 6.0 |
| 4 specification is now totally obsolete and deprecated for new applications and | 4 specification is now totally obsolete and deprecated for new applications and |
| 5 images. This file was was created solely in order to read unconverted images | 5 images. This file was was created solely in order to read unconverted images |
| 6 still present on some users' computer systems. It will never be extended | 6 still present on some users' computer systems. It will never be extended |
| 7 to write such files. Writing new-style JPEG compressed TIFFs is implemented | 7 to write such files. Writing new-style JPEG compressed TIFFs is implemented |
| 8 in tif_jpeg.c. | 8 in tif_jpeg.c. |
| 9 | 9 |
| 10 The code is carefully crafted to robustly read all gathered JPEG-in-TIFF | 10 The code is carefully crafted to robustly read all gathered JPEG-in-TIFF |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 | 209 |
| 210 /* Define "boolean" as unsigned char, not int, per Windows custom. */ | 210 /* Define "boolean" as unsigned char, not int, per Windows custom. */ |
| 211 #if defined(__WIN32__) && !defined(__MINGW32__) | 211 #if defined(__WIN32__) && !defined(__MINGW32__) |
| 212 # ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */ | 212 # ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */ |
| 213 typedef unsigned char boolean; | 213 typedef unsigned char boolean; |
| 214 # endif | 214 # endif |
| 215 # define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ | 215 # define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ |
| 216 #endif | 216 #endif |
| 217 | 217 |
| 218 #ifndef _FX_JPEG_TURBO_ | 218 #ifndef _FX_JPEG_TURBO_ |
| 219 » #include "../../libjpeg/jpeglib.h" | 219 » #include "../libjpeg/jpeglib.h" |
| 220 » #include "../../libjpeg/jerror.h" | 220 » #include "../libjpeg/jerror.h" |
| 221 #else | 221 #else |
| 222 » #include "../../libjpeg-turbo/jpeglib.h" | 222 » #include "../libjpeg-turbo/jpeglib.h" |
| 223 » #include "../../libjpeg-turbo/jerror.h" | 223 » #include "../libjpeg-turbo/jerror.h" |
| 224 #endif//_FX_JPEG_TURBO_ | 224 #endif//_FX_JPEG_TURBO_ |
| 225 | 225 |
| 226 typedef struct jpeg_error_mgr jpeg_error_mgr; | 226 typedef struct jpeg_error_mgr jpeg_error_mgr; |
| 227 typedef struct jpeg_common_struct jpeg_common_struct; | 227 typedef struct jpeg_common_struct jpeg_common_struct; |
| 228 typedef struct jpeg_decompress_struct jpeg_decompress_struct; | 228 typedef struct jpeg_decompress_struct jpeg_decompress_struct; |
| 229 typedef struct jpeg_source_mgr jpeg_source_mgr; | 229 typedef struct jpeg_source_mgr jpeg_source_mgr; |
| 230 | 230 |
| 231 typedef enum { | 231 typedef enum { |
| 232 osibsNotSetYet, | 232 osibsNotSetYet, |
| 233 osibsJpegInterchangeFormat, | 233 osibsJpegInterchangeFormat, |
| (...skipping 2261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2495 | 2495 |
| 2496 | 2496 |
| 2497 /* | 2497 /* |
| 2498 * Local Variables: | 2498 * Local Variables: |
| 2499 * mode: c | 2499 * mode: c |
| 2500 * c-basic-offset: 8 | 2500 * c-basic-offset: 8 |
| 2501 * fill-column: 78 | 2501 * fill-column: 78 |
| 2502 * End: | 2502 * End: |
| 2503 */ | 2503 */ |
| 2504 | 2504 |
| OLD | NEW |