Changeset 564

Show
Ignore:
Timestamp:
11/10/09 09:32:59 (4 months ago)
Author:
glennrp
Message:

Detect some libpng betas that still use trans or trans_values.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • ImageMagick/trunk/coders/png.c

    r559 r564  
    9999 
    100100#if PNG_LIBPNG_VER < 10400 
    101 #define trans_color  trans_values   /* Changed at libpng-1.4.0beta35 */ 
    102 #define trans_alpha  trans          /* Changed at libpng-1.4.0beta74 */ 
     101#    define trans_color  trans_values   /* Changed at libpng-1.4.0beta35 */ 
     102#    define trans_alpha  trans          /* Changed at libpng-1.4.0beta74 */ 
     103#else 
     104   /* We could parse PNG_LIBPNG_VER_STRING here but it's too much bother.. 
     105    * Just don't use libpng-1.4.0beta32-34 or beta67-73 
     106    */ 
     107#  ifndef  PNG_USER_CHUNK_CACHE_MAX     /* Added at libpng-1.4.0beta32 */ 
     108#    define trans_color  trans_values   /* Changed at libpng-1.4.0beta35 */ 
     109#  endif 
     110#  ifndef  PNG_TRANSFORM_GRAY_TO_RGB    /* Added at libpng-1.4.0beta67 */ 
     111#    define trans_alpha  trans          /* Changed at libpng-1.4.0beta74 */ 
     112#  endif 
    103113#endif 
    104114