Merge to XFA: Switch most min/max macros to std::min/max.

core/src/fxcodec/lbmp/fx_bmp.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "fx_bmp.h"
+
+#include <algorithm>
+
+namespace {
+
+const size_t kBmpCoreHeaderSize = 12;
+const size_t kBmpInfoHeaderSize = 40;
+
+}  // namespace
+
 FX_DWORD _GetDWord_LSBFirst(uint8_t* p) {
   return p[0] | (p[1] << 8) | (p[2] << 16) | (p[3] << 24);
 }
 FX_WORD _GetWord_LSBFirst(uint8_t* p) {
   return p[0] | (p[1] << 8);
 }
 void _SetDWord_LSBFirst(uint8_t* p, FX_DWORD v) {
   p[0] = (uint8_t)v;
   p[1] = (uint8_t)(v >> 8);
   p[2] = (uint8_t)(v >> 16);
@@ skipping 55 matching lines @@
       _bmp_error(bmp_ptr, "Not A Bmp Image");
       return 0;
     }
     if (bmp_ptr->avail_in < sizeof(FX_DWORD)) {
       bmp_ptr->skip_size = skip_size_org;
       return 2;
     }
     bmp_ptr->img_ifh_size =
         _GetDWord_LSBFirst(bmp_ptr->next_in + bmp_ptr->skip_size);
     bmp_ptr->pal_type = 0;
-    ASSERT(sizeof(BmpCoreHeader) == 12);
-    ASSERT(sizeof(BmpInfoHeader) == 40);
+    ASSERT(sizeof(BmpCoreHeader) == kBmpCoreHeaderSize);

[Tom Sepez, 2016/01/09 00:48:12]

nit: static_assert

+    ASSERT(sizeof(BmpInfoHeader) == kBmpInfoHeaderSize);
     switch (bmp_ptr->img_ifh_size) {
-      case FX_MIN(12, sizeof(BmpCoreHeader)): {
+      case kBmpCoreHeaderSize: {
         bmp_ptr->pal_type = 1;
         BmpCoreHeaderPtr bmp_core_header_ptr = NULL;
         if (_bmp_read_data(bmp_ptr, (uint8_t**)&bmp_core_header_ptr,
                            bmp_ptr->img_ifh_size) == NULL) {
           bmp_ptr->skip_size = skip_size_org;
           return 2;
         }
         bmp_ptr->width = (FX_DWORD)_GetWord_LSBFirst(
             (uint8_t*)&bmp_core_header_ptr->bcWidth);
         bmp_ptr->height = (FX_DWORD)_GetWord_LSBFirst(
             (uint8_t*)&bmp_core_header_ptr->bcHeight);
         bmp_ptr->bitCounts =
             _GetWord_LSBFirst((uint8_t*)&bmp_core_header_ptr->bcBitCount);
         bmp_ptr->compress_flag = BMP_RGB;
         bmp_ptr->imgTB_flag = FALSE;
       } break;
-      case FX_MIN(40, sizeof(BmpInfoHeader)): {
+      case kBmpInfoHeaderSize: {
         BmpInfoHeaderPtr bmp_info_header_ptr = NULL;
         if (_bmp_read_data(bmp_ptr, (uint8_t**)&bmp_info_header_ptr,
                            bmp_ptr->img_ifh_size) == NULL) {
           bmp_ptr->skip_size = skip_size_org;
           return 2;
         }
         bmp_ptr->width =
             _GetDWord_LSBFirst((uint8_t*)&bmp_info_header_ptr->biWidth);
         bmp_ptr->height =
             _GetDWord_LSBFirst((uint8_t*)&bmp_info_header_ptr->biHeight);
         bmp_ptr->bitCounts =
             _GetWord_LSBFirst((uint8_t*)&bmp_info_header_ptr->biBitCount);
         bmp_ptr->compress_flag =
             _GetDWord_LSBFirst((uint8_t*)&bmp_info_header_ptr->biCompression);
         bmp_ptr->color_used =
             _GetDWord_LSBFirst((uint8_t*)&bmp_info_header_ptr->biClrUsed);
         bmp_ptr->dpi_x = (int32_t)_GetDWord_LSBFirst(
             (uint8_t*)&bmp_info_header_ptr->biXPelsPerMeter);
         bmp_ptr->dpi_y = (int32_t)_GetDWord_LSBFirst(
             (uint8_t*)&bmp_info_header_ptr->biYPelsPerMeter);
         if (bmp_ptr->height < 0) {
           bmp_ptr->height = -bmp_ptr->height;
           bmp_ptr->imgTB_flag = TRUE;
         }
       } break;
       default: {
-        if (bmp_ptr->img_ifh_size > FX_MIN(40, sizeof(BmpInfoHeader))) {
+        if (bmp_ptr->img_ifh_size >
+            std::min(kBmpInfoHeaderSize, sizeof(BmpInfoHeader))) {
           BmpInfoHeaderPtr bmp_info_header_ptr = NULL;
           if (_bmp_read_data(bmp_ptr, (uint8_t**)&bmp_info_header_ptr,
                              bmp_ptr->img_ifh_size) == NULL) {
             bmp_ptr->skip_size = skip_size_org;
             return 2;
           }
           FX_WORD biPlanes;
           bmp_ptr->width =
               _GetDWord_LSBFirst((uint8_t*)&bmp_info_header_ptr->biWidth);
           bmp_ptr->height =
@@ skipping 812 matching lines @@
       break;
     case BMP_RLE4:
       _bmp_encode_rle4(bmp_ptr, dst_buf, dst_size);
       break;
     default:;
   }
   bmp_ptr->file_header.bfSize = dst_size;
   WriteFileHeader(&bmp_ptr->file_header, dst_buf);
   return TRUE;
 }