修复:PPM图片无法正常invert的BUG

Author: funnygeeker

lib/easydisplay.mpy

@@ -635,29 +635,18 @@ def pbm(self, file, x, y, key: int = -1, show: bool = None, clear: bool = None,
             _width, _height = [int(value) for value in f.readline().split()]  # 获取图片的宽度和高度
             f_read = f.read
             if file_format == b"P4\n":  # P4 位图 二进制
-                if self._buffer == 0:  # 直接驱动
-                    buffer_size = self.BUFFER_SIZE
-                    if invert:  # New
-                        color, bg_color = bg_color, color
-                    palette = self._calculate_palette(color, bg_color)  # 计算调色板
-                    dp.set_window(x, y, x + _width - 1, y + _height - 1)  # 设置窗口
-                    data = f_read(buffer_size)
-                    write_data = dp.write_data
-                    while data:
-                        # if invert:  # Old
-                        #     data = bytes([~b & 0xFF for b in data])
-                        buffer = self._flatten_byte_data(data, palette)
-                        write_data(buffer)
-                        data = f_read(buffer_size)  # 30 * 8 = 240, 理论上 ESP8266 的内存差不多能承载这个大小的彩色图片
-                else:  # Framebuffer 模式
+                if self._buffer:  # Framebuffer 模式
                     data = bytearray(f_read())
                     if invert:
                         # data = bytearray([~b & 0xFF for b in data])  # Old
                         color, bg_color = bg_color, color  # New
                         # data = self._reverse_byte_data(data)
                     if color_type == "MONO":
                         fbuf = FrameBuffer(data, _width, _height, MONO_HLSB)
-                        dp.blit(fbuf, x, y, key)
+                        palette = FrameBuffer(bytearray(1), 2, 1, MONO_HLSB)
+                        palette.pixel(1, 0, color)
+                        palette.pixel(0, 0, bg_color)
+                        dp.blit(fbuf, x, y, key, palette)
                     elif color_type == "RGB565":
                         fbuf = FrameBuffer(data, _width, _height, MONO_HLSB)
                         palette = FrameBuffer(bytearray(2 * 2), 2, 1, RGB565)
@@ -671,6 +660,21 @@ def pbm(self, file, x, y, key: int = -1, show: bool = None, clear: bool = None,
                         except AttributeError:
                             pass
 
+                else:  # 直接驱动
+                    buffer_size = self.BUFFER_SIZE
+                    if invert:  # New
+                        color, bg_color = bg_color, color
+                    palette = self._calculate_palette(color, bg_color)  # 计算调色板
+                    dp.set_window(x, y, x + _width - 1, y + _height - 1)  # 设置窗口
+                    data = f_read(buffer_size)
+                    write_data = dp.write_data
+                    while data:
+                        # if invert:  # Old
+                        #     data = bytes([~b & 0xFF for b in data])
+                        buffer = self._flatten_byte_data(data, palette)
+                        write_data(buffer)
+                        data = f_read(buffer_size)  # 30 * 8 = 240, 理论上 ESP8266 的内存差不多能承载这个大小的彩色图片
+
             elif file_format == b"P6\n":  # P6 像素图 二进制
                 max_pixel_value = f.readline()  # 获取最大像素值
                 r_height = range(_height)