small fixes

Author: JosipKuci

src/graphics/Image/ImageDither.cpp

@@ -41,7 +41,7 @@ uint8_t Image::ditherGetPixelBmp(uint32_t px, int i, int j, int w, bool paletted
         px = ditherPalette[px];
 
     if (_inkplate->getDisplayMode() == INKPLATE_1BIT)
-        px = (uint16_t)px >> 1;
+      px = (uint16_t)px >> 1;
 
     uint8_t oldPixel = min((uint16_t)0xFF, (uint16_t)((uint16_t)ditherBuffer[0][i] + px));
 

src/graphics/Image/jpegHelpers/ImageJPEG.cpp

@@ -369,44 +369,48 @@ bool Image::drawJpegFromBuffer(uint8_t *buff, int32_t len, int x, int y, bool di
  * @param       int16_t invert
  *              1 if using invert, 0 if not
  */
-bool Image::drawJpegChunk(int16_t x, int16_t y, uint16_t w, uint16_t h,
-                          uint16_t *bitmap, bool dither, bool invert)
+bool Image::drawJpegChunk(int16_t x, int16_t y, uint16_t w, uint16_t h, uint16_t *bitmap, bool dither, bool invert)
 {
     if (!_imagePtrJpeg)
-        return false;
+        return 0;
 
-    // Carry global error from previous scanline
     if (dither && y != _imagePtrJpeg->lastY)
     {
         _imagePtrJpeg->ditherSwap(E_INK_WIDTH);
         _imagePtrJpeg->lastY = y;
     }
 
-    // --- Draw the JPEG MCU block ---
     for (int j = 0; j < h; ++j)
     {
         for (int i = 0; i < w; ++i)
         {
             uint32_t rgb = bitmap[j * w + i];
+            uint32_t val;
+
             uint8_t r = _RED(rgb), g = _GREEN(rgb), b = _BLUE(rgb);
-            uint32_t val = dither
-                ? _imagePtrJpeg->ditherGetPixelJpeg(RGB8BIT(r, g, b), i, j, x, y, w, h)
-                : RGB3BIT(r, g, b);
+
+            if (dither)
+            {
+                val = _imagePtrJpeg->ditherGetPixelJpeg(RGB8BIT(r, g, b), i, j, x, y, w, h);
+            }
+            else
+            {
+                val = RGB3BIT(r, g, b);
+            }
 
             if (invert)
                 val = 7 - val;
+            if (_imagePtrJpeg->_inkplate->getDisplayMode() == INKPLATE_1BIT)
+                val = (~val >> 2) & 1;
 
             _imagePtrJpeg->_inkplate->drawPixel(x + i, y + j, val);
         }
     }
 
+
     if (dither)
-    {
-        // Carry the bottom error row to the global buffer
         _imagePtrJpeg->ditherSwapBlockJpeg(x);
 
-    }
-
-    return true;
+    return 1;
 }
 #endif

src/graphics/ImageColor/jpegHelpers/ImageJPEG.cpp

@@ -380,7 +380,6 @@ bool ImageColor::drawJpegChunk(int16_t x, int16_t y, uint16_t w, uint16_t h,
     {
         _imagePtrJpeg->lastY = y;
     }
-    Serial.println("Gets to drawJPGChunk");
 
     // --- Draw the JPEG MCU block ---
     for (int j = 0; j < h; ++j)
@@ -410,14 +409,7 @@ bool ImageColor::drawJpegChunk(int16_t x, int16_t y, uint16_t w, uint16_t h,
             _imagePtrJpeg->_inkplate->drawPixel(x + i, y + j, val);
         }
     }
-    #ifndef ARDUINO_INKPLATECOLOR
-    if (dither)
-    {
-        // Carry the bottom error row to the global buffer
-        _imagePtrJpeg->ditherSwapBlockJpeg(x);
 
-    }
-    #endif
 
     return true;
 }