From 97c4072cce04ca42070127c30786b83283ad0130 Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Thu, 5 Nov 2015 11:20:12 -0600
Subject: [PATCH] [libpng17] Clean up coding style in png_set_PLTE()

---
 pngrutil.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pngrutil.c b/pngrutil.c
index 869263753..2e443be28 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -868,10 +868,6 @@ png_handle_PLTE(png_structrp png_ptr, png_inforp info_ptr)
    }
 #endif
 
-   max_palette_length = (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ?
-      (1 << png_ptr->bit_depth) : PNG_MAX_PALETTE_LENGTH;
-
-
    if (length > 3*PNG_MAX_PALETTE_LENGTH || length % 3)
    {
       png_crc_finish(png_ptr, length);
@@ -889,8 +885,13 @@ png_handle_PLTE(png_structrp png_ptr, png_inforp info_ptr)
     * libpng versions. We silently truncate the unused extra palette entries
     * here.
     */
+   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      max_palette_length = (1 << png_ptr->bit_depth);
+   else
+      max_palette_length = PNG_MAX_PALETTE_LENGTH;
+
    if (num > max_palette_length)
-     num = max_palette_length;
+      num = max_palette_length;
 
    for (i = 0, pal_ptr = palette; i < num; i++, pal_ptr++)
    {