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

[apps] Replace sizeInBits>>2 sizeInBits/sizeof(uint32_t) in checksums

Browse Source 
Change-Id: I4f96514caa4552d2158bb9ebdc328a6453554934
This commit is contained in:
Émilie Feral
2017-08-25 14:18:27 +02:00
parent eea1928ac9
commit be8a0c6df3
8 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/graph/cartesian_function_store.cpp
View File

@@ -24,7 +24,7 @@ uint32_t CartesianFunctionStore::storeChecksum() {
for (int i = 0; i < k_maxNumberOfFunctions; i++) {
checksums[i] = m_functions[i].checksum();
}
return Ion::crc32((uint32_t *)checksums, dataLengthInBytes>>2);
return Ion::crc32((uint32_t *)checksums, dataLengthInBytes/sizeof(uint32_t));
}
CartesianFunction * CartesianFunctionStore::functionAtIndex(int i) {

2
apps/sequence/sequence.cpp
View File

@@ -89,7 +89,7 @@ uint32_t Sequence::checksum() {
data[k_dataLengthInBytes-3] = (char)m_type;
data[k_dataLengthInBytes-2] = name()!= nullptr ? name()[0] : 0;
data[k_dataLengthInBytes-1] = isActive() ? 1 : 0;
return Ion::crc32((uint32_t *)data, k_dataLengthInBytes>>2);
return Ion::crc32((uint32_t *)data, k_dataLengthInBytes/sizeof(uint32_t));
}
const char * Sequence::firstInitialConditionText() {

2
apps/sequence/sequence_store.cpp
View File

@@ -17,7 +17,7 @@ uint32_t SequenceStore::storeChecksum() {
for (int i = 0; i < k_maxNumberOfSequences; i++) {
checksums[i] = m_sequences[i].checksum();
}
return Ion::crc32((uint32_t *)checksums, dataLengthInBytes>>2);
return Ion::crc32((uint32_t *)checksums, dataLengthInBytes/sizeof(uint32_t));
}
Sequence * SequenceStore::functionAtIndex(int i) {

2
apps/shared/curve_view_range.cpp
View File

@@ -11,7 +11,7 @@ uint32_t CurveViewRange::rangeChecksum() {
float data[4] = {xMin(), xMax(), yMin(), yMax()};
size_t dataLengthInBytes = 4*sizeof(float);
assert((dataLengthInBytes & 0x3) == 0); // Assert that dataLengthInBytes is a multiple of 4
return Ion::crc32((uint32_t *)data, dataLengthInBytes>>2);
return Ion::crc32((uint32_t *)data, dataLengthInBytes/sizeof(uint32_t));
}
float CurveViewRange::yGridUnit() {

2
apps/shared/float_pair_store.cpp
View File

@@ -64,7 +64,7 @@ uint32_t FloatPairStore::storeChecksum() {
* clear the store when deleting pairs. However, this might trigger a bug? */
size_t dataLengthInBytes = m_numberOfPairs*2*sizeof(double);
assert((dataLengthInBytes & 0x3) == 0); // Assert that dataLengthInBytes is a multiple of 4
return Ion::crc32((uint32_t *)m_data, dataLengthInBytes>>2);
return Ion::crc32((uint32_t *)m_data, dataLengthInBytes/sizeof(uint32_t));
}
double FloatPairStore::defaultValue(int i) {

2
apps/shared/function.cpp
View File

@@ -31,7 +31,7 @@ uint32_t Function::checksum() {
strlcpy(data, m_text, TextField::maxBufferSize());
data[k_dataLengthInBytes-2] = m_name != nullptr ? m_name[0] : 0;
data[k_dataLengthInBytes-1] = m_active ? 1 : 0;
return Ion::crc32((uint32_t *)data, k_dataLengthInBytes>>2);
return Ion::crc32((uint32_t *)data, k_dataLengthInBytes/sizeof(uint32_t));
}
void Function::setContent(const char * c) {

2
apps/shared/interactive_curve_view_range.cpp
View File

@@ -29,7 +29,7 @@ uint32_t InteractiveCurveViewRange::rangeChecksum() {
float data[5] = {m_xMin, m_xMax, m_yMin, m_yMax, m_yAuto ? 1.0f : 0.0f};
size_t dataLengthInBytes = 5*sizeof(float);
assert((dataLengthInBytes & 0x3) == 0); // Assert that dataLengthInBytes is a multiple of 4
return Ion::crc32((uint32_t *)data, dataLengthInBytes>>2);
return Ion::crc32((uint32_t *)data, dataLengthInBytes/sizeof(uint32_t));
}
bool InteractiveCurveViewRange::yAuto() {

2
apps/statistics/store.cpp
View File

@@ -21,7 +21,7 @@ uint32_t Store::barChecksum() {
float data[2] = {m_barWidth, m_firstDrawnBarAbscissa};
size_t dataLengthInBytes = 2*sizeof(float);
assert((dataLengthInBytes & 0x3) == 0); // Assert that dataLengthInBytes is a multiple of 4
return Ion::crc32((uint32_t *)data, dataLengthInBytes>>2);
return Ion::crc32((uint32_t *)data, dataLengthInBytes/sizeof(uint32_t));
}
/* Histogram bars */