Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix pointless aithmetic expressions

Browse source
This commit is contained in:
Nelson A. de Oliveira 2013-07-31 15:14:11 -03:00
parent 61699455e5
commit 1bdb389eae
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd-java/src/com/google/protobuf/DescriptorProtos.java
View file

@ -545,7 +545,7 @@ public final class DescriptorProtos {
.computeStringSizeNoTag(element); .computeStringSizeNoTag(element);
} }
size += dataSize; size += dataSize;
size += 1 * getDependencyList().size(); size += getDependencyList().size();
} }
for (com.google.protobuf.DescriptorProtos.DescriptorProto element : getMessageTypeList()) { for (com.google.protobuf.DescriptorProtos.DescriptorProto element : getMessageTypeList()) {
size += com.google.protobuf.CodedOutputStream size += com.google.protobuf.CodedOutputStream

20
OsmAnd-java/src/net/osmand/binary/OsmandOdb.java
View file

@ -1329,7 +1329,7 @@ public final class OsmandOdb {
.computeStringSizeNoTag(element); .computeStringSizeNoTag(element);
} }
size += dataSize; size += dataSize;
size += 1 * getSList().size(); size += getSList().size();
} }
size += getUnknownFields().getSerializedSize(); size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@ -1713,13 +1713,13 @@ public final class OsmandOdb {
.computeStringSizeNoTag(element); .computeStringSizeNoTag(element);
} }
size += dataSize; size += dataSize;
size += 1 * getKeyList().size(); size += getKeyList().size();
} }
{ {
int dataSize = 0; int dataSize = 0;
dataSize = 4 * getValList().size(); dataSize = 4 * getValList().size();
size += dataSize; size += dataSize;
size += 1 * getValList().size(); size += getValList().size();
} }
for (net.osmand.binary.OsmandOdb.IndexedStringTable element : getSubtablesList()) { for (net.osmand.binary.OsmandOdb.IndexedStringTable element : getSubtablesList()) {
size += com.google.protobuf.CodedOutputStream size += com.google.protobuf.CodedOutputStream
@ -4965,7 +4965,7 @@ public final class OsmandOdb {
.computeBytesSizeNoTag(element); .computeBytesSizeNoTag(element);
} }
size += dataSize; size += dataSize;
size += 1 * getPolygonInnerCoordinatesList().size(); size += getPolygonInnerCoordinatesList().size();
} }
if (hasAdditionalTypes()) { if (hasAdditionalTypes()) {
size += com.google.protobuf.CodedOutputStream size += com.google.protobuf.CodedOutputStream
@ -7393,7 +7393,7 @@ public final class OsmandOdb {
.computeInt32SizeNoTag(element); .computeInt32SizeNoTag(element);
} }
size += dataSize; size += dataSize;
size += 1 * getShiftToIndexList().size(); size += getShiftToIndexList().size();
} }
{ {
int dataSize = 0; int dataSize = 0;
@ -7402,7 +7402,7 @@ public final class OsmandOdb {
.computeInt32SizeNoTag(element); .computeInt32SizeNoTag(element);
} }
size += dataSize; size += dataSize;
size += 1 * getShiftToCityIndexList().size(); size += getShiftToCityIndexList().size();
} }
size += getUnknownFields().getSerializedSize(); size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@ -15798,7 +15798,7 @@ public final class OsmandOdb {
.computeStringSizeNoTag(element); .computeStringSizeNoTag(element);
} }
size += dataSize; size += dataSize;
size += 1 * getSubcategoriesList().size(); size += getSubcategoriesList().size();
} }
size += getUnknownFields().getSerializedSize(); size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@ -16740,7 +16740,7 @@ public final class OsmandOdb {
.computeUInt32SizeNoTag(element); .computeUInt32SizeNoTag(element);
} }
size += dataSize; size += dataSize;
size += 1 * getCategoriesList().size(); size += getCategoriesList().size();
} }
size += getUnknownFields().getSerializedSize(); size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@ -17651,7 +17651,7 @@ public final class OsmandOdb {
.computeUInt32SizeNoTag(element); .computeUInt32SizeNoTag(element);
} }
size += dataSize; size += dataSize;
size += 1 * getCategoriesList().size(); size += getCategoriesList().size();
} }
if (hasName()) { if (hasName()) {
size += com.google.protobuf.CodedOutputStream size += com.google.protobuf.CodedOutputStream
@ -18265,7 +18265,7 @@ public final class OsmandOdb {
.computeSInt64SizeNoTag(element); .computeSInt64SizeNoTag(element);
} }
size += dataSize; size += dataSize;
size += 1 * getRouteIdList().size(); size += getRouteIdList().size();
} }
size += getUnknownFields().getSerializedSize(); size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size; memoizedSerializedSize = size;

6
OsmAnd-java/src/net/osmand/util/Algorithms.java
View file

@ -162,7 +162,7 @@ public class Algorithms {
o = o << 8 | (0xff & bytes[offset + 3]); o = o << 8 | (0xff & bytes[offset + 3]);
o = o << 8 | (0xff & bytes[offset + 2]); o = o << 8 | (0xff & bytes[offset + 2]);
o = o << 8 | (0xff & bytes[offset + 1]); o = o << 8 | (0xff & bytes[offset + 1]);
o = o << 8 | (0xff & bytes[offset + 0]); o = o << 8 | (0xff & bytes[offset]);
return o; return o;
} }
@ -191,7 +191,7 @@ public class Algorithms {
int o = (0xff & bytes[offset + 3]) << 24; int o = (0xff & bytes[offset + 3]) << 24;
o |= (0xff & bytes[offset + 2]) << 16; o |= (0xff & bytes[offset + 2]) << 16;
o |= (0xff & bytes[offset + 1]) << 8; o |= (0xff & bytes[offset + 1]) << 8;
o |= (0xff & bytes[offset + 0]); o |= (0xff & bytes[offset]);
return o; return o;
} }
@ -244,7 +244,7 @@ public class Algorithms {
public static int parseSmallIntFromBytes(byte[] bytes, int offset) { public static int parseSmallIntFromBytes(byte[] bytes, int offset) {
int s = (0xff & bytes[offset + 1]) << 8; int s = (0xff & bytes[offset + 1]) << 8;
s |= (0xff & bytes[offset + 0]); s |= (0xff & bytes[offset]);
return s; return s;
} }