| OLD | NEW |
| 1 /* | 1 /* |
| 2 * jmorecfg.h | 2 * jmorecfg.h |
| 3 * | 3 * |
| 4 * Copyright (C) 1991-1997, Thomas G. Lane. | 4 * Copyright (C) 1991-1997, Thomas G. Lane. |
| 5 * Copyright (C) 2009, D. R. Commander. | 5 * Copyright (C) 2009, 2011, D. R. Commander. |
| 6 * This file is part of the Independent JPEG Group's software. | 6 * This file is part of the Independent JPEG Group's software. |
| 7 * For conditions of distribution and use, see the accompanying README file. | 7 * For conditions of distribution and use, see the accompanying README file. |
| 8 * | 8 * |
| 9 * This file contains additional configuration options that customize the | 9 * This file contains additional configuration options that customize the |
| 10 * JPEG software for special applications or support machine-dependent | 10 * JPEG software for special applications or support machine-dependent |
| 11 * optimizations. Most users will not need to touch this file. | 11 * optimizations. Most users will not need to touch this file. |
| 12 */ | 12 */ |
| 13 | 13 |
| 14 | 14 |
| 15 /* | 15 /* |
| (...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 312 * 3. The color quantizer modules will not behave desirably if RGB_PIXELSIZE | 312 * 3. The color quantizer modules will not behave desirably if RGB_PIXELSIZE |
| 313 * is not 3 (they don't understand about dummy color components!). So you | 313 * is not 3 (they don't understand about dummy color components!). So you |
| 314 * can't use color quantization if you change that value. | 314 * can't use color quantization if you change that value. |
| 315 */ | 315 */ |
| 316 | 316 |
| 317 #define RGB_RED 0 /* Offset of Red in an RGB scanline element */ | 317 #define RGB_RED 0 /* Offset of Red in an RGB scanline element */ |
| 318 #define RGB_GREEN 1 /* Offset of Green */ | 318 #define RGB_GREEN 1 /* Offset of Green */ |
| 319 #define RGB_BLUE 2 /* Offset of Blue */ | 319 #define RGB_BLUE 2 /* Offset of Blue */ |
| 320 #define RGB_PIXELSIZE 3 /* JSAMPLEs per RGB scanline element */ | 320 #define RGB_PIXELSIZE 3 /* JSAMPLEs per RGB scanline element */ |
| 321 | 321 |
| 322 #define JPEG_NUMCS 12 | 322 #define JPEG_NUMCS 16 |
| 323 | 323 |
| 324 #define EXT_RGB_RED 0 | 324 #define EXT_RGB_RED 0 |
| 325 #define EXT_RGB_GREEN 1 | 325 #define EXT_RGB_GREEN 1 |
| 326 #define EXT_RGB_BLUE 2 | 326 #define EXT_RGB_BLUE 2 |
| 327 #define EXT_RGB_PIXELSIZE 3 | 327 #define EXT_RGB_PIXELSIZE 3 |
| 328 | 328 |
| 329 #define EXT_RGBX_RED 0 | 329 #define EXT_RGBX_RED 0 |
| 330 #define EXT_RGBX_GREEN 1 | 330 #define EXT_RGBX_GREEN 1 |
| 331 #define EXT_RGBX_BLUE 2 | 331 #define EXT_RGBX_BLUE 2 |
| 332 #define EXT_RGBX_PIXELSIZE 4 | 332 #define EXT_RGBX_PIXELSIZE 4 |
| (...skipping 13 matching lines...) Expand all Loading... |
| 346 #define EXT_XBGR_BLUE 1 | 346 #define EXT_XBGR_BLUE 1 |
| 347 #define EXT_XBGR_PIXELSIZE 4 | 347 #define EXT_XBGR_PIXELSIZE 4 |
| 348 | 348 |
| 349 #define EXT_XRGB_RED 1 | 349 #define EXT_XRGB_RED 1 |
| 350 #define EXT_XRGB_GREEN 2 | 350 #define EXT_XRGB_GREEN 2 |
| 351 #define EXT_XRGB_BLUE 3 | 351 #define EXT_XRGB_BLUE 3 |
| 352 #define EXT_XRGB_PIXELSIZE 4 | 352 #define EXT_XRGB_PIXELSIZE 4 |
| 353 | 353 |
| 354 static const int rgb_red[JPEG_NUMCS] = { | 354 static const int rgb_red[JPEG_NUMCS] = { |
| 355 -1, -1, RGB_RED, -1, -1, -1, EXT_RGB_RED, EXT_RGBX_RED, | 355 -1, -1, RGB_RED, -1, -1, -1, EXT_RGB_RED, EXT_RGBX_RED, |
| 356 EXT_BGR_RED, EXT_BGRX_RED, EXT_XBGR_RED, EXT_XRGB_RED | 356 EXT_BGR_RED, EXT_BGRX_RED, EXT_XBGR_RED, EXT_XRGB_RED, |
| 357 EXT_RGBX_RED, EXT_BGRX_RED, EXT_XBGR_RED, EXT_XRGB_RED |
| 357 }; | 358 }; |
| 358 | 359 |
| 359 static const int rgb_green[JPEG_NUMCS] = { | 360 static const int rgb_green[JPEG_NUMCS] = { |
| 360 -1, -1, RGB_GREEN, -1, -1, -1, EXT_RGB_GREEN, EXT_RGBX_GREEN, | 361 -1, -1, RGB_GREEN, -1, -1, -1, EXT_RGB_GREEN, EXT_RGBX_GREEN, |
| 361 EXT_BGR_GREEN, EXT_BGRX_GREEN, EXT_XBGR_GREEN, EXT_XRGB_GREEN | 362 EXT_BGR_GREEN, EXT_BGRX_GREEN, EXT_XBGR_GREEN, EXT_XRGB_GREEN, |
| 363 EXT_RGBX_GREEN, EXT_BGRX_GREEN, EXT_XBGR_GREEN, EXT_XRGB_GREEN |
| 362 }; | 364 }; |
| 363 | 365 |
| 364 static const int rgb_blue[JPEG_NUMCS] = { | 366 static const int rgb_blue[JPEG_NUMCS] = { |
| 365 -1, -1, RGB_BLUE, -1, -1, -1, EXT_RGB_BLUE, EXT_RGBX_BLUE, | 367 -1, -1, RGB_BLUE, -1, -1, -1, EXT_RGB_BLUE, EXT_RGBX_BLUE, |
| 366 EXT_BGR_BLUE, EXT_BGRX_BLUE, EXT_XBGR_BLUE, EXT_XRGB_BLUE | 368 EXT_BGR_BLUE, EXT_BGRX_BLUE, EXT_XBGR_BLUE, EXT_XRGB_BLUE, |
| 369 EXT_RGBX_BLUE, EXT_BGRX_BLUE, EXT_XBGR_BLUE, EXT_XRGB_BLUE |
| 367 }; | 370 }; |
| 368 | 371 |
| 369 static const int rgb_pixelsize[JPEG_NUMCS] = { | 372 static const int rgb_pixelsize[JPEG_NUMCS] = { |
| 370 -1, -1, RGB_PIXELSIZE, -1, -1, -1, EXT_RGB_PIXELSIZE, EXT_RGBX_PIXELSIZE, | 373 -1, -1, RGB_PIXELSIZE, -1, -1, -1, EXT_RGB_PIXELSIZE, EXT_RGBX_PIXELSIZE, |
| 371 EXT_BGR_PIXELSIZE, EXT_BGRX_PIXELSIZE, EXT_XBGR_PIXELSIZE, EXT_XRGB_PIXELSIZE | 374 EXT_BGR_PIXELSIZE, EXT_BGRX_PIXELSIZE, EXT_XBGR_PIXELSIZE, EXT_XRGB_PIXELSIZE, |
| 375 EXT_RGBX_PIXELSIZE, EXT_BGRX_PIXELSIZE, EXT_XBGR_PIXELSIZE, EXT_XRGB_PIXELSIZE |
| 372 }; | 376 }; |
| 373 | 377 |
| 374 /* Definitions for speed-related optimizations. */ | 378 /* Definitions for speed-related optimizations. */ |
| 375 | 379 |
| 376 /* On some machines (notably 68000 series) "int" is 32 bits, but multiplying | 380 /* On some machines (notably 68000 series) "int" is 32 bits, but multiplying |
| 377 * two 16-bit shorts is faster than multiplying two ints. Define MULTIPLIER | 381 * two 16-bit shorts is faster than multiplying two ints. Define MULTIPLIER |
| 378 * as short on such a machine. MULTIPLIER must be at least 16 bits wide. | 382 * as short on such a machine. MULTIPLIER must be at least 16 bits wide. |
| 379 */ | 383 */ |
| 380 | 384 |
| 381 #ifndef MULTIPLIER | 385 #ifndef MULTIPLIER |
| (...skipping 15 matching lines...) Expand all Loading... |
| 397 | 401 |
| 398 #ifndef FAST_FLOAT | 402 #ifndef FAST_FLOAT |
| 399 #ifdef HAVE_PROTOTYPES | 403 #ifdef HAVE_PROTOTYPES |
| 400 #define FAST_FLOAT float | 404 #define FAST_FLOAT float |
| 401 #else | 405 #else |
| 402 #define FAST_FLOAT double | 406 #define FAST_FLOAT double |
| 403 #endif | 407 #endif |
| 404 #endif | 408 #endif |
| 405 | 409 |
| 406 #endif /* JPEG_INTERNAL_OPTIONS */ | 410 #endif /* JPEG_INTERNAL_OPTIONS */ |
| OLD | NEW |