Merge pull request #6 from AntonKast/master

Adafruit_WS2801.getPixelColor() suffers overflow
adafruit · Aug 13, 2012 · 2fd0b33 · 2fd0b33
2 parents 2a058b0 + d221943
commit 2fd0b33
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Adafruit_WS2801.cpp b/Adafruit_WS2801.cpp
@@ -187,7 +187,7 @@ uint32_t Adafruit_WS2801::getPixelColor(uint16_t n) {
     // types.  For compatibility with existing code, 'packed' RGB
     // values passed in or out are always 0xRRGGBB order.
     return (rgb_order == WS2801_RGB) ?
-      ((uint32_t)pixels[ofs] << 16) | (pixels[ofs + 1] <<  8) | pixels[ofs + 2] :
+      ((uint32_t)pixels[ofs] << 16) | ((uint16_t) pixels[ofs + 1] <<  8) | pixels[ofs + 2] :
       (pixels[ofs] <<  8) | ((uint32_t)pixels[ofs + 1] << 16) | pixels[ofs + 2];
   }