diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-06-28 20:26:26 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-06-28 20:28:53 -0500 |
| commit | eba11d2ba503969335c4146a38e8d6083fe6570c (patch) | |
| tree | 652abdf5fb3032e7b873d7c8ece5a3d38c6eefa3 /pngtrans.c | |
| parent | a3a724f8056248619ef304b11fcc31153b0db706 (diff) | |
| download | libpng-eba11d2ba503969335c4146a38e8d6083fe6570c.tar.gz | |
[master] Imported from libpng-1.2.38rc02.tarv1.2.38rc02
Diffstat (limited to 'pngtrans.c')
| -rw-r--r-- | pngtrans.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pngtrans.c b/pngtrans.c index f221f54f2..6e1870c59 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -2,10 +2,13 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * * Last changed in libpng 1.2.36 [May 14, 2009] - * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) + * + * This code is released under the libpng license. + * For conditions of distribution and use, see the disclaimer + * and license in png.h */ #define PNG_INTERNAL @@ -634,8 +637,8 @@ png_do_bgr(png_row_infop row_info, png_bytep row) #endif /* PNG_READ_BGR_SUPPORTED or PNG_WRITE_BGR_SUPPORTED */ #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \ - defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) || \ - defined(PNG_LEGACY_SUPPORTED) + defined(PNG_LEGACY_SUPPORTED) || \ + defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) void PNGAPI png_set_user_transform_info(png_structp png_ptr, png_voidp user_transform_ptr, int user_transform_depth, int user_transform_channels) |