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

core/src/fxcodec/codec/fx_codec_png.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 <algorithm>
+
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxge/fx_dib.h"
 #include "codec_int.h"
 
 extern "C" {
 #undef FAR
 #include "third_party/lpng_v163/png.h"
 }
 
 static void _png_error_data(png_structp png_ptr, png_const_charp error_msg) {
@@ skipping 38 matching lines @@
       FXSYS_memset(pAttribute->m_strTime, 0, sizeof(pAttribute->m_strTime));
       FXSYS_snprintf((FX_CHAR*)pAttribute->m_strTime,
                      sizeof(pAttribute->m_strTime), "%4d:%2d:%2d %2d:%2d:%2d",
                      t->year, t->month, t->day, t->hour, t->minute, t->second);
       pAttribute->m_strTime[sizeof(pAttribute->m_strTime) - 1] = 0;
       bTime = 1;
     }
 #endif
 #if defined(PNG_TEXT_SUPPORTED)
     int i;
-    FX_DWORD len;
+    FX_STRSIZE len;
     const FX_CHAR* buf;
     int num_text;
     png_textp text = NULL;
     png_get_text(png_ptr, info_ptr, &text, &num_text);
     for (i = 0; i < num_text; i++) {
-      len = (FX_DWORD)FXSYS_strlen(text[i].key);
+      len = FXSYS_strlen(text[i].key);
       buf = "Time";
-      if (!FXSYS_memcmp(buf, text[i].key, FX_MIN(len, FXSYS_strlen(buf)))) {
+      if (!FXSYS_memcmp(buf, text[i].key, std::min(len, FXSYS_strlen(buf)))) {
         if (!bTime) {
           FXSYS_memset(pAttribute->m_strTime, 0, sizeof(pAttribute->m_strTime));
           FXSYS_memcpy(
               pAttribute->m_strTime, text[i].text,
-              FX_MIN(sizeof(pAttribute->m_strTime) - 1, text[i].text_length));
+              std::min(sizeof(pAttribute->m_strTime) - 1, text[i].text_length));
         }
       } else {
         buf = "Author";
-        if (!FXSYS_memcmp(buf, text[i].key, FX_MIN(len, FXSYS_strlen(buf)))) {
+        if (!FXSYS_memcmp(buf, text[i].key, std::min(len, FXSYS_strlen(buf)))) {
           pAttribute->m_strAuthor.Empty();
           pAttribute->m_strAuthor.Load((uint8_t*)text[i].text,
                                        (FX_STRSIZE)text[i].text_length);
         }
       }
     }
 #endif
   }
 }
 struct FXPNG_Context {
@@ skipping 152 matching lines @@
   if (setjmp(png_jmpbuf(p->png_ptr))) {
     if (pAttribute &&
         0 == FXSYS_strcmp(m_szLastError, "Read Header Callback Error")) {
       _png_load_bmp_attribute(p->png_ptr, p->info_ptr, pAttribute);
     }
     return FALSE;
   }
   png_process_data(p->png_ptr, p->info_ptr, (uint8_t*)src_buf, src_size);
   return TRUE;
 }