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

xfa/src/fxbarcode/BC_TwoDimWriter.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 "xfa/src/fxbarcode/barcode.h"
 #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
 #include "xfa/src/fxbarcode/BC_Writer.h"
 #include "xfa/src/fxbarcode/BC_TwoDimWriter.h"
 CBC_TwoDimWriter::CBC_TwoDimWriter() {
   m_iCorrectLevel = 1;
   m_bFixedSize = TRUE;
   m_output = NULL;
 }
 CBC_TwoDimWriter::~CBC_TwoDimWriter() {
@@ skipping 68 matching lines @@
     }
     pOutBitmap = pStretchBitmap;
   }
 }
 void CBC_TwoDimWriter::RenderResult(uint8_t* code,
                                     int32_t codeWidth,
                                     int32_t codeHeight,
                                     int32_t& e) {
   int32_t inputWidth = codeWidth;
   int32_t inputHeight = codeHeight;
-  int32_t tempWidth = inputWidth + (1 << 1);
-  int32_t tempHeight = inputHeight + (1 << 1);
-  FX_FLOAT moduleHSize = (FX_FLOAT)FX_MIN(m_ModuleWidth, m_ModuleHeight);
-  if (moduleHSize > 8) {
-    moduleHSize = 8;
-  } else if (moduleHSize < 1) {
-    moduleHSize = 1;
-  }
-  int32_t outputWidth = (int32_t)FX_MAX(tempWidth * moduleHSize, tempWidth);
-  int32_t outputHeight = (int32_t)FX_MAX(tempHeight * moduleHSize, tempHeight);
+  int32_t tempWidth = inputWidth + 2;
+  int32_t tempHeight = inputHeight + 2;
+  FX_FLOAT moduleHSize = std::min(m_ModuleWidth, m_ModuleHeight);
+  moduleHSize = std::min(moduleHSize, 8.0f);
+  moduleHSize = std::max(moduleHSize, 1.0f);
+  int32_t outputWidth = static_cast<int32_t>(
+      std::max(static_cast<int32_t>(tempWidth * moduleHSize), tempWidth));

[Tom Sepez, 2016/01/09 00:35:52]

This code is troubling. moduleHSize is constrained to the [1.0..8.0], so
tempWidth * moduleHSize would always be larger, except if the value exceeds the
precision of int, in which case the cast back to int is undefined behaviour, and
certainly not an overflow check if they were intending one.

+  int32_t outputHeight = static_cast<int32_t>(
+      std::max(static_cast<int32_t>(tempHeight * moduleHSize), tempHeight));

[Tom Sepez, 2016/01/09 00:35:52]

in any event, I don't think the outer cast is required, youv'e got two int32_t
args to the min.

   int32_t multiX = 1;
   int32_t multiY = 1;
   if (m_bFixedSize) {
     if (m_Width < outputWidth || m_Height < outputHeight) {
       e = BCExceptionBitmapSizeError;
       return;
     }
   } else {
     if (m_Width > outputWidth || m_Height > outputHeight) {
       outputWidth = (int32_t)(outputWidth *
                               ceil((FX_FLOAT)m_Width / (FX_FLOAT)outputWidth));
       outputHeight = (int32_t)(
           outputHeight * ceil((FX_FLOAT)m_Height / (FX_FLOAT)outputHeight));
     }
   }
   multiX = (int32_t)ceil((FX_FLOAT)outputWidth / (FX_FLOAT)tempWidth);
   multiY = (int32_t)ceil((FX_FLOAT)outputHeight / (FX_FLOAT)tempHeight);
   if (m_bFixedSize) {
-    multiX = FX_MIN(multiX, multiY);
+    multiX = std::min(multiX, multiY);
     multiY = multiX;
   }
   int32_t leftPadding = (outputWidth - (inputWidth * multiX)) / 2;
   int32_t topPadding = (outputHeight - (inputHeight * multiY)) / 2;
   if (leftPadding < 0) {
     leftPadding = 0;
   }
   if (topPadding < 0) {
     topPadding = 0;
   }
   m_output = new CBC_CommonBitMatrix;
   m_output->Init(outputWidth, outputHeight);
   for (int32_t inputY = 0, outputY = topPadding;
        (inputY < inputHeight) && (outputY < outputHeight - multiY);
        inputY++, outputY += multiY) {
     for (int32_t inputX = 0, outputX = leftPadding;
          (inputX < inputWidth) && (outputX < outputWidth - multiX);
          inputX++, outputX += multiX) {
       if (code[inputX + inputY * inputWidth] == 1) {
         m_output->SetRegion(outputX, outputY, multiX, multiY, e);
         BC_EXCEPTION_CHECK_ReturnVoid(e);
       }
     }
   }
 }