Embedded/guix
1
0
Fork 0
mirror of https://github.com/azure-rtos/guix.git synced 2025-01-14 06:43:20 +08:00
Code Issues Releases Wiki Activity

Update on 30 Jun 2023. Expand to see details.

Browse Source 
eb494b63b Fix crash after delete a font or pixelmap resource when page heap is enabled.
97c60f151 Fix jpeg decoding compile error with AC6.
854311469 Fix crash in debug mode when editing an invalid resource name.
305396e7d Fixed Studio crash caused by duplicate widget names (template and derived).
ff975d3c6 Correct IAR test script.
419e30052 Fixed font kerning flag issue.
36bef7f76 Fix crash on closing GUIX Studio project.
3f21aed14 Fix IAR test failures.
06b8bf46f Fix bug about gx_dave2d_png_draw not been declared when dave2d is disabled.
ea88cf27e Print JPEG decoding cycle count.
b7a410718 Declare and extern the system fonts as GX_CONST.
5f02a8d36 Added JPEG decoding IAR test projects.
4afce2633 Fix bug about the recent project path names being converted to lowercase.
74a1c62af Fixed Helium version JPEG decoding bug.
744c6f031 Optimize JPEG decode using Helium intrinsics.
f877b9aa1 Remove "Preview Version" tag to release GUIX Studio 6.2.1.2.
This commit is contained in:
Bo Chen 2023-06-30 02:15:18 +00:00
parent 252bda0153
commit 50ead25e38
40 changed files with 1940 additions and 1485 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/inc/gx_display.h
View File

@ -26,7 +26,7 @@
/* COMPONENT DEFINITION RELEASE */ /* COMPONENT DEFINITION RELEASE */
/* */ /* */
/* gx_display.h PORTABLE C */ /* gx_display.h PORTABLE C */
/* 6.1.10 */ /* 6.x */
/* AUTHOR */ /* AUTHOR */
/* */ /* */
/* Kenneth Maxwell, Microsoft Corporation */ /* Kenneth Maxwell, Microsoft Corporation */
@ -60,13 +60,15 @@
/* added language direction */ /* added language direction */
/* table set declarations, */ /* table set declarations, */
/* resulting in version 6.1.10 */ /* resulting in version 6.1.10 */
/* xx-xx-xxxx Ting Zhu Modified comment(s), */
/* removed unused prototypes, */
/* resulting in version 6.x */
/* */ /* */
/**************************************************************************/ /**************************************************************************/
#ifndef GX_DISPLAY_H #ifndef GX_DISPLAY_H
#define GX_DISPLAY_H #define GX_DISPLAY_H
/* Define Display management constants. */ /* Define Display management constants. */
#define GX_DISPLAY_ID ((ULONG)0x53435245) #define GX_DISPLAY_ID ((ULONG)0x53435245)
@ -283,7 +285,6 @@ VOID _gx_display_driver_565rgb_rotated_pixelmap_blend(GX_DRAW_CONTEXT *conte
VOID _gx_display_driver_565rgb_rotated_pixelmap_rotate(GX_DRAW_CONTEXT *context, INT xpos, INT ypos, GX_PIXELMAP *pixelmap, VOID _gx_display_driver_565rgb_rotated_pixelmap_rotate(GX_DRAW_CONTEXT *context, INT xpos, INT ypos, GX_PIXELMAP *pixelmap,
INT angle, INT rot_cx, INT rot_cy); INT angle, INT rot_cx, INT rot_cy);
#if defined(GX_SOFTWARE_DECODER_SUPPORT) #if defined(GX_SOFTWARE_DECODER_SUPPORT)
USHORT _gx_display_driver_565rgb_YCbCr2RGB(INT y, INT cb, INT cr);
VOID _gx_display_driver_565rgb_rotated_jpeg_draw(GX_DRAW_CONTEXT *context, INT xpos, INT ypos, GX_PIXELMAP *pixelmap); VOID _gx_display_driver_565rgb_rotated_jpeg_draw(GX_DRAW_CONTEXT *context, INT xpos, INT ypos, GX_PIXELMAP *pixelmap);
VOID _gx_display_driver_565rgb_rotated_png_draw(GX_DRAW_CONTEXT *context, INT xpos, INT ypos, GX_PIXELMAP *pixelmap); VOID _gx_display_driver_565rgb_rotated_png_draw(GX_DRAW_CONTEXT *context, INT xpos, INT ypos, GX_PIXELMAP *pixelmap);
#endif #endif
@ -301,7 +302,6 @@ VOID _gx_display_driver_24xrgb_rotated_pixel_blend(GX_DRAW_CONTEXT *context,
#if defined(GX_SOFTWARE_DECODER_SUPPORT) #if defined(GX_SOFTWARE_DECODER_SUPPORT)
UINT _gx_display_driver_24xrgb_YCbCr2RGB(INT y, INT cb, INT cr);
VOID _gx_display_driver_24xrgb_jpeg_draw(GX_DRAW_CONTEXT *context, INT xpos, INT ypos, GX_PIXELMAP *pixelmap); VOID _gx_display_driver_24xrgb_jpeg_draw(GX_DRAW_CONTEXT *context, INT xpos, INT ypos, GX_PIXELMAP *pixelmap);
VOID _gx_display_driver_24xrgb_png_draw(GX_DRAW_CONTEXT *context, INT xpos, INT ypos, GX_PIXELMAP *pixelmap); VOID _gx_display_driver_24xrgb_png_draw(GX_DRAW_CONTEXT *context, INT xpos, INT ypos, GX_PIXELMAP *pixelmap);
VOID _gx_display_driver_24xrgb_rotated_jpeg_draw(GX_DRAW_CONTEXT *context, INT xpos, INT ypos, GX_PIXELMAP *pixelmap); VOID _gx_display_driver_24xrgb_rotated_jpeg_draw(GX_DRAW_CONTEXT *context, INT xpos, INT ypos, GX_PIXELMAP *pixelmap);

152
common/inc/gx_image_reader.h
View File

@ -26,7 +26,7 @@
/* COMPONENT DEFINITION RELEASE */ /* COMPONENT DEFINITION RELEASE */
/* */ /* */
/* gx_image_reader.h PORTABLE C */ /* gx_image_reader.h PORTABLE C */
/* 6.2.0 */ /* 6.x */
/* AUTHOR */ /* AUTHOR */
/* */ /* */
/* Kenneth Maxwell, Microsoft Corporation */ /* Kenneth Maxwell, Microsoft Corporation */
@ -52,12 +52,19 @@
/* added definitions for fixed */ /* added definitions for fixed */
/* size table dimensions, */ /* size table dimensions, */
/* resulting in version 6.2.0 */ /* resulting in version 6.2.0 */
/* xx-xx-xxxx Ting Zhu Modified comment(s), added */
/* support for ARM Helium, */
/* resulting in version 6.x */
/* */ /* */
/**************************************************************************/ /**************************************************************************/
#if defined(GX_SOFTWARE_DECODER_SUPPORT) #if defined(GX_SOFTWARE_DECODER_SUPPORT)
#ifndef GX_IMAGE_READER_H #ifndef GX_IMAGE_READER_H
#define GX_IMAGE_READER_H #define GX_IMAGE_READER_H
#if defined(GX_ENABLE_ARM_HELIUM)
#include <arm_mve.h>
#endif
#define GX_IMAGE_FORMAT_1BPP 0xf0 #define GX_IMAGE_FORMAT_1BPP 0xf0
#define GX_IMAGE_FORMAT_2BPP 0xf1 #define GX_IMAGE_FORMAT_2BPP 0xf1
#define GX_IMAGE_FORMAT_4BPP 0xf2 #define GX_IMAGE_FORMAT_4BPP 0xf2
@ -83,15 +90,21 @@
GX_PNG_HUFFMAN_LIT_CODE_LEN_TABLE_SIZE + \ GX_PNG_HUFFMAN_LIT_CODE_LEN_TABLE_SIZE + \
GX_PNG_HUFFMAN_DIST_CODE_LEN_TABLE_SIZE + \ GX_PNG_HUFFMAN_DIST_CODE_LEN_TABLE_SIZE + \
GX_PNG_PALETTE_TABLE_SIZE) GX_PNG_PALETTE_TABLE_SIZE)
#define JPG_MAX_COMPONENTS 3 #define JPG_MAX_COMPONENTS 3
#define HUFF_TABLE_DIMENSION 2 #define HUFF_TABLE_DIMENSION 2
#define JPG_QUANT_TABLE_DIMENSION 4 #define JPG_QUANT_TABLE_DIMENSION 4
/* Control block used internally for jpeg reader. */ /* Control block used internally for jpeg reader. */
typedef struct GX_HUFFCODE_INFO_STRUCT
{
USHORT start;
USHORT end;
USHORT index;
GX_UBYTE bits;
} GX_HUFFCODE_INFO;
typedef struct GX_JPEG_INFO_STRUCT typedef struct GX_JPEG_INFO_STRUCT
{ {
UINT (*gx_jpeg_mcu_draw)(struct GX_JPEG_INFO_STRUCT *, INT, INT);
USHORT gx_jpeg_width; USHORT gx_jpeg_width;
USHORT gx_jpeg_height; USHORT gx_jpeg_height;
INT gx_jpeg_num_of_components; INT gx_jpeg_num_of_components;
@ -101,22 +114,35 @@ typedef struct GX_JPEG_INFO_STRUCT
GX_UBYTE gx_jpeg_dc_table_index[JPG_MAX_COMPONENTS]; GX_UBYTE gx_jpeg_dc_table_index[JPG_MAX_COMPONENTS];
GX_UBYTE gx_jpeg_ac_table_index[JPG_MAX_COMPONENTS]; GX_UBYTE gx_jpeg_ac_table_index[JPG_MAX_COMPONENTS];
INT gx_jpeg_quantization_table[JPG_QUANT_TABLE_DIMENSION][64]; INT gx_jpeg_quantization_table[JPG_QUANT_TABLE_DIMENSION][64];
INT *gx_jpeg_huffman_table[HUFF_TABLE_DIMENSION][HUFF_TABLE_DIMENSION]; GX_UBYTE *gx_jpeg_huffman_table[HUFF_TABLE_DIMENSION][HUFF_TABLE_DIMENSION];
GX_VALUE gx_jpeg_huffman_bits_count[HUFF_TABLE_DIMENSION][HUFF_TABLE_DIMENSION][16]; GX_HUFFCODE_INFO gx_jpeg_huffman_code_info[HUFF_TABLE_DIMENSION][HUFF_TABLE_DIMENSION][16];
INT gx_jpeg_restart_interval; INT gx_jpeg_restart_interval;
GX_UBYTE gx_jpeg_Y_block[256]; GX_BYTE gx_jpeg_Y_block[256];
GX_UBYTE gx_jpeg_Cr_block[64]; GX_BYTE gx_jpeg_Cr_block[64];
GX_UBYTE gx_jpeg_Cb_block[64]; GX_BYTE gx_jpeg_Cb_block[64];
INT gx_jpeg_pre_dc[JPG_MAX_COMPONENTS]; INT gx_jpeg_pre_dc[JPG_MAX_COMPONENTS];
INT gx_jpeg_vecter[64]; INT gx_jpeg_vecter[64];
GX_UBYTE *gx_jpeg_data; GX_UBYTE *gx_jpeg_data;
INT gx_jpeg_data_size; INT gx_jpeg_data_size;
INT gx_jpeg_data_index; INT gx_jpeg_data_index;
GX_UBYTE *gx_jpeg_decoded_data; UINT gx_jpeg_bit_buffer;
UINT gx_jpeg_decoded_data_size; UINT gx_jpeg_bit_count;
GX_DRAW_CONTEXT *gx_jpeg_draw_context; #if defined(GX_ENABLE_ARM_HELIUM)
INT gx_jpeg_draw_xpos; VOID (*gx_jpeg_pixel_write_helium)(struct GX_JPEG_INFO_STRUCT *jpeg_info, uint8x16_t vred, uint8x16_t vgreen, uint8x16_t vblue, INT size);
INT gx_jpeg_draw_ypos; #else
VOID (*gx_jpeg_pixel_write)(struct GX_JPEG_INFO_STRUCT *jpeg_info, GX_UBYTE red, GX_UBYTE green, GX_UBYTE blue);
#endif
GX_UBYTE *gx_jpeg_output_buffer;
USHORT gx_jpeg_output_width;
USHORT gx_jpeg_output_height;
INT gx_jpeg_output_stride;
GX_RECTANGLE gx_jpeg_output_clip;
INT gx_jpeg_output_xpos;
INT gx_jpeg_output_ypos;
GX_UBYTE gx_jpeg_output_bpp;
GX_UBYTE gx_jpeg_output_color_format;
USHORT gx_jpeg_output_rotation_angle;
GX_UBYTE *gx_jpeg_putdata;
} GX_JPEG_INFO; } GX_JPEG_INFO;
/* control block used internally for png reader */ /* control block used internally for png reader */
@ -165,11 +191,9 @@ UINT _gx_image_reader_create(GX_IMAGE_READER *image_reader,
/* Define internal function prototypes. */ /* Define internal function prototypes. */
UINT _gx_image_reader_png_decode(GX_CONST GX_UBYTE *read_data, ULONG read_data_size, GX_PIXELMAP *outmap); UINT _gx_image_reader_png_decode(GX_CONST GX_UBYTE *read_data, ULONG read_data_size, GX_PIXELMAP *outmap);
UINT _gx_image_reader_jpeg_decode(GX_CONST GX_UBYTE *read_data, ULONG data_size, GX_PIXELMAP *outmap); UINT _gx_image_reader_jpeg_decode(GX_IMAGE_READER *image_reader, GX_PIXELMAP *outmap);
UINT _gx_image_reader_jpeg_mcu_decode(GX_CONST GX_UBYTE * read_data, ULONG data_size, UINT _gx_image_reader_jpeg_mcu_decode(GX_CONST GX_UBYTE *read_data, ULONG data_size,
GX_DRAW_CONTEXT * context, INT xpos, INT ypos, GX_DRAW_CONTEXT *context, INT xpos, INT ypos);
UINT(draw_function)(GX_JPEG_INFO *, INT, INT));
UINT _gx_image_reader_pixel_read_callback_set(GX_IMAGE_READER *image_reader, GX_PIXELMAP *outmap); UINT _gx_image_reader_pixel_read_callback_set(GX_IMAGE_READER *image_reader, GX_PIXELMAP *outmap);
UINT _gx_image_reader_pixel_write_callback_set(GX_IMAGE_READER *image_reader, GX_PIXELMAP *outmap); UINT _gx_image_reader_pixel_write_callback_set(GX_IMAGE_READER *image_reader, GX_PIXELMAP *outmap);
@ -194,6 +218,90 @@ UINT _gxe_image_reader_palette_set(GX_IMAGE_READER *image_reader, GX_COLOR *pal,
UINT _gxe_image_reader_start(GX_IMAGE_READER *image_reader, GX_PIXELMAP *outmap); UINT _gxe_image_reader_start(GX_IMAGE_READER *image_reader, GX_PIXELMAP *outmap);
#endif #define GX_JPEG_DECODE_YCBCR2RGB(red, green, blue, y, cb, cr) \
#endif red = y + cr + (cr >> 2) + (cr >> 3) + 128; \
green = y - ((cb >> 2) + (cb >> 4) + (cb >> 5)) - ((cr >> 1) + (cr >> 3) + (cr >> 4) + (cr >> 5)) + 128; \
blue = y + cb + (cb >> 1) + (cb >> 2) + (cb >> 6) + 128;
#if defined(GX_ENABLE_ARM_HELIUM)
/* This offset table contains four offset vectors that used to gather load 16 cb/cr values to a 8x16 vector.
The table index represents the subsampling factor in horizontal. */
static uint8x16_t _gx_jpeg_cbcr_offset_table[7] = {
{0, 1, 2, 3, 4, 5, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0}, /* h = 1 */
{0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7}, /* h = 2 */
{0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 7}, /* h = 2 */
{0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3}, /* h = 4 */
{0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4}, /* h = 4 */
{0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4}, /* h = 4 */
{0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4}, /* h = 4 */
};
static uint8x16_t _gx_jpeg_cbcr_offset_rotated_table_cw[3] = {
{0, 8, 16, 24, 32, 40, 48, 56, 0, 0, 0, 0, 0, 0, 0, 0}, /* cw, v = 1 */
{0, 0, 8, 8, 16, 16, 24, 24, 32, 32, 40, 40, 48, 48, 56, 56}, /* cw, v = 2 */
{0, 8, 8, 16, 16, 24, 24, 32, 32, 40, 40, 48, 48, 56, 56, 56} /* cw, v = 2 */
};
static uint8x16_t _gx_jpeg_cbcr_offset_rotated_table_ccw[2] = {
{56, 48, 40, 32, 24, 16, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0}, /* ccw, v = 1 */
{56, 56, 48, 48, 40, 40, 32, 32, 24, 24, 16, 16, 8, 8, 0, 0}, /* ccw, v = 2 */
};
static uint8x16_t _gx_jpeg_y_offset_rotated_table_cw[3] = {
{0, 8, 16, 24, 32, 40, 48, 56, 64, 72, 80, 88, 96, 104, 112, 120}, /* cw, h = 1, v = 1 */
{0, 16, 32, 48, 64, 80, 96, 112, 128, 144, 160, 176, 192, 208, 224, 240}, /* cw, h = 2, v = 1 or v = 2 */
{0, 32, 64, 96, 128, 160, 192, 224, 224, 224, 224, 224, 224, 224, 224, 224} /* cw, h = 4, v = 1 */
};
static uint8x16_t _gx_jpeg_y_offset_rotated_table_ccw[4] = {
{56, 48, 40, 32, 24, 16, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0}, /* ccw, h = 1, v = 1 */
{112, 96, 80, 64, 48, 32, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0}, /* ccw, h = 2, v = 1 */
{240, 224, 208, 192, 176, 160, 144, 128, 112, 96, 80, 64, 48, 32, 16, 0}, /* ccw, h = 2, v = 2 */
{224, 192, 160, 128, 96, 64, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0} /* ccw, h = 4, v = 1 */
};
#define GX_JPEG_DECODE_YCBCR2RGB_HELIUM(vred, vgreen, vblue, y, cb, cr) \
{ \
int8x16_t vt; \
vred = (uint8x16_t)vqaddq_s8(y, cr); \
vt = vshrq_n_s8(cr, 2); \
vred = (uint8x16_t)vqaddq_s8((int8x16_t)vred, vt); \
vt = vshrq_n_s8(cr, 3); \
vred = (uint8x16_t)vqaddq_s8((int8x16_t)vred, vt); \
vred = vaddq_n_u8(vred, 128); \
\
vt = vshrq_n_s8(cb, 2); \
vgreen = (uint8x16_t)vshrq_n_s8(cb, 4); \
vgreen = (uint8x16_t)vqaddq_s8((int8x16_t)vgreen, vt); \
vt = vshrq_n_s8(cb, 5); \
vgreen = (uint8x16_t)vqaddq_s8((int8x16_t)vgreen, vt); \
vt = vshrq_n_s8(cr, 1); \
vgreen = (uint8x16_t)vqaddq_s8((int8x16_t)vgreen, vt); \
vt = vshrq_n_s8(cr, 3); \
vgreen = (uint8x16_t)vqaddq_s8((int8x16_t)vgreen, vt); \
vt = vshrq_n_s8(cr, 4); \
vgreen = (uint8x16_t)vqaddq_s8((int8x16_t)vgreen, vt); \
vt = vshrq_n_s8(cr, 5); \
vgreen = (uint8x16_t)vqaddq_s8((int8x16_t)vgreen, vt); \
vgreen = (uint8x16_t)vqsubq_s8(y, (int8x16_t)vgreen); \
vgreen = vaddq_n_u8(vgreen, 128); \
\
vblue = (uint8x16_t)vqaddq_s8(y, cb); \
vt = vshrq_n_s8(cb, 1); \
vblue = (uint8x16_t)vqaddq_s8((int8x16_t)vblue, vt); \
vt = vshrq_n_s8(cb, 2); \
vblue = (uint8x16_t)vqaddq_s8((int8x16_t)vblue, vt); \
vt = vshrq_n_s8(cb, 6); \
vblue = (uint8x16_t)vqaddq_s8((int8x16_t)vblue, vt); \
vblue = vaddq_n_u8(vblue, 128); \
}
#endif /* GX_ENABLE_ARM_HELIUM */
#endif /* GX_IMAGE_READER_H */
#endif /* GX_SOFTWARE_DECODER_SUPPORT */

10
common/inc/gx_user_sample.h
View File

@ -24,7 +24,7 @@
/* APPLICATION INTERFACE DEFINITION RELEASE */ /* APPLICATION INTERFACE DEFINITION RELEASE */
/* */ /* */
/* gx_user.h PORTABLE C */ /* gx_user.h PORTABLE C */
/* 6.1.10 */ /* 6.x */
/* AUTHOR */ /* AUTHOR */
/* */ /* */
/* Kenneth Maxwell, Microsoft Corporation */ /* Kenneth Maxwell, Microsoft Corporation */
@ -45,6 +45,10 @@
/* 01-31-2022 Kenneth Maxwell Modified comment(s), */ /* 01-31-2022 Kenneth Maxwell Modified comment(s), */
/* fixed typo, */ /* fixed typo, */
/* resulting in version 6.1.10 */ /* resulting in version 6.1.10 */
/* xx-xx-xxxx Ting Zhu Modified comment(s), */
/* added GX_ENABLE_ARM_HELIUM */
/* definition, */
/* resulting in version 6.x */
/* */ /* */
/**************************************************************************/ /**************************************************************************/
@ -68,5 +72,9 @@
/* This can be defined to insert an application specific data /* This can be defined to insert an application specific data
field into the GX_WIDGET control block */ field into the GX_WIDGET control block */
/* #define GX_WIDGET_USER_DATA */ /* #define GX_WIDGET_USER_DATA */
/* This can be defined to enable the use of ARM Helium intrinsics for
JPEG decoding. */
/* #define GX_ENABLE_ARM_HELIUM */
#endif #endif

181
common/src/gx_display_driver_1555xrgb_jpeg_draw.c
View File

@ -25,185 +25,15 @@
/* Include necessary system files. */ /* Include necessary system files. */
#include "gx_api.h" #include "gx_api.h"
#include "gx_context.h"
#include "gx_system.h"
#include "gx_image_reader.h"
#include "gx_display.h" #include "gx_display.h"
#include "gx_image_reader.h"
#define RANGE_1555XRGB_PIXEL(val) if (val > 255) \
{ \
val = 31; \
} \
else if (val < 0) \
{ \
val = 0; \
} \
else \
{ \
val >>= 3; \
}
/**************************************************************************/
/* */
/* FUNCTION RELEASE */
/* */
/* _gx_display_driver_1555xrgb_YCbCr2RGB PORTABLE C */
/* 6.1 */
/* AUTHOR */
/* */
/* Kenneth Maxwell, Microsoft Corporation */
/* */
/* DESCRIPTION */
/* */
/* Converts YCbCr value to 1555XRGB color space. */
/* */
/* INPUT */
/* */
/* y Luminance */
/* cb Chroma (Blue-difference) */
/* cr Chroma (Red-difference) */
/* */
/* OUTPUT */
/* */
/* Value 1555 XRGB value */
/* */
/* CALLS */
/* */
/* None */
/* */
/* CALLED BY */
/* */
/* _gx_display_driver_1555xrgb_one_mcu_draw */
/* */
/* RELEASE HISTORY */
/* */
/* DATE NAME DESCRIPTION */
/* */
/* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */
/* 09-30-2020 Kenneth Maxwell Modified comment(s), */
/* resulting in version 6.1 */
/* */
/**************************************************************************/
#if defined(GX_SOFTWARE_DECODER_SUPPORT)
static USHORT _gx_display_driver_1555xrgb_YCbCr2RGB(INT y, INT cb, INT cr)
{
INT red;
INT green;
INT blue;
cb = cb - 128;
cr = cr - 128;
red = y + cr + (cr >> 2) + (cr >> 3);
green = y - ((cb >> 2) + (cb >> 4) + (cb >> 5)) - ((cr >> 1) + (cr >> 3) + (cr >> 4) + (cr >> 6));
blue = y + cb + (cb >> 1) + (cb >> 2);
/* Make sure the range of the RGB values are within bound. */
RANGE_1555XRGB_PIXEL(red)
RANGE_1555XRGB_PIXEL(green)
RANGE_1555XRGB_PIXEL(blue)
return (USHORT)((red << 10) | (green << 5 | blue));
}
#endif
/**************************************************************************/
/* */
/* FUNCTION RELEASE */
/* */
/* _gx_display_driver_1555xrgb_mcu_draw PORTABLE C */
/* 6.1 */
/* AUTHOR */
/* */
/* Kenneth Maxwell, Microsoft Corporation */
/* */
/* DESCRIPTION */
/* */
/* Internal helper function to draw one MCU of decoded JPEG data. */
/* */
/* INPUT */
/* */
/* context GUIX draw context */
/* xpos X position to draw */
/* ypos y position to draw */
/* jpeg_info JPEG control block */
/* */
/* OUTPUT */
/* */
/* Status Code */
/* */
/* CALLS */
/* */
/* _gx_display_driver_565rgb_YCbCr2RGB */
/* */
/* CALLED BY */
/* */
/* _gx_display_driver_jpeg_decode */
/* */
/* RELEASE HISTORY */
/* */
/* DATE NAME DESCRIPTION */
/* */
/* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */
/* 09-30-2020 Kenneth Maxwell Modified comment(s), */
/* resulting in version 6.1 */
/* */
/**************************************************************************/
#if defined(GX_SOFTWARE_DECODER_SUPPORT)
static UINT _gx_display_driver_1555xrgb_mcu_draw(GX_JPEG_INFO *jpeg_info, INT xpos, INT ypos)
{
USHORT *put;
INT x;
INT y;
INT w;
INT h;
INT coff;
GX_UBYTE Y;
GX_UBYTE Cb;
GX_UBYTE Cr;
GX_DRAW_CONTEXT *context = jpeg_info -> gx_jpeg_draw_context;
GX_RECTANGLE *clip = context -> gx_draw_context_clip;
h = (jpeg_info -> gx_jpeg_sample_factor[0] >> 4);
w = (jpeg_info -> gx_jpeg_sample_factor[0] & 0x0f);
put = (USHORT *)context -> gx_draw_context_memory;
put += ypos * context -> gx_draw_context_pitch;
put += xpos;
for (y = 0; y < 8 * w; y++)
{
for (x = 0; x < 8 * h; x++)
{
if ((xpos + x >= clip -> gx_rectangle_left) && (xpos + x <= clip -> gx_rectangle_right) &&
(ypos + y >= clip -> gx_rectangle_top) && (ypos + y <= clip -> gx_rectangle_bottom))
{
coff = x / w + ((y / h) << 3);
Y = jpeg_info -> gx_jpeg_Y_block[x + y * w * 8];
Cb = jpeg_info -> gx_jpeg_Cb_block[coff];
Cr = jpeg_info -> gx_jpeg_Cr_block[coff];
put[x] = _gx_display_driver_1555xrgb_YCbCr2RGB(Y, Cb, Cr);
}
}
put += context -> gx_draw_context_pitch;
}
return GX_SUCCESS;
}
#endif
/**************************************************************************/ /**************************************************************************/
/* */ /* */
/* FUNCTION RELEASE */ /* FUNCTION RELEASE */
/* */ /* */
/* _gx_dislay_driver_565rgb_jpeg_draw PORTABLE C */ /* _gx_dislay_driver_565rgb_jpeg_draw PORTABLE C */
/* 6.1 */ /* 6.x */
/* AUTHOR */ /* AUTHOR */
/* */ /* */
/* Kenneth Maxwell, Microsoft Corporation */ /* Kenneth Maxwell, Microsoft Corporation */
@ -240,6 +70,10 @@ GX_RECTANGLE *clip = context -> gx_draw_context_clip;
/* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */ /* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */
/* 09-30-2020 Kenneth Maxwell Modified comment(s), */ /* 09-30-2020 Kenneth Maxwell Modified comment(s), */
/* resulting in version 6.1 */ /* resulting in version 6.1 */
/* xx-xx-xxxx Ting Zhu Modified comment(s), */
/* removed a parameter from */
/* jpeg mcu decode function, */
/* resulting in version 6.x */
/* */ /* */
/**************************************************************************/ /**************************************************************************/
#if defined(GX_SOFTWARE_DECODER_SUPPORT) #if defined(GX_SOFTWARE_DECODER_SUPPORT)
@ -248,8 +82,7 @@ VOID _gx_display_driver_1555xrgb_jpeg_draw(GX_DRAW_CONTEXT *context, INT xpos, I
_gx_image_reader_jpeg_mcu_decode(pixelmap -> gx_pixelmap_data, _gx_image_reader_jpeg_mcu_decode(pixelmap -> gx_pixelmap_data,
pixelmap -> gx_pixelmap_data_size, pixelmap -> gx_pixelmap_data_size,
context, xpos, ypos, context, xpos, ypos);
_gx_display_driver_1555xrgb_mcu_draw);
} }
#endif #endif

196
common/src/gx_display_driver_24xrgb_jpeg_draw.c
View File

@ -25,200 +25,15 @@
/* Include necessary system files. */ /* Include necessary system files. */
#include "gx_api.h" #include "gx_api.h"
#include "gx_context.h"
#include "gx_system.h"
#include "gx_image_reader.h"
#include "gx_display.h" #include "gx_display.h"
#include "gx_image_reader.h"
/**************************************************************************/
/* */
/* FUNCTION RELEASE */
/* */
/* _gx_display_driver_24xrgb_YCbCr2RGB PORTABLE C */
/* 6.1.4 */
/* AUTHOR */
/* */
/* Kenneth Maxwell, Microsoft Corporation */
/* */
/* DESCRIPTION */
/* */
/* Converts YCbCr value to 888RGB color space. */
/* */
/* INPUT */
/* */
/* y Luminance */
/* cb Chroma (Blue-difference) */
/* cr Chroma (Red-difference) */
/* */
/* OUTPUT */
/* */
/* Value 888 RGB value */
/* */
/* CALLS */
/* */
/* None */
/* */
/* CALLED BY */
/* */
/* _gx_display_driver_24xrgb_one_mcu_draw */
/* */
/* RELEASE HISTORY */
/* */
/* DATE NAME DESCRIPTION */
/* */
/* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */
/* 09-30-2020 Kenneth Maxwell Modified comment(s), */
/* resulting in version 6.1 */
/* 02-02-2021 Kenneth Maxwell Modified comment(s), */
/* made function public, */
/* resulting in version 6.1.4 */
/* */
/**************************************************************************/
#if defined(GX_SOFTWARE_DECODER_SUPPORT)
UINT _gx_display_driver_24xrgb_YCbCr2RGB(INT y, INT cb, INT cr)
{
INT red;
INT green;
INT blue;
cb -= 128;
cr -= 128;
red = y + cr + (cr >> 2) + (cr >> 3);
green = y - ((cb >> 2) + (cb >> 4) + (cb >> 5)) - ((cr >> 1) + (cr >> 3) + (cr >> 4) + (cr >> 6));
blue = y + cb + (cb >> 1) + (cb >> 2);
/* Make sure the range of the RGB values are within bound. */
if (red > 255)
{
red = 255;
}
else if (red < 0)
{
red = 0;
}
if (green > 255)
{
green = 255;
}
else if (green < 0)
{
green = 0;
}
if (blue > 255)
{
blue = 255;
}
else if (blue < 0)
{
blue = 0;
}
return (UINT)(((red << 16) | (green << 8) | blue));
}
#endif
/**************************************************************************/
/* */
/* FUNCTION RELEASE */
/* */
/* _gx_display_driver_24xrgb_mcu_draw PORTABLE C */
/* 6.1 */
/* AUTHOR */
/* */
/* Kenneth Maxwell, Microsoft Corporation */
/* */
/* DESCRIPTION */
/* */
/* Internal helper function to draw one MCU of decoded JPEG data. */
/* */
/* INPUT */
/* */
/* context GUIX draw context */
/* xpos X position to draw */
/* ypos y position to draw */
/* jpeg_info JPEG control block */
/* */
/* OUTPUT */
/* */
/* Status Code */
/* */
/* CALLS */
/* */
/* _gx_display_driver_24xrgb_YCbCr2RGB */
/* */
/* CALLED BY */
/* */
/* _gx_display_driver_24xrgb_jpeg_decode */
/* */
/* RELEASE HISTORY */
/* */
/* DATE NAME DESCRIPTION */
/* */
/* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */
/* 09-30-2020 Kenneth Maxwell Modified comment(s), */
/* resulting in version 6.1 */
/* */
/**************************************************************************/
#if defined(GX_SOFTWARE_DECODER_SUPPORT)
static UINT _gx_display_driver_24xrgb_mcu_draw(GX_JPEG_INFO *jpeg_info, INT xpos, INT ypos)
{
GX_COLOR *put;
INT x;
INT y;
INT w;
INT h;
INT coff;
INT Y;
INT Cb;
INT Cr;
GX_DRAW_CONTEXT *context = jpeg_info -> gx_jpeg_draw_context;
GX_RECTANGLE *clip = context -> gx_draw_context_clip;
h = (jpeg_info -> gx_jpeg_sample_factor[0] >> 4);
w = (jpeg_info -> gx_jpeg_sample_factor[0] & 0x0f);
put = context -> gx_draw_context_memory;
put += ypos * context -> gx_draw_context_pitch;
put += xpos;
for (y = 0; y < 8 * w; y++)
{
for (x = 0; x < 8 * h; x++)
{
if ((xpos + x >= clip -> gx_rectangle_left) && (xpos + x <= clip -> gx_rectangle_right) &&
(ypos + y >= clip -> gx_rectangle_top) && (ypos + y <= clip -> gx_rectangle_bottom))
{
coff = x / w + ((y / h) << 3);
Y = jpeg_info -> gx_jpeg_Y_block[x + y * w * 8];
Cb = jpeg_info -> gx_jpeg_Cb_block[coff];
Cr = jpeg_info -> gx_jpeg_Cr_block[coff];
put[x] = _gx_display_driver_24xrgb_YCbCr2RGB(Y, Cb, Cr);
}
}
put += context -> gx_draw_context_pitch;
}
return GX_SUCCESS;
}
#endif
/**************************************************************************/ /**************************************************************************/
/* */ /* */
/* FUNCTION RELEASE */ /* FUNCTION RELEASE */
/* */ /* */
/* _gx_dislay_driver_24xrgb_jpeg_draw PORTABLE C */ /* _gx_dislay_driver_24xrgb_jpeg_draw PORTABLE C */
/* 6.1 */ /* 6.x */
/* AUTHOR */ /* AUTHOR */
/* */ /* */
/* Kenneth Maxwell, Microsoft Corporation */ /* Kenneth Maxwell, Microsoft Corporation */
@ -255,6 +70,10 @@ GX_RECTANGLE *clip = context -> gx_draw_context_clip;
/* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */ /* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */
/* 09-30-2020 Kenneth Maxwell Modified comment(s), */ /* 09-30-2020 Kenneth Maxwell Modified comment(s), */
/* resulting in version 6.1 */ /* resulting in version 6.1 */
/* xx-xx-xxxx Ting Zhu Modified comment(s), */
/* removed a parameter from */
/* jpeg mcu decode function, */
/* resulting in version 6.x */
/* */ /* */
/**************************************************************************/ /**************************************************************************/
#if defined(GX_SOFTWARE_DECODER_SUPPORT) #if defined(GX_SOFTWARE_DECODER_SUPPORT)
@ -263,8 +82,7 @@ VOID _gx_display_driver_24xrgb_jpeg_draw(GX_DRAW_CONTEXT *context, INT xpos, INT
_gx_image_reader_jpeg_mcu_decode(pixelmap -> gx_pixelmap_data, _gx_image_reader_jpeg_mcu_decode(pixelmap -> gx_pixelmap_data,
pixelmap -> gx_pixelmap_data_size, pixelmap -> gx_pixelmap_data_size,
context, xpos, ypos, context, xpos, ypos);
_gx_display_driver_24xrgb_mcu_draw);
} }
#endif #endif

116
common/src/gx_display_driver_24xrgb_rotated_jpeg_draw.c
View File

@ -30,118 +30,12 @@
#include "gx_image_reader.h" #include "gx_image_reader.h"
#include "gx_display.h" #include "gx_display.h"
/**************************************************************************/
/* */
/* FUNCTION RELEASE */
/* */
/* _gx_display_driver_24xrgb_rotated_mcu_draw PORTABLE C */
/* 6.1.4 */
/* AUTHOR */
/* */
/* Kenneth Maxwell, Microsoft Corporation */
/* */
/* DESCRIPTION */
/* */
/* Internal helper function to draw one MCU of decoded JPEG data to */
/* rotated canvas. */
/* */
/* INPUT */
/* */
/* context GUIX draw context */
/* xpos X position to draw */
/* ypos y position to draw */
/* jpeg_info JPEG control block */
/* */
/* OUTPUT */
/* */
/* Status Code */
/* */
/* CALLS */
/* */
/* _gx_display_driver_24xrgb_YCbCr2RGB */
/* */
/* CALLED BY */
/* */
/* _gx_display_driver_24xrgb_rotated_jpeg_decode */
/* */
/* RELEASE HISTORY */
/* */
/* DATE NAME DESCRIPTION */
/* */
/* 02-02-2021 Kenneth Maxwell Initial Version 6.1.4 */
/* */
/**************************************************************************/
#if defined(GX_SOFTWARE_DECODER_SUPPORT)
static UINT _gx_display_driver_24xrgb_rotated_mcu_draw(GX_JPEG_INFO *jpeg_info, INT xpos, INT ypos)
{
GX_COLOR *put;
INT x;
INT y;
INT w;
INT h;
INT coff;
INT Y;
INT Cb;
INT Cr;
GX_DRAW_CONTEXT *context = jpeg_info -> gx_jpeg_draw_context;
GX_RECTANGLE *clip = context -> gx_draw_context_clip;
INT rotated_xpos;
INT rotated_ypos;
INT sign;
h = (jpeg_info -> gx_jpeg_sample_factor[0] >> 4);
w = (jpeg_info -> gx_jpeg_sample_factor[0] & 0x0f);
if (context -> gx_draw_context_display -> gx_display_rotation_angle == GX_SCREEN_ROTATION_CW)
{
rotated_xpos = ypos;
rotated_ypos = context -> gx_draw_context_canvas -> gx_canvas_x_resolution - xpos - 1;
sign = 1;
}
else
{
rotated_xpos = context -> gx_draw_context_canvas -> gx_canvas_y_resolution - ypos - 1;
rotated_ypos = xpos;
sign = -1;
}
put = context -> gx_draw_context_memory;
put += rotated_ypos * context -> gx_draw_context_pitch;
put += rotated_xpos;
for (x = 0; x < 8 * w; x++)
{
for (y = 0; y < 8 * h; y++)
{
if ((xpos + x >= clip -> gx_rectangle_left) && (xpos + x <= clip -> gx_rectangle_right) &&
(ypos + y >= clip -> gx_rectangle_top) && (ypos + y <= clip -> gx_rectangle_bottom))
{
coff = x / w + ((y / h) << 3);
Y = jpeg_info -> gx_jpeg_Y_block[x + y * w * 8];
Cb = jpeg_info -> gx_jpeg_Cb_block[coff];
Cr = jpeg_info -> gx_jpeg_Cr_block[coff];
*(put + y * sign) = (_gx_display_driver_24xrgb_YCbCr2RGB(Y, Cb, Cr) | 0xff000000);
}
}
put -= context -> gx_draw_context_pitch * sign;
}
return GX_SUCCESS;
}
#endif
/**************************************************************************/ /**************************************************************************/
/* */ /* */
/* FUNCTION RELEASE */ /* FUNCTION RELEASE */
/* */ /* */
/* _gx_dislay_driver_24xrgb_rotated_jpeg_draw PORTABLE C */ /* _gx_dislay_driver_24xrgb_rotated_jpeg_draw PORTABLE C */
/* 6.1.4 */ /* 6.x */
/* AUTHOR */ /* AUTHOR */
/* */ /* */
/* Kenneth Maxwell, Microsoft Corporation */ /* Kenneth Maxwell, Microsoft Corporation */
@ -176,16 +70,18 @@ INT sign;
/* DATE NAME DESCRIPTION */ /* DATE NAME DESCRIPTION */
/* */ /* */
/* 02-02-2021 Kenneth Maxwell Initial Version 6.1.4 */ /* 02-02-2021 Kenneth Maxwell Initial Version 6.1.4 */
/* xx-xx-xxxx Ting Zhu Modified comment(s), */
/* removed a parameter from */
/* jpeg mcu decode function, */
/* resulting in version 6.x */
/* */ /* */
/**************************************************************************/ /**************************************************************************/
#if defined(GX_SOFTWARE_DECODER_SUPPORT) #if defined(GX_SOFTWARE_DECODER_SUPPORT)
VOID _gx_display_driver_24xrgb_rotated_jpeg_draw(GX_DRAW_CONTEXT *context, INT xpos, INT ypos, GX_PIXELMAP *pixelmap) VOID _gx_display_driver_24xrgb_rotated_jpeg_draw(GX_DRAW_CONTEXT *context, INT xpos, INT ypos, GX_PIXELMAP *pixelmap)
{ {
_gx_image_reader_jpeg_mcu_decode(pixelmap -> gx_pixelmap_data, _gx_image_reader_jpeg_mcu_decode(pixelmap -> gx_pixelmap_data,
pixelmap -> gx_pixelmap_data_size, pixelmap -> gx_pixelmap_data_size,
context, xpos, ypos, context, xpos, ypos);
_gx_display_driver_24xrgb_rotated_mcu_draw);
} }
#endif #endif

202
common/src/gx_display_driver_565rgb_jpeg_draw.c
View File

@ -30,205 +30,12 @@
#include "gx_image_reader.h" #include "gx_image_reader.h"
#include "gx_display.h" #include "gx_display.h"
/**************************************************************************/
/* */
/* FUNCTION RELEASE */
/* */
/* _gx_display_driver_565rgb_YCbCr2RGB PORTABLE C */
/* 6.1.3 */
/* AUTHOR */
/* */
/* Kenneth Maxwell, Microsoft Corporation */
/* */
/* DESCRIPTION */
/* */
/* Converts YCbCr value to 565RGB color space. */
/* */
/* INPUT */
/* */
/* y Luminance */
/* cb Chroma (Blue-difference) */
/* cr Chroma (Red-difference) */
/* */
/* OUTPUT */
/* */
/* Value 565 RGB value */
/* */
/* CALLS */
/* */
/* None */
/* */
/* CALLED BY */
/* */
/* _gx_display_driver_565rgb_one_mcu_draw */
/* */
/* RELEASE HISTORY */
/* */
/* DATE NAME DESCRIPTION */
/* */
/* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */
/* 09-30-2020 Kenneth Maxwell Modified comment(s), */
/* resulting in version 6.1 */
/* 12-31-2020 Kenneth Maxwell Modified comment(s), */
/* made function public, */
/* resulting in version 6.1.3 */
/* */
/**************************************************************************/
#if defined(GX_SOFTWARE_DECODER_SUPPORT)
USHORT _gx_display_driver_565rgb_YCbCr2RGB(INT y, INT cb, INT cr)
{
INT red;
INT green;
INT blue;
cb = cb - 128;
cr = cr - 128;
red = y + cr + (cr >> 2) + (cr >> 3);
green = y - ((cb >> 2) + (cb >> 4) + (cb >> 5)) - ((cr >> 1) + (cr >> 3) + (cr >> 4) + (cr >> 6));
blue = y + cb + (cb >> 1) + (cb >> 2);
/* Make sure the range of the RGB values are within bound. */
if (red > 255)
{
red = 31;
}
else if (red < 0)
{
red = 0;
}
else
{
red = red >> 3;
}
if (green > 255)
{
green = 63;
}
else if (green < 0)
{
green = 0;
}
else
{
green = green >> 2;
}
if (blue > 255)
{
blue = 31;
}
else if (blue < 0)
{
blue = 0;
}
else
{
blue = blue >> 3;
}
return (USHORT)((red << 11) | (green << 5 | blue));
}
#endif
/**************************************************************************/
/* */
/* FUNCTION RELEASE */
/* */
/* _gx_display_driver_jpeg_16bpp_mcu_draw PORTABLE C */
/* 6.1 */
/* AUTHOR */
/* */
/* Kenneth Maxwell, Microsoft Corporation */
/* */
/* DESCRIPTION */
/* */
/* Internal helper function to draw one MCU of decoded JPEG data. */
/* */
/* INPUT */
/* */
/* context GUIX draw context */
/* xpos X position to draw */
/* ypos y position to draw */
/* jpeg_info JPEG control block */
/* */
/* OUTPUT */
/* */
/* Status Code */
/* */
/* CALLS */
/* */
/* _gx_display_driver_565rgb_YCbCr2RGB */
/* */
/* CALLED BY */
/* */
/* _gx_display_driver_jpeg_decode */
/* */
/* RELEASE HISTORY */
/* */
/* DATE NAME DESCRIPTION */
/* */
/* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */
/* 09-30-2020 Kenneth Maxwell Modified comment(s), */
/* resulting in version 6.1 */
/* */
/**************************************************************************/
#if defined(GX_SOFTWARE_DECODER_SUPPORT)
static UINT _gx_display_driver_565rgb_mcu_draw(GX_JPEG_INFO *jpeg_info, INT xpos, INT ypos)
{
USHORT *put;
INT x;
INT y;
INT w;
INT h;
INT coff;
INT Y;
INT Cb;
INT Cr;
GX_DRAW_CONTEXT *context = jpeg_info -> gx_jpeg_draw_context;
GX_RECTANGLE *clip = context -> gx_draw_context_clip;
h = (jpeg_info -> gx_jpeg_sample_factor[0] >> 4);
w = (jpeg_info -> gx_jpeg_sample_factor[0] & 0x0f);
put = (USHORT *)context -> gx_draw_context_memory;
put += ypos * context -> gx_draw_context_pitch;
put += xpos;
for (y = 0; y < 8 * w; y++)
{
for (x = 0; x < 8 * h; x++)
{
if ((xpos + x >= clip -> gx_rectangle_left) && (xpos + x <= clip -> gx_rectangle_right) &&
(ypos + y >= clip -> gx_rectangle_top) && (ypos + y <= clip -> gx_rectangle_bottom))
{
coff = x / w + ((y / h) << 3);
Y = jpeg_info -> gx_jpeg_Y_block[x + y * w * 8];
Cb = jpeg_info -> gx_jpeg_Cb_block[coff];
Cr = jpeg_info -> gx_jpeg_Cr_block[coff];
put[x] = _gx_display_driver_565rgb_YCbCr2RGB(Y, Cb, Cr);
}
}
put += context -> gx_draw_context_pitch;
}
return GX_SUCCESS;
}
#endif
/**************************************************************************/ /**************************************************************************/
/* */ /* */
/* FUNCTION RELEASE */ /* FUNCTION RELEASE */
/* */ /* */
/* _gx_dislay_driver_565rgb_jpeg_draw PORTABLE C */ /* _gx_dislay_driver_565rgb_jpeg_draw PORTABLE C */
/* 6.1 */ /* 6.x */
/* AUTHOR */ /* AUTHOR */
/* */ /* */
/* Kenneth Maxwell, Microsoft Corporation */ /* Kenneth Maxwell, Microsoft Corporation */
@ -265,6 +72,10 @@ GX_RECTANGLE *clip = context -> gx_draw_context_clip;
/* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */ /* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */
/* 09-30-2020 Kenneth Maxwell Modified comment(s), */ /* 09-30-2020 Kenneth Maxwell Modified comment(s), */
/* resulting in version 6.1 */ /* resulting in version 6.1 */
/* xx-xx-xxxx Ting Zhu Modified comment(s), */
/* removed a parameter from */
/* jpeg mcu decode function, */
/* resulting in version 6.x */
/* */ /* */
/**************************************************************************/ /**************************************************************************/
#if defined(GX_SOFTWARE_DECODER_SUPPORT) #if defined(GX_SOFTWARE_DECODER_SUPPORT)
@ -273,8 +84,7 @@ VOID _gx_display_driver_565rgb_jpeg_draw(GX_DRAW_CONTEXT *context, INT xpos, INT
_gx_image_reader_jpeg_mcu_decode(pixelmap -> gx_pixelmap_data, _gx_image_reader_jpeg_mcu_decode(pixelmap -> gx_pixelmap_data,
pixelmap -> gx_pixelmap_data_size, pixelmap -> gx_pixelmap_data_size,
context, xpos, ypos, context, xpos, ypos);
_gx_display_driver_565rgb_mcu_draw);
} }
#endif #endif

114
common/src/gx_display_driver_565rgb_rotated_jpeg_draw.c
View File

@ -30,116 +30,12 @@
#include "gx_image_reader.h" #include "gx_image_reader.h"
#include "gx_display.h" #include "gx_display.h"
/**************************************************************************/
/* */
/* FUNCTION RELEASE */
/* */
/* _gx_display_driver_jpeg_16bpp_rotated_mcu_draw PORTABLE C */
/* 6.1.3 */
/* AUTHOR */
/* */
/* Kenneth Maxwell, Microsoft Corporation */
/* */
/* DESCRIPTION */
/* */
/* Internal helper function to draw one MCU of decoded JPEG data. */
/* */
/* INPUT */
/* */
/* context GUIX draw context */
/* xpos X position to draw */
/* ypos y position to draw */
/* jpeg_info JPEG control block */
/* */
/* OUTPUT */
/* */
/* Status Code */
/* */
/* CALLS */
/* */
/* _gx_display_driver_565rgb_YCbCr2RGB */
/* */
/* CALLED BY */
/* */
/* _gx_display_driver_jpeg_decode */
/* */
/* RELEASE HISTORY */
/* */
/* DATE NAME DESCRIPTION */
/* */
/* 12-31-2020 Kenneth Maxwell Initial Version 6.1.3 */
/* */
/**************************************************************************/
#if defined(GX_SOFTWARE_DECODER_SUPPORT)
static UINT _gx_display_driver_565rgb_rotated_mcu_draw(GX_JPEG_INFO *jpeg_info, INT xpos, INT ypos)
{
USHORT *put;
INT x;
INT y;
INT w;
INT h;
INT coff;
INT Y;
INT Cb;
INT Cr;
GX_DRAW_CONTEXT *context = jpeg_info -> gx_jpeg_draw_context;
GX_RECTANGLE *clip = context -> gx_draw_context_clip;
INT rotated_xpos;
INT rotated_ypos;
INT sign;
h = (jpeg_info -> gx_jpeg_sample_factor[0] >> 4);
w = (jpeg_info -> gx_jpeg_sample_factor[0] & 0x0f);
if (context -> gx_draw_context_display -> gx_display_rotation_angle == GX_SCREEN_ROTATION_CW)
{
rotated_xpos = ypos;
rotated_ypos = context -> gx_draw_context_canvas -> gx_canvas_x_resolution - xpos - 1;
sign = 1;
}
else
{
rotated_xpos = context -> gx_draw_context_canvas -> gx_canvas_y_resolution - ypos - 1;
rotated_ypos = xpos;
sign = -1;
}
put = (USHORT *)context -> gx_draw_context_memory;
put += rotated_ypos * context -> gx_draw_context_pitch;
put += rotated_xpos;
for (x = 0; x < 8 * h; x++)
{
for (y = 0; y < 8 * w; y++)
{
if ((xpos + x >= clip -> gx_rectangle_left) && (xpos + x <= clip -> gx_rectangle_right) &&
(ypos + y >= clip -> gx_rectangle_top) && (ypos + y <= clip -> gx_rectangle_bottom))
{
coff = x / w + ((y / h) << 3);
Y = jpeg_info -> gx_jpeg_Y_block[x + y * w * 8];
Cb = jpeg_info -> gx_jpeg_Cb_block[coff];
Cr = jpeg_info -> gx_jpeg_Cr_block[coff];
*(put + y * sign) = _gx_display_driver_565rgb_YCbCr2RGB(Y, Cb, Cr);
}
}
put -= (context -> gx_draw_context_pitch) * sign;
}
return GX_SUCCESS;
}
#endif
/**************************************************************************/ /**************************************************************************/
/* */ /* */
/* FUNCTION RELEASE */ /* FUNCTION RELEASE */
/* */ /* */
/* _gx_dislay_driver_565rgb_jpeg_draw PORTABLE C */ /* _gx_dislay_driver_565rgb_jpeg_draw PORTABLE C */
/* 6.1 */ /* 6.x */
/* AUTHOR */ /* AUTHOR */
/* */ /* */
/* Kenneth Maxwell, Microsoft Corporation */ /* Kenneth Maxwell, Microsoft Corporation */
@ -174,16 +70,18 @@ INT sign;
/* DATE NAME DESCRIPTION */ /* DATE NAME DESCRIPTION */
/* */ /* */
/* 12-31-2020 Kenneth Maxwell Initial Version 6.1.3 */ /* 12-31-2020 Kenneth Maxwell Initial Version 6.1.3 */
/* xx-xx-xxxx Ting Zhu Modified comment(s), */
/* removed a parameter from */
/* jpeg mcu decode function, */
/* resulting in version 6.x */
/* */ /* */
/**************************************************************************/ /**************************************************************************/
#if defined(GX_SOFTWARE_DECODER_SUPPORT) #if defined(GX_SOFTWARE_DECODER_SUPPORT)
VOID _gx_display_driver_565rgb_rotated_jpeg_draw(GX_DRAW_CONTEXT *context, INT xpos, INT ypos, GX_PIXELMAP *pixelmap) VOID _gx_display_driver_565rgb_rotated_jpeg_draw(GX_DRAW_CONTEXT *context, INT xpos, INT ypos, GX_PIXELMAP *pixelmap)
{ {
_gx_image_reader_jpeg_mcu_decode(pixelmap -> gx_pixelmap_data, _gx_image_reader_jpeg_mcu_decode(pixelmap -> gx_pixelmap_data,
pixelmap -> gx_pixelmap_data_size, pixelmap -> gx_pixelmap_data_size,
context, xpos, ypos, context, xpos, ypos);
_gx_display_driver_565rgb_rotated_mcu_draw);
} }
#endif #endif

2
common/src/gx_display_driver_generic_alphamap_draw.c
View File

@ -376,7 +376,7 @@ VOID (*blend_func)(GX_DRAW_CONTEXT *context, INT x, INT y, GX_COLO
/* */ /* */
/* CALLS */ /* CALLS */
/* */ /* */
//* [gx_display_driver_pixel_blend] Basic display driver pixel */ /* [gx_display_driver_pixel_blend] Basic display driver pixel */
/* blend function */ /* blend function */
/* */ /* */
/* CALLED BY */ /* CALLED BY */

2
common/src/gx_display_driver_generic_rotated_alphamap_draw.c
View File

@ -419,7 +419,7 @@ VOID (*blend_func)(GX_DRAW_CONTEXT *context, INT x, INT y, GX_COLO
/* */ /* */
/* CALLS */ /* CALLS */
/* */ /* */
//* [gx_display_driver_pixel_blend] Basic display driver pixel */ /* [gx_display_driver_pixel_blend] Basic display driver pixel */
/* blend function */ /* blend function */
/* */ /* */
/* CALLED BY */ /* CALLED BY */

8
common/src/gx_image_reader_image_decode.c
View File

@ -108,7 +108,7 @@ GX_CONST GX_UBYTE *buffer;
/* FUNCTION RELEASE */ /* FUNCTION RELEASE */
/* */ /* */
/* _gx_image_reader_image_decode PORTABLE C */ /* _gx_image_reader_image_decode PORTABLE C */
/* 6.1 */ /* 6.x */
/* AUTHOR */ /* AUTHOR */
/* */ /* */
/* Kenneth Maxwell, Microsoft Corporation */ /* Kenneth Maxwell, Microsoft Corporation */
@ -143,6 +143,10 @@ GX_CONST GX_UBYTE *buffer;
/* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */ /* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */
/* 09-30-2020 Kenneth Maxwell Modified comment(s), */ /* 09-30-2020 Kenneth Maxwell Modified comment(s), */
/* resulting in version 6.1 */ /* resulting in version 6.1 */
/* xx-xx-xxxx Ting Zhu Modified comment(s), */
/* modified jpeg decode */
/* function parameter list, */
/* resulting in version 6.x */
/* */ /* */
/**************************************************************************/ /**************************************************************************/
#if defined(GX_SOFTWARE_DECODER_SUPPORT) #if defined(GX_SOFTWARE_DECODER_SUPPORT)
@ -156,7 +160,7 @@ UINT status;
switch (image_reader -> gx_image_reader_image_type) switch (image_reader -> gx_image_reader_image_type)
{ {
case GX_IMAGE_TYPE_JPG: case GX_IMAGE_TYPE_JPG:
status = _gx_image_reader_jpeg_decode(image_reader -> gx_image_reader_source_data, image_reader -> gx_image_reader_source_data_size, outmap); status = _gx_image_reader_jpeg_decode(image_reader, outmap);
break; break;
case GX_IMAGE_TYPE_PNG: case GX_IMAGE_TYPE_PNG:

2193
common/src/gx_image_reader_jpeg_decode.c
View File

File diff suppressed because it is too large Load Diff

72
common/src/gx_image_reader_start.c
View File

@ -292,7 +292,7 @@ static UINT _gx_image_reader_pixelmap_info_set(GX_IMAGE_READER *image_reader, GX
/* FUNCTION RELEASE */ /* FUNCTION RELEASE */
/* */ /* */
/* _gx_image_reader_start PORTABLE C */ /* _gx_image_reader_start PORTABLE C */
/* 6.1 */ /* 6.x */
/* AUTHOR */ /* AUTHOR */
/* */ /* */
/* Kenneth Maxwell, Microsoft Corporation */ /* Kenneth Maxwell, Microsoft Corporation */
@ -340,6 +340,9 @@ static UINT _gx_image_reader_pixelmap_info_set(GX_IMAGE_READER *image_reader, GX
/* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */ /* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */
/* 09-30-2020 Kenneth Maxwell Modified comment(s), */ /* 09-30-2020 Kenneth Maxwell Modified comment(s), */
/* resulting in version 6.1 */ /* resulting in version 6.1 */
/* xx-xx-xxxx Ting Zhu Modified comment(s), */
/* improved logic, */
/* resulting in version 6.x */
/* */ /* */
/**************************************************************************/ /**************************************************************************/
UINT _gx_image_reader_start(GX_IMAGE_READER *image_reader, GX_PIXELMAP *outmap) UINT _gx_image_reader_start(GX_IMAGE_READER *image_reader, GX_PIXELMAP *outmap)
@ -372,15 +375,6 @@ GX_BOOL do_compress;
status = _gx_image_reader_pixelmap_info_set(image_reader, outmap); status = _gx_image_reader_pixelmap_info_set(image_reader, outmap);
} }
if (status == GX_SUCCESS)
{
if (image_reader -> gx_image_reader_color_format == GX_COLOR_FORMAT_MONOCHROME)
{
status = _gx_image_reader_pixel_read_callback_set(image_reader, &srcmap);
_gx_image_reader_gray_threshold_calculate(image_reader);
}
}
if (image_reader -> gx_image_reader_mode & GX_IMAGE_READER_MODE_COMPRESS) if (image_reader -> gx_image_reader_mode & GX_IMAGE_READER_MODE_COMPRESS)
{ {
do_compress = GX_TRUE; do_compress = GX_TRUE;
@ -390,33 +384,47 @@ GX_BOOL do_compress;
do_compress = GX_FALSE; do_compress = GX_FALSE;
} }
image_reader -> gx_image_reader_mode = (GX_UBYTE)(image_reader -> gx_image_reader_mode & (~GX_IMAGE_READER_MODE_COMPRESS)); if((image_reader -> gx_image_reader_image_type == GX_IMAGE_TYPE_JPG && srcmap.gx_pixelmap_format == GX_IMAGE_FORMAT_24BPP) ||
(image_reader -> gx_image_reader_image_type == GX_IMAGE_TYPE_PNG))
/* Color Space Convert. */
if (status == GX_SUCCESS)
{ {
tempmap = *outmap;
status = _gx_image_reader_pixel_read_callback_set(image_reader, &srcmap); if (status == GX_SUCCESS)
}
if (status == GX_SUCCESS)
{
status = _gx_image_reader_pixel_write_callback_set(image_reader, &tempmap);
}
if (status == GX_SUCCESS)
{
status = _gx_image_reader_colorspace_convert(image_reader, &tempmap);
_gx_system_memory_free((VOID *)srcmap.gx_pixelmap_data);
if (srcmap.gx_pixelmap_aux_data)
{ {
_gx_system_memory_free((VOID *)srcmap.gx_pixelmap_aux_data); if (image_reader -> gx_image_reader_color_format == GX_COLOR_FORMAT_MONOCHROME)
{
status = _gx_image_reader_pixel_read_callback_set(image_reader, &srcmap);
_gx_image_reader_gray_threshold_calculate(image_reader);
}
} }
srcmap = tempmap; image_reader -> gx_image_reader_mode = (GX_UBYTE)(image_reader -> gx_image_reader_mode & (~GX_IMAGE_READER_MODE_COMPRESS));
/* Color Space Convert. */
if (status == GX_SUCCESS)
{
tempmap = *outmap;
status = _gx_image_reader_pixel_read_callback_set(image_reader, &srcmap);
}
if (status == GX_SUCCESS)
{
status = _gx_image_reader_pixel_write_callback_set(image_reader, &tempmap);
}
if (status == GX_SUCCESS)
{
status = _gx_image_reader_colorspace_convert(image_reader, &tempmap);
_gx_system_memory_free((VOID *)srcmap.gx_pixelmap_data);
if (srcmap.gx_pixelmap_aux_data)
{
_gx_system_memory_free((VOID *)srcmap.gx_pixelmap_aux_data);
}
srcmap = tempmap;
}
} }
/* Compare compressed size and raw size. */ /* Compare compressed size and raw size. */

13
common/src/gx_system_font_8bpp.c
View File

@ -1130,5 +1130,16 @@ static GX_CONST GX_GLYPH font_SansPro_Regular_ttf_18_aa[95] =
{char_7e, 8, -5, 9, 0, 9, 3} /* '~' */ {char_7e, 8, -5, 9, 0, 9, 3} /* '~' */
}; };
GX_FONT _gx_system_font_8bpp = { GX_FONT_FORMAT_8BPP, 0, 0, 18, 13, 0x20, 0x7e, {font_SansPro_Regular_ttf_18_aa}, NULL }; GX_CONST GX_FONT _gx_system_font_8bpp =
{
GX_FONT_FORMAT_8BPP, /* format */
0, /* line pre-space */
0, /* line post-space */
18, /* font data height */
13, /* font baseline offset */
0x0020, /* first glyph within data page */
0x007e, /* last glyph within data page */
{font_SansPro_Regular_ttf_18_aa}, /* pointer to glyph data */
NULL /* next font page */
};

6
samples/demo_guix_calculator/guix_calculator_resources.c
View File

@ -5,8 +5,8 @@
/* resource file(s). For more information please refer to the Azure RTOS GUIX */ /* resource file(s). For more information please refer to the Azure RTOS GUIX */
/* Studio User Guide, or visit our web site at azure.com/rtos */ /* Studio User Guide, or visit our web site at azure.com/rtos */
/* */ /* */
/* GUIX Studio Revision 6.1.12.0 */ /* GUIX Studio Revision 6.2.1.2 */
/* Date (dd.mm.yyyy): 30. 8.2022 Time (hh:mm): 15:21 */ /* Date (dd.mm.yyyy): 5. 6.2023 Time (hh:mm): 15:03 */
/*******************************************************************************/ /*******************************************************************************/
@ -3156,7 +3156,7 @@ static GX_CONST GX_FONT DEFAULT_THEME_MIDSIZE =
/* Font Table */ /* Font Table */
extern GX_FONT _gx_system_font_8bpp; extern GX_CONST GX_FONT _gx_system_font_8bpp;
GX_CONST GX_FONT *Main_Screen_default_theme_font_table[] = GX_CONST GX_FONT *Main_Screen_default_theme_font_table[] =
{ {
&_gx_system_font_8bpp, &_gx_system_font_8bpp,

6
samples/demo_guix_car_infotainment/demo_guix_car_infotainment_resources.c
View File

@ -5,8 +5,8 @@
/* resource file(s). For more information please refer to the Azure RTOS GUIX */ /* resource file(s). For more information please refer to the Azure RTOS GUIX */
/* Studio User Guide, or visit our web site at azure.com/rtos */ /* Studio User Guide, or visit our web site at azure.com/rtos */
/* */ /* */
/* GUIX Studio Revision 6.1.12.0 */ /* GUIX Studio Revision 6.2.1.2 */
/* Date (dd.mm.yyyy): 30. 8.2022 Time (hh:mm): 15:21 */ /* Date (dd.mm.yyyy): 5. 6.2023 Time (hh:mm): 15:03 */
/*******************************************************************************/ /*******************************************************************************/
@ -10048,7 +10048,7 @@ static GX_CONST GX_FONT THEME_1_NORMAL =
/* Font Table */ /* Font Table */
extern GX_FONT _gx_system_font_8bpp; extern GX_CONST GX_FONT _gx_system_font_8bpp;
GX_CONST GX_FONT *main_display_theme_1_font_table[] = GX_CONST GX_FONT *main_display_theme_1_font_table[] =
{ {
&_gx_system_font_8bpp, &_gx_system_font_8bpp,

6
samples/demo_guix_home_automation/demo_guix_home_automation_resources.c
View File

@ -5,8 +5,8 @@
/* resource file(s). For more information please refer to the Azure RTOS GUIX */ /* resource file(s). For more information please refer to the Azure RTOS GUIX */
/* Studio User Guide, or visit our web site at azure.com/rtos */ /* Studio User Guide, or visit our web site at azure.com/rtos */
/* */ /* */
/* GUIX Studio Revision 6.1.12.0 */ /* GUIX Studio Revision 6.2.1.2 */
/* Date (dd.mm.yyyy): 30. 8.2022 Time (hh:mm): 15:21 */ /* Date (dd.mm.yyyy): 5. 6.2023 Time (hh:mm): 15:03 */
/*******************************************************************************/ /*******************************************************************************/
@ -20948,7 +20948,7 @@ static GX_CONST GX_FONT THEME_1_CITY =
/* Font Table */ /* Font Table */
extern GX_FONT _gx_system_font_8bpp; extern GX_CONST GX_FONT _gx_system_font_8bpp;
GX_CONST GX_FONT *display_1_theme_1_font_table[] = GX_CONST GX_FONT *display_1_theme_1_font_table[] =
{ {
&_gx_system_font_8bpp, &_gx_system_font_8bpp,

6
samples/demo_guix_industrial/demo_guix_industrial_resources.c
View File

@ -5,8 +5,8 @@
/* resource file(s). For more information please refer to the Azure RTOS GUIX */ /* resource file(s). For more information please refer to the Azure RTOS GUIX */
/* Studio User Guide, or visit our web site at azure.com/rtos */ /* Studio User Guide, or visit our web site at azure.com/rtos */
/* */ /* */
/* GUIX Studio Revision 6.1.12.0 */ /* GUIX Studio Revision 6.2.1.2 */
/* Date (dd.mm.yyyy): 25. 8.2022 Time (hh:mm): 18:22 */ /* Date (dd.mm.yyyy): 5. 6.2023 Time (hh:mm): 15:03 */
/*******************************************************************************/ /*******************************************************************************/
@ -17329,7 +17329,7 @@ static GX_CONST GX_FONT THEME_1_BOLD =
/* Font Table */ /* Font Table */
extern GX_FONT _gx_system_font_8bpp; extern GX_CONST GX_FONT _gx_system_font_8bpp;
GX_CONST GX_FONT *main_display_theme_1_font_table[] = GX_CONST GX_FONT *main_display_theme_1_font_table[] =
{ {
&_gx_system_font_8bpp, &_gx_system_font_8bpp,

6
samples/demo_guix_keyboard/guix_keyboard_resources.c
View File

@ -5,8 +5,8 @@
/* resource file(s). For more information please refer to the Azure RTOS GUIX */ /* resource file(s). For more information please refer to the Azure RTOS GUIX */
/* Studio User Guide, or visit our web site at azure.com/rtos */ /* Studio User Guide, or visit our web site at azure.com/rtos */
/* */ /* */
/* GUIX Studio Revision 6.1.12.0 */ /* GUIX Studio Revision 6.2.1.2 */
/* Date (dd.mm.yyyy): 25. 8.2022 Time (hh:mm): 18:22 */ /* Date (dd.mm.yyyy): 5. 6.2023 Time (hh:mm): 15:03 */
/*******************************************************************************/ /*******************************************************************************/
@ -1957,7 +1957,7 @@ static GX_CONST GX_FONT DEFAULT_THEME_MIDSIZE =
/* Font Table */ /* Font Table */
extern GX_FONT _gx_system_font_8bpp; extern GX_CONST GX_FONT _gx_system_font_8bpp;
GX_CONST GX_FONT *display_1_default_theme_font_table[] = GX_CONST GX_FONT *display_1_default_theme_font_table[] =
{ {
&_gx_system_font_8bpp, &_gx_system_font_8bpp,

6
samples/demo_guix_medical/guix_medical_resources.c
View File

@ -5,8 +5,8 @@
/* resource file(s). For more information please refer to the Azure RTOS GUIX */ /* resource file(s). For more information please refer to the Azure RTOS GUIX */
/* Studio User Guide, or visit our web site at azure.com/rtos */ /* Studio User Guide, or visit our web site at azure.com/rtos */
/* */ /* */
/* GUIX Studio Revision 6.1.12.0 */ /* GUIX Studio Revision 6.2.1.2 */
/* Date (dd.mm.yyyy): 25. 8.2022 Time (hh:mm): 18:22 */ /* Date (dd.mm.yyyy): 5. 6.2023 Time (hh:mm): 15:03 */
/*******************************************************************************/ /*******************************************************************************/
@ -10323,7 +10323,7 @@ static GX_CONST GX_FONT DEFAULT_THEME_NORMAL =
/* Font Table */ /* Font Table */
extern GX_FONT _gx_system_font_8bpp; extern GX_CONST GX_FONT _gx_system_font_8bpp;
GX_CONST GX_FONT *main_display_default_theme_font_table[] = GX_CONST GX_FONT *main_display_default_theme_font_table[] =
{ {
&_gx_system_font_8bpp, &_gx_system_font_8bpp,

6
samples/demo_guix_shapes/guix_shapes_resources.c
View File

@ -5,8 +5,8 @@
/* resource file(s). For more information please refer to the Azure RTOS GUIX */ /* resource file(s). For more information please refer to the Azure RTOS GUIX */
/* Studio User Guide, or visit our web site at azure.com/rtos */ /* Studio User Guide, or visit our web site at azure.com/rtos */
/* */ /* */
/* GUIX Studio Revision 6.1.12.0 */ /* GUIX Studio Revision 6.2.1.2 */
/* Date (dd.mm.yyyy): 25. 8.2022 Time (hh:mm): 18:22 */ /* Date (dd.mm.yyyy): 5. 6.2023 Time (hh:mm): 15:03 */
/*******************************************************************************/ /*******************************************************************************/
@ -7647,7 +7647,7 @@ static GX_CONST GX_FONT DEFAULT_THEME_SCREEN_LABEL =
/* Font Table */ /* Font Table */
extern GX_FONT _gx_system_font_8bpp; extern GX_CONST GX_FONT _gx_system_font_8bpp;
GX_CONST GX_FONT *display_1_default_theme_font_table[] = GX_CONST GX_FONT *display_1_default_theme_font_table[] =
{ {
&_gx_system_font_8bpp, &_gx_system_font_8bpp,

6
samples/demo_guix_simple/guix_simple_resources.c
View File

@ -5,8 +5,8 @@
/* resource file(s). For more information please refer to the Azure RTOS GUIX */ /* resource file(s). For more information please refer to the Azure RTOS GUIX */
/* Studio User Guide, or visit our web site at azure.com/rtos */ /* Studio User Guide, or visit our web site at azure.com/rtos */
/* */ /* */
/* GUIX Studio Revision 6.1.12.0 */ /* GUIX Studio Revision 6.2.1.2 */
/* Date (dd.mm.yyyy): 25. 8.2022 Time (hh:mm): 18:22 */ /* Date (dd.mm.yyyy): 5. 6.2023 Time (hh:mm): 15:03 */
/*******************************************************************************/ /*******************************************************************************/
@ -1337,7 +1337,7 @@ static GX_CONST GX_FONT THEME_1_PROMPT =
/* Font Table */ /* Font Table */
extern GX_FONT _gx_system_font_8bpp; extern GX_CONST GX_FONT _gx_system_font_8bpp;
GX_CONST GX_FONT *main_display_theme_1_font_table[] = GX_CONST GX_FONT *main_display_theme_1_font_table[] =
{ {
&_gx_system_font_8bpp, &_gx_system_font_8bpp,

6
samples/demo_guix_smart_watch/guix_smart_watch_resources.c
View File

@ -5,8 +5,8 @@
/* resource file(s). For more information please refer to the Azure RTOS GUIX */ /* resource file(s). For more information please refer to the Azure RTOS GUIX */
/* Studio User Guide, or visit our web site at azure.com/rtos */ /* Studio User Guide, or visit our web site at azure.com/rtos */
/* */ /* */
/* GUIX Studio Revision 6.1.12.0 */ /* GUIX Studio Revision 6.2.1.2 */
/* Date (dd.mm.yyyy): 25. 8.2022 Time (hh:mm): 18:22 */ /* Date (dd.mm.yyyy): 5. 6.2023 Time (hh:mm): 15:03 */
/*******************************************************************************/ /*******************************************************************************/
@ -12286,7 +12286,7 @@ static GX_CONST GX_FONT THEME_1_NUMBER_LARGE =
/* Font Table */ /* Font Table */
extern GX_FONT _gx_system_font_8bpp; extern GX_CONST GX_FONT _gx_system_font_8bpp;
GX_CONST GX_FONT *display_1_theme_1_font_table[] = GX_CONST GX_FONT *display_1_theme_1_font_table[] =
{ {
&_gx_system_font_8bpp, &_gx_system_font_8bpp,

6
samples/demo_guix_sprite/guix_sprite_resources.c
View File

@ -5,8 +5,8 @@
/* resource file(s). For more information please refer to the Azure RTOS GUIX */ /* resource file(s). For more information please refer to the Azure RTOS GUIX */
/* Studio User Guide, or visit our web site at azure.com/rtos */ /* Studio User Guide, or visit our web site at azure.com/rtos */
/* */ /* */
/* GUIX Studio Revision 6.1.12.0 */ /* GUIX Studio Revision 6.2.1.2 */
/* Date (dd.mm.yyyy): 25. 8.2022 Time (hh:mm): 18:23 */ /* Date (dd.mm.yyyy): 5. 6.2023 Time (hh:mm): 15:04 */
/*******************************************************************************/ /*******************************************************************************/
@ -57,7 +57,7 @@ GX_CONST GX_COLOR display_1_default_theme_color_table[] =
/* Font Table */ /* Font Table */
extern GX_FONT _gx_system_font_8bpp; extern GX_CONST GX_FONT _gx_system_font_8bpp;
GX_CONST GX_FONT *display_1_default_theme_font_table[] = GX_CONST GX_FONT *display_1_default_theme_font_table[] =
{ {
&_gx_system_font_8bpp, &_gx_system_font_8bpp,

6
samples/demo_guix_thermostat/guix_thermostat_resources.c
View File

@ -5,8 +5,8 @@
/* resource file(s). For more information please refer to the Azure RTOS GUIX */ /* resource file(s). For more information please refer to the Azure RTOS GUIX */
/* Studio User Guide, or visit our web site at azure.com/rtos */ /* Studio User Guide, or visit our web site at azure.com/rtos */
/* */ /* */
/* GUIX Studio Revision 6.1.12.0 */ /* GUIX Studio Revision 6.2.1.2 */
/* Date (dd.mm.yyyy): 25. 8.2022 Time (hh:mm): 18:23 */ /* Date (dd.mm.yyyy): 5. 6.2023 Time (hh:mm): 15:04 */
/*******************************************************************************/ /*******************************************************************************/
@ -10598,7 +10598,7 @@ static GX_CONST GX_FONT DEFAULT_THEME_BOLD =
/* Font Table */ /* Font Table */
extern GX_FONT _gx_system_font_8bpp; extern GX_CONST GX_FONT _gx_system_font_8bpp;
GX_CONST GX_FONT *main_display_default_theme_font_table[] = GX_CONST GX_FONT *main_display_default_theme_font_table[] =
{ {
&_gx_system_font_8bpp, &_gx_system_font_8bpp,

6
samples/demo_guix_washing_machine/demo_guix_washing_machine_resources.c
View File

@ -5,8 +5,8 @@
/* resource file(s). For more information please refer to the Azure RTOS GUIX */ /* resource file(s). For more information please refer to the Azure RTOS GUIX */
/* Studio User Guide, or visit our web site at azure.com/rtos */ /* Studio User Guide, or visit our web site at azure.com/rtos */
/* */ /* */
/* GUIX Studio Revision 6.1.12.0 */ /* GUIX Studio Revision 6.2.1.2 */
/* Date (dd.mm.yyyy): 25. 8.2022 Time (hh:mm): 18:23 */ /* Date (dd.mm.yyyy): 5. 6.2023 Time (hh:mm): 15:04 */
/*******************************************************************************/ /*******************************************************************************/
@ -17492,7 +17492,7 @@ static GX_CONST GX_FONT THEME_1_MIDDLE =
/* Font Table */ /* Font Table */
extern GX_FONT _gx_system_font_8bpp; extern GX_CONST GX_FONT _gx_system_font_8bpp;
GX_CONST GX_FONT *main_display_theme_1_font_table[] = GX_CONST GX_FONT *main_display_theme_1_font_table[] =
{ {
&_gx_system_font_8bpp, &_gx_system_font_8bpp,

6
samples/demo_guix_widget_types/guix_widget_types_resources.c
View File

@ -5,8 +5,8 @@
/* resource file(s). For more information please refer to the Azure RTOS GUIX */ /* resource file(s). For more information please refer to the Azure RTOS GUIX */
/* Studio User Guide, or visit our web site at azure.com/rtos */ /* Studio User Guide, or visit our web site at azure.com/rtos */
/* */ /* */
/* GUIX Studio Revision 6.1.12.0 */ /* GUIX Studio Revision 6.2.1.2 */
/* Date (dd.mm.yyyy): 25. 8.2022 Time (hh:mm): 18:23 */ /* Date (dd.mm.yyyy): 6. 6.2023 Time (hh:mm): 09:24 */
/*******************************************************************************/ /*******************************************************************************/
@ -8562,7 +8562,7 @@ static GX_CONST GX_FONT THEME_1_SCROLL_WHEEL_SELECTED =
/* Font Table */ /* Font Table */
extern GX_FONT _gx_system_font_8bpp; extern GX_CONST GX_FONT _gx_system_font_8bpp;
GX_CONST GX_FONT *Primary_theme_1_font_table[] = GX_CONST GX_FONT *Primary_theme_1_font_table[] =
{ {
&_gx_system_font_8bpp, &_gx_system_font_8bpp,

6
tutorials/demo_guix_circular_gauge/demo_guix_circular_gauge_resources.c
View File

@ -5,8 +5,8 @@
/* resource file(s). For more information please refer to the Azure RTOS GUIX */ /* resource file(s). For more information please refer to the Azure RTOS GUIX */
/* Studio User Guide, or visit our web site at azure.com/rtos */ /* Studio User Guide, or visit our web site at azure.com/rtos */
/* */ /* */
/* GUIX Studio Revision 6.1.12.0 */ /* GUIX Studio Revision 6.2.1.2 */
/* Date (dd.mm.yyyy): 25. 8.2022 Time (hh:mm): 18:43 */ /* Date (dd.mm.yyyy): 5. 6.2023 Time (hh:mm): 15:14 */
/*******************************************************************************/ /*******************************************************************************/
@ -2678,7 +2678,7 @@ static GX_CONST GX_FONT THEME_1_NewFont =
/* Font Table */ /* Font Table */
extern GX_FONT _gx_system_font_8bpp; extern GX_CONST GX_FONT _gx_system_font_8bpp;
GX_CONST GX_FONT *display_1_theme_1_font_table[] = GX_CONST GX_FONT *display_1_theme_1_font_table[] =
{ {
&_gx_system_font_8bpp, &_gx_system_font_8bpp,

6
tutorials/demo_guix_drop_list/demo_guix_drop_list_resources.c
View File

@ -5,8 +5,8 @@
/* resource file(s). For more information please refer to the Azure RTOS GUIX */ /* resource file(s). For more information please refer to the Azure RTOS GUIX */
/* Studio User Guide, or visit our web site at azure.com/rtos */ /* Studio User Guide, or visit our web site at azure.com/rtos */
/* */ /* */
/* GUIX Studio Revision 6.1.12.0 */ /* GUIX Studio Revision 6.2.1.2 */
/* Date (dd.mm.yyyy): 25. 8.2022 Time (hh:mm): 18:44 */ /* Date (dd.mm.yyyy): 5. 6.2023 Time (hh:mm): 15:14 */
/*******************************************************************************/ /*******************************************************************************/
@ -1520,7 +1520,7 @@ static GX_CONST GX_FONT THEME_1_Title =
/* Font Table */ /* Font Table */
extern GX_FONT _gx_system_font_8bpp; extern GX_CONST GX_FONT _gx_system_font_8bpp;
GX_CONST GX_FONT *Primary_theme_1_font_table[] = GX_CONST GX_FONT *Primary_theme_1_font_table[] =
{ {
&_gx_system_font_8bpp, &_gx_system_font_8bpp,

6
tutorials/demo_guix_generic_scroll_wheel/demo_guix_generic_scroll_wheel_resources.c
View File

@ -5,8 +5,8 @@
/* resource file(s). For more information please refer to the Azure RTOS GUIX */ /* resource file(s). For more information please refer to the Azure RTOS GUIX */
/* Studio User Guide, or visit our web site at azure.com/rtos */ /* Studio User Guide, or visit our web site at azure.com/rtos */
/* */ /* */
/* GUIX Studio Revision 6.1.12.0 */ /* GUIX Studio Revision 6.2.1.2 */
/* Date (dd.mm.yyyy): 25. 8.2022 Time (hh:mm): 18:44 */ /* Date (dd.mm.yyyy): 5. 6.2023 Time (hh:mm): 15:14 */
/*******************************************************************************/ /*******************************************************************************/
@ -4143,7 +4143,7 @@ static GX_CONST GX_FONT THEME_1_NORMAL =
/* Font Table */ /* Font Table */
extern GX_FONT _gx_system_font_8bpp; extern GX_CONST GX_FONT _gx_system_font_8bpp;
GX_CONST GX_FONT *display_1_theme_1_font_table[] = GX_CONST GX_FONT *display_1_theme_1_font_table[] =
{ {
&_gx_system_font_8bpp, &_gx_system_font_8bpp,

6
tutorials/demo_guix_horizontal_list/demo_guix_horizontal_list_resources.c
View File

@ -5,8 +5,8 @@
/* resource file(s). For more information please refer to the Azure RTOS GUIX */ /* resource file(s). For more information please refer to the Azure RTOS GUIX */
/* Studio User Guide, or visit our web site at azure.com/rtos */ /* Studio User Guide, or visit our web site at azure.com/rtos */
/* */ /* */
/* GUIX Studio Revision 6.1.12.0 */ /* GUIX Studio Revision 6.2.1.2 */
/* Date (dd.mm.yyyy): 25. 8.2022 Time (hh:mm): 18:44 */ /* Date (dd.mm.yyyy): 5. 6.2023 Time (hh:mm): 15:14 */
/*******************************************************************************/ /*******************************************************************************/
@ -1520,7 +1520,7 @@ static GX_CONST GX_FONT THEME_1_Title =
/* Font Table */ /* Font Table */
extern GX_FONT _gx_system_font_8bpp; extern GX_CONST GX_FONT _gx_system_font_8bpp;
GX_CONST GX_FONT *display_1_theme_1_font_table[] = GX_CONST GX_FONT *display_1_theme_1_font_table[] =
{ {
&_gx_system_font_8bpp, &_gx_system_font_8bpp,

6
tutorials/demo_guix_menu/demo_guix_menu_resources.c
View File

@ -5,8 +5,8 @@
/* resource file(s). For more information please refer to the Azure RTOS GUIX */ /* resource file(s). For more information please refer to the Azure RTOS GUIX */
/* Studio User Guide, or visit our web site at azure.com/rtos */ /* Studio User Guide, or visit our web site at azure.com/rtos */
/* */ /* */
/* GUIX Studio Revision 6.1.12.0 */ /* GUIX Studio Revision 6.2.1.2 */
/* Date (dd.mm.yyyy): 25. 8.2022 Time (hh:mm): 18:44 */ /* Date (dd.mm.yyyy): 5. 6.2023 Time (hh:mm): 15:14 */
/*******************************************************************************/ /*******************************************************************************/
@ -2233,7 +2233,7 @@ static GX_CONST GX_FONT THEME_1_Title =
/* Font Table */ /* Font Table */
extern GX_FONT _gx_system_font_8bpp; extern GX_CONST GX_FONT _gx_system_font_8bpp;
GX_CONST GX_FONT *Main_Display_theme_1_font_table[] = GX_CONST GX_FONT *Main_Display_theme_1_font_table[] =
{ {
&_gx_system_font_8bpp, &_gx_system_font_8bpp,

6
tutorials/demo_guix_ml_text_input/demo_guix_ml_text_input_resources.c
View File

@ -5,8 +5,8 @@
/* resource file(s). For more information please refer to the Azure RTOS GUIX */ /* resource file(s). For more information please refer to the Azure RTOS GUIX */
/* Studio User Guide, or visit our web site at azure.com/rtos */ /* Studio User Guide, or visit our web site at azure.com/rtos */
/* */ /* */
/* GUIX Studio Revision 6.1.12.0 */ /* GUIX Studio Revision 6.2.1.2 */
/* Date (dd.mm.yyyy): 25. 8.2022 Time (hh:mm): 18:44 */ /* Date (dd.mm.yyyy): 5. 6.2023 Time (hh:mm): 15:14 */
/*******************************************************************************/ /*******************************************************************************/
@ -1516,7 +1516,7 @@ static GX_CONST GX_FONT THEME_1_Title =
/* Font Table */ /* Font Table */
extern GX_FONT _gx_system_font_8bpp; extern GX_CONST GX_FONT _gx_system_font_8bpp;
GX_CONST GX_FONT *display_1_theme_1_font_table[] = GX_CONST GX_FONT *display_1_theme_1_font_table[] =
{ {
&_gx_system_font_8bpp, &_gx_system_font_8bpp,

6
tutorials/demo_guix_radial_slider/demo_guix_radial_slider_resources.c
View File

@ -5,8 +5,8 @@
/* resource file(s). For more information please refer to the Azure RTOS GUIX */ /* resource file(s). For more information please refer to the Azure RTOS GUIX */
/* Studio User Guide, or visit our web site at azure.com/rtos */ /* Studio User Guide, or visit our web site at azure.com/rtos */
/* */ /* */
/* GUIX Studio Revision 6.1.12.0 */ /* GUIX Studio Revision 6.2.1.2 */
/* Date (dd.mm.yyyy): 25. 8.2022 Time (hh:mm): 18:44 */ /* Date (dd.mm.yyyy): 5. 6.2023 Time (hh:mm): 15:14 */
/*******************************************************************************/ /*******************************************************************************/
@ -3849,7 +3849,7 @@ static GX_CONST GX_FONT THEME_1_NORMAL_FONT =
/* Font Table */ /* Font Table */
extern GX_FONT _gx_system_font_8bpp; extern GX_CONST GX_FONT _gx_system_font_8bpp;
GX_CONST GX_FONT *display_1_theme_1_font_table[] = GX_CONST GX_FONT *display_1_theme_1_font_table[] =
{ {
&_gx_system_font_8bpp, &_gx_system_font_8bpp,

6
tutorials/demo_guix_runtime_bidi_text/demo_guix_runtime_bidi_text_resources.c
View File

@ -5,8 +5,8 @@
/* resource file(s). For more information please refer to the Azure RTOS GUIX */ /* resource file(s). For more information please refer to the Azure RTOS GUIX */
/* Studio User Guide, or visit our web site at azure.com/rtos */ /* Studio User Guide, or visit our web site at azure.com/rtos */
/* */ /* */
/* GUIX Studio Revision 6.1.12.0 */ /* GUIX Studio Revision 6.2.1.2 */
/* Date (dd.mm.yyyy): 25. 8.2022 Time (hh:mm): 18:44 */ /* Date (dd.mm.yyyy): 5. 6.2023 Time (hh:mm): 15:14 */
/*******************************************************************************/ /*******************************************************************************/
@ -7375,7 +7375,7 @@ static GX_CONST GX_FONT THEME_1_ARABIC =
/* Font Table */ /* Font Table */
extern GX_FONT _gx_system_font_8bpp; extern GX_CONST GX_FONT _gx_system_font_8bpp;
GX_CONST GX_FONT *display_1_theme_1_font_table[] = GX_CONST GX_FONT *display_1_theme_1_font_table[] =
{ {
&_gx_system_font_8bpp, &_gx_system_font_8bpp,

6
tutorials/demo_guix_scroll_wheel/demo_guix_scroll_wheel_resources.c
View File

@ -5,8 +5,8 @@
/* resource file(s). For more information please refer to the Azure RTOS GUIX */ /* resource file(s). For more information please refer to the Azure RTOS GUIX */
/* Studio User Guide, or visit our web site at azure.com/rtos */ /* Studio User Guide, or visit our web site at azure.com/rtos */
/* */ /* */
/* GUIX Studio Revision 6.1.12.0 */ /* GUIX Studio Revision 6.2.1.2 */
/* Date (dd.mm.yyyy): 25. 8.2022 Time (hh:mm): 18:44 */ /* Date (dd.mm.yyyy): 5. 6.2023 Time (hh:mm): 15:14 */
/*******************************************************************************/ /*******************************************************************************/
@ -6476,7 +6476,7 @@ static GX_CONST GX_FONT THEME_1_SCROLL_WHEEL_SELECTED =
/* Font Table */ /* Font Table */
extern GX_FONT _gx_system_font_8bpp; extern GX_CONST GX_FONT _gx_system_font_8bpp;
GX_CONST GX_FONT *display_1_theme_1_font_table[] = GX_CONST GX_FONT *display_1_theme_1_font_table[] =
{ {
&_gx_system_font_8bpp, &_gx_system_font_8bpp,

6
tutorials/demo_guix_scrollbar/demo_guix_scrollbar_resources.c
View File

@ -5,8 +5,8 @@
/* resource file(s). For more information please refer to the Azure RTOS GUIX */ /* resource file(s). For more information please refer to the Azure RTOS GUIX */
/* Studio User Guide, or visit our web site at azure.com/rtos */ /* Studio User Guide, or visit our web site at azure.com/rtos */
/* */ /* */
/* GUIX Studio Revision 6.1.12.0 */ /* GUIX Studio Revision 6.2.1.2 */
/* Date (dd.mm.yyyy): 25. 8.2022 Time (hh:mm): 18:44 */ /* Date (dd.mm.yyyy): 5. 6.2023 Time (hh:mm): 15:14 */
/*******************************************************************************/ /*******************************************************************************/
@ -1522,7 +1522,7 @@ static GX_CONST GX_FONT THEME_1_Title =
/* Font Table */ /* Font Table */
extern GX_FONT _gx_system_font_8bpp; extern GX_CONST GX_FONT _gx_system_font_8bpp;
GX_CONST GX_FONT *display_1_theme_1_font_table[] = GX_CONST GX_FONT *display_1_theme_1_font_table[] =
{ {
&_gx_system_font_8bpp, &_gx_system_font_8bpp,

6
tutorials/demo_guix_transitions/demo_guix_transitions_resources.c
View File

@ -5,8 +5,8 @@
/* resource file(s). For more information please refer to the Azure RTOS GUIX */ /* resource file(s). For more information please refer to the Azure RTOS GUIX */
/* Studio User Guide, or visit our web site at azure.com/rtos */ /* Studio User Guide, or visit our web site at azure.com/rtos */
/* */ /* */
/* GUIX Studio Revision 6.1.12.0 */ /* GUIX Studio Revision 6.2.1.2 */
/* Date (dd.mm.yyyy): 25. 8.2022 Time (hh:mm): 18:44 */ /* Date (dd.mm.yyyy): 5. 6.2023 Time (hh:mm): 15:14 */
/*******************************************************************************/ /*******************************************************************************/
@ -3957,7 +3957,7 @@ static GX_CONST GX_FONT DEFAULT_THEME_MIDSIZE =
/* Font Table */ /* Font Table */
extern GX_FONT _gx_system_font_8bpp; extern GX_CONST GX_FONT _gx_system_font_8bpp;
GX_CONST GX_FONT *display_1_default_theme_font_table[] = GX_CONST GX_FONT *display_1_default_theme_font_table[] =
{ {
&_gx_system_font_8bpp, &_gx_system_font_8bpp,

6
tutorials/demo_guix_vertical_list/demo_guix_vertical_list_resources.c
View File

@ -5,8 +5,8 @@
/* resource file(s). For more information please refer to the Azure RTOS GUIX */ /* resource file(s). For more information please refer to the Azure RTOS GUIX */
/* Studio User Guide, or visit our web site at azure.com/rtos */ /* Studio User Guide, or visit our web site at azure.com/rtos */
/* */ /* */
/* GUIX Studio Revision 6.1.12.0 */ /* GUIX Studio Revision 6.2.1.2 */
/* Date (dd.mm.yyyy): 25. 8.2022 Time (hh:mm): 18:44 */ /* Date (dd.mm.yyyy): 5. 6.2023 Time (hh:mm): 15:14 */
/*******************************************************************************/ /*******************************************************************************/
@ -1520,7 +1520,7 @@ static GX_CONST GX_FONT THEME_1_Title =
/* Font Table */ /* Font Table */
extern GX_FONT _gx_system_font_8bpp; extern GX_CONST GX_FONT _gx_system_font_8bpp;
GX_CONST GX_FONT *display_1_theme_1_font_table[] = GX_CONST GX_FONT *display_1_theme_1_font_table[] =
{ {
&_gx_system_font_8bpp, &_gx_system_font_8bpp,

6
tutorials/demo_guix_widget_animation/demo_guix_widget_animation_resources.c
View File

@ -5,8 +5,8 @@
/* resource file(s). For more information please refer to the Azure RTOS GUIX */ /* resource file(s). For more information please refer to the Azure RTOS GUIX */
/* Studio User Guide, or visit our web site at azure.com/rtos */ /* Studio User Guide, or visit our web site at azure.com/rtos */
/* */ /* */
/* GUIX Studio Revision 6.1.12.0 */ /* GUIX Studio Revision 6.2.1.2 */
/* Date (dd.mm.yyyy): 25. 8.2022 Time (hh:mm): 18:44 */ /* Date (dd.mm.yyyy): 5. 6.2023 Time (hh:mm): 15:14 */
/*******************************************************************************/ /*******************************************************************************/
@ -1523,7 +1523,7 @@ static GX_CONST GX_FONT THEME_1_Title =
/* Font Table */ /* Font Table */
extern GX_FONT _gx_system_font_8bpp; extern GX_CONST GX_FONT _gx_system_font_8bpp;
GX_CONST GX_FONT *Primary_theme_1_font_table[] = GX_CONST GX_FONT *Primary_theme_1_font_table[] =
{ {
&_gx_system_font_8bpp, &_gx_system_font_8bpp,