From 72cbc6ee959c3bd4eb7ed3f0d47b585a823a8ec4 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sun, 20 Sep 2009 07:28:43 -0500 Subject: [PATCH] [devel] Expanded TAB characters in pngrtran.c --- ANNOUNCE | 1 + CHANGES | 1 + pngrtran.c | 22 +++++++++++----------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 2fb476369..8d513d3dd 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -552,6 +552,7 @@ version 1.4.0beta80 [September 17, 2009] version 1.4.0beta81 [September 20, 2009] Eliminated unused PNG_FLAG_FREE_* defines from pngpriv.h + Expanded TAB characters in pngrtran.c version 1.4.0betaN [future] Build shared libraries with -lz and sometimes -lm. diff --git a/CHANGES b/CHANGES index 58cff8c10..5e2cd3945 100644 --- a/CHANGES +++ b/CHANGES @@ -2238,6 +2238,7 @@ version 1.4.0beta80 [September 17, 2009] version 1.4.0beta81 [September 20, 2009] Eliminated unused PNG_FLAG_FREE_* defines from pngpriv.h + Expanded TAB characters in pngrtran.c version 1.4.0betaN [future] Build shared libraries with -lz and sometimes -lm. diff --git a/pngrtran.c b/pngrtran.c index 6ddaadfff..c874582c4 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,7 +1,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.4.0 [September 17, 2009] + * Last changed in libpng 1.4.0 [September 20, 2009] * 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.) @@ -1002,14 +1002,14 @@ png_init_read_transformations(png_structp png_ptr) palette[i].blue = png_ptr->gamma_table[palette[i].blue]; } } - /* Prevent the transformations being done again, and make sure - * that the now spurious alpha channel is stripped - the code - * has just reduced background composition and gamma correction - * to a simple alpha channel strip. - */ - png_ptr->transformations &= ~PNG_BACKGROUND; - png_ptr->transformations &= ~PNG_GAMMA; - png_ptr->transformations |= PNG_STRIP_ALPHA; + /* Prevent the transformations being done again, and make sure + * that the now spurious alpha channel is stripped - the code + * has just reduced background composition and gamma correction + * to a simple alpha channel strip. + */ + png_ptr->transformations &= ~PNG_BACKGROUND; + png_ptr->transformations &= ~PNG_GAMMA; + png_ptr->transformations |= PNG_STRIP_ALPHA; } /* if (png_ptr->background_gamma_type!=PNG_BACKGROUND_GAMMA_UNKNOWN) */ else @@ -1087,8 +1087,8 @@ png_init_read_transformations(png_structp png_ptr) palette[i].blue = png_ptr->gamma_table[palette[i].blue]; } - /* Done the gamma correction. */ - png_ptr->transformations &= ~PNG_GAMMA; + /* Done the gamma correction. */ + png_ptr->transformations &= ~PNG_GAMMA; } } #if defined(PNG_READ_BACKGROUND_SUPPORTED)