UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use std::min and std::max

Browse Source
This commit is contained in:
Romain Goyet
2020-04-12 15:43:39 -04:00
committed by Ecco
parent 77ee5126e1
commit 950862f8d0
79 changed files with 297 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/shared/values_controller.cpp
View File

@@ -3,12 +3,12 @@
#include <poincare/preferences.h>
#include <assert.h>
#include <limits.h>
#include <algorithm>
using namespace Poincare;
namespace Shared {
static inline int minInt(int x, int y) { return x < y ? x : y; }
static inline int absInt(int x) { return x < 0 ? -x : x; }
// Constructor and helpers
@@ -338,9 +338,9 @@ char * ValuesController::memoizedBufferForCell(int i, int j) {
}
// Compute the buffer of the new cells of the memoized table
int maxI = numberOfValuesColumns() - m_firstMemoizedColumn;
for (int ii = 0; ii < minInt(nbOfMemoizedColumns, maxI); ii++) {
for (int ii = 0; ii < std::min(nbOfMemoizedColumns, maxI); ii++) {
int maxJ = numberOfElementsInColumn(absoluteColumnForValuesColumn(ii+m_firstMemoizedColumn)) - m_firstMemoizedRow;
for (int jj = 0; jj < minInt(k_maxNumberOfDisplayableRows, maxJ); jj++) {
for (int jj = 0; jj < std::min(k_maxNumberOfDisplayableRows, maxJ); jj++) {
// Escape if already filled
if (ii >= -offsetI && ii < -offsetI + nbOfMemoizedColumns && jj >= -offsetJ && jj < -offsetJ + k_maxNumberOfDisplayableRows) {
continue;