9df8f235b1
Before, when an OnDiskBitmap was a paletted bitmap type, the palette was internal to the OnDiskBitmap, and it internally performed the palette conversion itself. When using with a tilegrid, a ColorConverter() object always had to be passed. Now, an OnDiskBitmap has a "pixel_shader" property. If the bitmap is a paletted bitmap type, it is a (modifiable) Palette object. Otherwise, it is a ColorConverter() object as before. This allows palette effects to be applied to paletted OnDiskBitmaps. Code that used to say: ```python face = displayio.TileGrid(odb, pixel_shader=displayio.ColorConverter()) ``` must be updated to say: ```python face = displayio.TileGrid(odb, pixel_shader=odb.pixel_shader) ``` Compatible code for 6.x and 7.x can say ```python face = displayio.TileGrid(odb, pixel_shader=getattr(odb, 'pixel_shader', ColorConverter()) ```
57 lines
2.0 KiB
C
57 lines
2.0 KiB
C
/*
|
|
* This file is part of the Micro Python project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2018 Scott Shawcroft for Adafruit Industries
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#ifndef MICROPY_INCLUDED_SHARED_MODULE_DISPLAYIO_ONDISKBITMAP_H
|
|
#define MICROPY_INCLUDED_SHARED_MODULE_DISPLAYIO_ONDISKBITMAP_H
|
|
|
|
#include <stdbool.h>
|
|
#include <stdint.h>
|
|
|
|
#include "py/obj.h"
|
|
|
|
#include "extmod/vfs_fat.h"
|
|
|
|
typedef struct {
|
|
mp_obj_base_t base;
|
|
uint16_t width;
|
|
uint16_t height;
|
|
uint16_t data_offset;
|
|
uint16_t stride;
|
|
uint32_t r_bitmask;
|
|
uint32_t g_bitmask;
|
|
uint32_t b_bitmask;
|
|
pyb_file_obj_t *file;
|
|
union {
|
|
mp_obj_base_t *pixel_shader_base;
|
|
struct displayio_palette *palette;
|
|
struct displayio_colorconverter *colorconverter;
|
|
};
|
|
bool bitfield_compressed;
|
|
uint8_t bits_per_pixel;
|
|
} displayio_ondiskbitmap_t;
|
|
|
|
#endif // MICROPY_INCLUDED_SHARED_MODULE_DISPLAYIO_ONDISKBITMAP_H
|