AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Review fixes.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2016-09-12 18:08:05 +03:00
parent cf82761a23
commit 8b8d1bc025
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
android/jni/com/mapswithme/maps/Framework.cpp
View file

@ -41,7 +41,7 @@ using namespace storage;
using platform::CountryFile;
using platform::LocalCountryFile;
static_assert(sizeof(jint) >= 4, "Size of jint in less than 4 bytes.");
static_assert(sizeof(int) >= 4, "Size of jint in less than 4 bytes.");
namespace
{
@ -899,8 +899,8 @@ Java_com_mapswithme_maps_Framework_nativeGenerateRouteAltitudeChartBits(JNIEnv *
{
::Framework * fr = frm();
ASSERT(fr, ());
vector<uint8_t> imageRGBAData;
vector<uint8_t> imageRGBAData;
if (!fr->GenerateRouteAltitudeChart(width, height, imageRGBAData))
{
LOG(LWARNING, ("Can't generate route altitude image."));
@ -925,10 +925,12 @@ Java_com_mapswithme_maps_Framework_nativeGenerateRouteAltitudeChartBits(JNIEnv *
for (size_t i = 0; i < pxlCount; ++i)
{
size_t const shiftInBytes = i * maps::kAltitudeChartBPP;
arrayElements[i] = (static_cast<jint>(imageRGBAData[shiftInBytes + 3]) << 24) /* alpha */
| (static_cast<jint>(imageRGBAData[shiftInBytes]) << 16) /* red */
| (static_cast<jint>(imageRGBAData[shiftInBytes + 1]) << 8) /* green */
| (static_cast<jint>(imageRGBAData[shiftInBytes + 2])); /* blue */
// Type of |imageRGBAData| elements is uint8_t. But uint8_t is promoted to unsinged int in code below before shifting.
// So there's no data lost in code below.
arrayElements[i] = (imageRGBAData[shiftInBytes + 3] << 24) /* alpha */
| (imageRGBAData[shiftInBytes] << 16) /* red */
| (imageRGBAData[shiftInBytes + 1] << 8) /* green */
| (imageRGBAData[shiftInBytes + 2]); /* blue */
}
env->ReleaseIntArrayElements(imageRGBADataArray, arrayElements, 0);

2
map/framework.hpp
View file

@ -731,7 +731,7 @@ public:
/// \brief Generates 4 bytes per point image (RGBA) and put the data to |imageRGBAData|.
/// \returns If there is valid route info and the chart was generated returns true
/// and false otherwise. If the method returns true it is guaranteed that the size of
/// |imageRGBAData| is more than zero.
/// |imageRGBAData| is not zero.
/// \note If HasRouteAltitude() method returns true, GenerateRouteAltitudeChart(...)
/// could return false if route was deleted or rebuilt between the calls.
bool GenerateRouteAltitudeChart(uint32_t width, uint32_t height,