Merge branch 'hzeller:master' into master

Author: edimarvalentin

examples-api-use/clock.cc

@@ -14,7 +14,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <unistd.h>
+#include <iostream>
 
 #include <vector>
 #include <string>
@@ -193,6 +193,6 @@ int main(int argc, char *argv[]) {
   // Finished. Shut down the RGB matrix.
   delete matrix;
 
-  write(STDOUT_FILENO, "\n", 1);  // Create a fresh new line after ^C on screen
+  std::cout << std::endl;  // Create a fresh new line after ^C on screen
   return 0;
 }

examples-api-use/demo-main.cc

@@ -267,7 +267,7 @@ class ImageScroller : public DemoRunner {
     line = ReadLine(f, header_buf, sizeof(header_buf));
     if (!line || sscanf(line, "%d ", &value) != 1 || value != 255)
       EXIT_WITH_MSG("Only 255 for maxval allowed.");
-    const size_t pixel_count = new_width * new_height;
+    const size_t pixel_count = (size_t)new_width * (size_t)new_height;
     Pixel *new_image = new Pixel [ pixel_count ];
     assert(sizeof(Pixel) == 3);   // we make that assumption.
     if (fread(new_image, sizeof(Pixel), pixel_count, f) != pixel_count) {

examples-api-use/ledcat.cc

@@ -40,7 +40,7 @@ int main(int argc, char *argv[]) {
   signal(SIGTERM, InterruptHandler);
   signal(SIGINT, InterruptHandler);
 
-  ssize_t frame_size = canvas->width() * canvas->height() * 3;
+  ssize_t frame_size = (ssize_t)canvas->width() * (ssize_t)canvas->height() * 3;
   uint8_t buf[frame_size];
 
   while (1) {

lib/framebuffer.cc

@@ -296,7 +296,7 @@ Framebuffer::Framebuffer(int rows, int columns, int parallel,
     inverse_color_(inverse_color),
     pwm_bits_(kBitPlanes), do_luminance_correct_(true), brightness_(100),
     double_rows_(rows / SUB_PANELS_),
-    buffer_size_(double_rows_ * columns_ * kBitPlanes * sizeof(gpio_bits_t)),
+    buffer_size_((size_t)double_rows_ * (size_t)columns_ * kBitPlanes * sizeof(gpio_bits_t)),
     shared_mapper_(mapper) {
   assert(hardware_mapping_ != NULL);   // Called InitHardwareMapping() ?
   assert(shared_mapper_ != NULL);  // Storage should be provided by RGBMatrix.
@@ -842,7 +842,7 @@ void Framebuffer::DumpToMatrix(GPIO *io, int pwm_low_bit) {
   const int start_bit = std::max(pwm_low_bit, kBitPlanes - pwm_bits_);
 
   const uint8_t half_double = double_rows_/2;
-  for (uint8_t row_loop = 0; row_loop < double_rows_; ++row_loop) {
+  for (int row_loop = 0; row_loop < double_rows_; ++row_loop) {
     uint8_t d_row;
     switch (scan_mode_) {
     case 0:  // progressive