From 9517f7b6367045b298619310587307e8471808a7 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 26 Sep 2015 23:11:15 -0500 Subject: [PATCH] [libpng16] Fix bad merge of contrib/libtests/pngvalid.c --- contrib/libtests/pngvalid.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/contrib/libtests/pngvalid.c b/contrib/libtests/pngvalid.c index 814023591..35ded08fe 100644 --- a/contrib/libtests/pngvalid.c +++ b/contrib/libtests/pngvalid.c @@ -10960,13 +10960,11 @@ static const color_encoding test_encodings[] = /*red: */ { 0.716500716779386, 0.258728243040113, 0.000000000000000 }, /*green:*/ { 0.101020574397477, 0.724682314948566, 0.051211818965388 }, /*blue: */ { 0.146774385252705, 0.016589442011321, 0.773892783545073} }, -#if PNG_LIBPNG_VER >= 10700 /* Fake encoding which selects just the green channel */ /*gamma:*/ { 1.45/2.2, /* the 'Mac' gamma */ /*red: */ { 0.716500716779386, 0.000000000000000, 0.000000000000000 }, /*green:*/ { 0.101020574397477, 1.000000000000000, 0.051211818965388 }, /*blue: */ { 0.146774385252705, 0.000000000000000, 0.773892783545073} }, -#endif }; /* signal handler