From 9cb27eb85ca9b3611d3e9e28acb652c3e30b09f1 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sat, 12 Nov 2011 10:51:06 +0100 Subject: [PATCH] Some better icons. Fix bug 880132 (Justify not correct) Note: justifications are now always relative to the text, in libedit (as before) and schematic editor: if rotated, justification is rotated, because in Pcbnew rotation can have any value. --- bitmaps_png/cpp_26/add_component.cpp | 91 +- bitmaps_png/cpp_26/import_cmp_from_lib.cpp | 99 +- bitmaps_png/cpp_26/new_component.cpp | 105 +- bitmaps_png/cpp_26/new_pcb.cpp | 174 +- bitmaps_png/cpp_26/open_brd_file.cpp | 163 +- bitmaps_png/cpp_26/tree_nosel.cpp | 171 +- bitmaps_png/sources/add_component.svg | 219 +-- bitmaps_png/sources/import_cmp_from_lib.svg | 221 +-- bitmaps_png/sources/new_component.svg | 229 ++- bitmaps_png/sources/new_pcb.svg | 1545 ++++++++++++++--- bitmaps_png/sources/open_brd_file.svg | 1732 +++++++++++++------ eeschema/dialogs/dialog_lib_edit_text.cpp | 44 +- eeschema/dialogs/dialog_lib_edit_text.h | 2 +- eeschema/sch_field.cpp | 144 +- 14 files changed, 3238 insertions(+), 1701 deletions(-) diff --git a/bitmaps_png/cpp_26/add_component.cpp b/bitmaps_png/cpp_26/add_component.cpp index c81754e632..1e336d38ad 100644 --- a/bitmaps_png/cpp_26/add_component.cpp +++ b/bitmaps_png/cpp_26/add_component.cpp @@ -8,63 +8,40 @@ static const unsigned char png[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c, - 0xce, 0x00, 0x00, 0x03, 0x70, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xdd, 0x96, 0x7b, 0x48, 0x93, - 0x51, 0x14, 0xc0, 0xcf, 0xf7, 0xf5, 0x92, 0x8a, 0x08, 0x93, 0x32, 0x30, 0xfa, 0xc7, 0xd4, 0x1a, - 0x29, 0xf4, 0x2e, 0x0b, 0xc2, 0x6c, 0xb0, 0x32, 0x4b, 0x72, 0x95, 0x24, 0x62, 0x2f, 0xcb, 0x31, - 0x33, 0x42, 0x2b, 0x24, 0x5f, 0x14, 0x85, 0x51, 0x09, 0xa6, 0x99, 0x85, 0x62, 0xe5, 0xe3, 0x53, - 0x09, 0x97, 0x95, 0xb5, 0x15, 0x96, 0x7f, 0xb4, 0x55, 0xa4, 0xb2, 0x52, 0x9c, 0x91, 0x58, 0xf6, - 0x8e, 0x52, 0x9a, 0xf9, 0x28, 0x6d, 0xa7, 0x73, 0x2f, 0x94, 0xe1, 0xfa, 0x5c, 0x33, 0xfb, 0xa7, - 0x0b, 0x3f, 0x76, 0xb9, 0x67, 0xe7, 0xfe, 0x76, 0xef, 0x39, 0xfb, 0x36, 0x40, 0x44, 0x18, 0x2e, - 0xca, 0xcb, 0x21, 0x89, 0xd8, 0xf5, 0xbb, 0xd8, 0x70, 0x4a, 0xa6, 0x18, 0x0c, 0xd0, 0x79, 0xf5, - 0x2a, 0xbc, 0xa6, 0xb9, 0xcb, 0xbf, 0x14, 0x65, 0x37, 0x35, 0x01, 0x9a, 0xcd, 0x80, 0x34, 0xdf, - 0x3b, 0x2c, 0x22, 0xda, 0x48, 0x24, 0x3c, 0x88, 0xa5, 0x44, 0x38, 0x91, 0x5c, 0x55, 0x05, 0x7d, - 0x1d, 0x1d, 0x80, 0xed, 0xed, 0x80, 0x95, 0x95, 0xf0, 0x91, 0xd6, 0x62, 0x08, 0x15, 0xe1, 0x45, - 0x8c, 0x1e, 0xaa, 0x68, 0x21, 0xf1, 0xb1, 0xba, 0x1a, 0xf0, 0xc9, 0x13, 0xc0, 0xb7, 0x6f, 0x01, - 0x3f, 0x7d, 0x02, 0xfc, 0xf6, 0x0d, 0xb0, 0xb7, 0x17, 0xb0, 0xad, 0x0d, 0xb0, 0xb5, 0x15, 0xb0, - 0xbe, 0x1e, 0x50, 0xaf, 0xe7, 0x27, 0x7c, 0xf1, 0x37, 0x57, 0xa5, 0xd0, 0xe9, 0xe0, 0x15, 0xdb, - 0x8c, 0x49, 0x6c, 0xb6, 0xfe, 0x30, 0x13, 0xb2, 0x93, 0xd5, 0xd6, 0x72, 0x49, 0x23, 0x31, 0x5d, - 0x76, 0x23, 0x2f, 0x2f, 0xaf, 0x05, 0x6a, 0xb5, 0xfa, 0x4a, 0x78, 0x78, 0x78, 0x39, 0x23, 0x38, - 0x38, 0xf8, 0x46, 0x48, 0x48, 0x48, 0x25, 0x9b, 0x07, 0x06, 0x06, 0xde, 0x66, 0xaf, 0x1a, 0x4d, - 0x90, 0xbe, 0xa8, 0x68, 0x6c, 0x47, 0x43, 0x03, 0x60, 0x77, 0x77, 0x7f, 0x3a, 0xbb, 0xc2, 0x87, - 0x0f, 0xb9, 0xc4, 0x48, 0x4c, 0x1a, 0xb4, 0x46, 0x0a, 0x85, 0x22, 0xb2, 0xa5, 0xa5, 0x05, 0x7f, - 0x0c, 0xab, 0xd5, 0x8a, 0xf1, 0xf1, 0xf1, 0x74, 0x15, 0x7a, 0x4c, 0x4b, 0x4b, 0xfb, 0xb9, 0xde, - 0xd8, 0x98, 0x82, 0x3f, 0x44, 0x56, 0x2b, 0xe0, 0xe7, 0xcf, 0x80, 0x9d, 0x9d, 0x80, 0x26, 0x13, - 0x17, 0xad, 0x90, 0x6d, 0x86, 0xb5, 0x33, 0xc4, 0xb8, 0x2d, 0x7e, 0xe2, 0x71, 0xb5, 0xef, 0xb8, - 0x1b, 0x67, 0x93, 0x76, 0xa0, 0x74, 0x22, 0x0e, 0x8d, 0xfa, 0x4b, 0x7c, 0xd3, 0xae, 0xae, 0x2e, - 0xac, 0xab, 0xab, 0xe3, 0x73, 0xcb, 0xe3, 0x5a, 0x1e, 0xbb, 0x54, 0xe0, 0x89, 0xcf, 0x9f, 0x03, - 0xc7, 0x68, 0x04, 0xac, 0xa9, 0x01, 0x7c, 0xf3, 0x06, 0xf0, 0xd1, 0x23, 0x2e, 0x8a, 0x91, 0x15, - 0xa5, 0x07, 0x0a, 0x46, 0x3c, 0x00, 0x78, 0x6e, 0xe7, 0x62, 0xd4, 0x45, 0x2b, 0x90, 0xcd, 0x75, - 0xc7, 0xa2, 0x71, 0xe0, 0x90, 0xce, 0x9e, 0xe4, 0xb1, 0x8a, 0xe2, 0x11, 0xc8, 0x9a, 0xe2, 0x5a, - 0x09, 0xbd, 0x2f, 0x45, 0xe8, 0x90, 0x24, 0xc8, 0xab, 0xa8, 0x80, 0x2f, 0x6c, 0x8d, 0x44, 0x39, - 0x0e, 0x45, 0x99, 0x9a, 0x95, 0x58, 0xb8, 0x6b, 0xee, 0xa0, 0xa2, 0x2f, 0x07, 0x29, 0x46, 0xa2, - 0xf3, 0xe9, 0xf3, 0xb0, 0x35, 0x76, 0x24, 0x5e, 0x5e, 0x2f, 0xbc, 0x03, 0x80, 0x89, 0x24, 0x98, - 0x46, 0x64, 0x11, 0x55, 0xb2, 0xa2, 0xcd, 0xb3, 0xc5, 0xf4, 0x84, 0x25, 0x62, 0xb1, 0x76, 0x91, - 0xcb, 0xbd, 0xdc, 0xb8, 0x60, 0x94, 0x92, 0xc2, 0xf0, 0x56, 0x49, 0x8e, 0x9d, 0xa8, 0xe6, 0x6e, - 0x15, 0x4a, 0x29, 0x1b, 0x50, 0x4a, 0xde, 0x88, 0xbb, 0x97, 0xb9, 0x35, 0xb3, 0x9c, 0x48, 0x5f, - 0xb1, 0x98, 0x44, 0x63, 0x7e, 0xe9, 0x4c, 0x57, 0x59, 0x11, 0x8d, 0x71, 0xec, 0x53, 0x79, 0x7a, - 0x7a, 0x6a, 0xcc, 0x66, 0x33, 0xb5, 0x69, 0x3b, 0xf6, 0xf4, 0xf4, 0xd8, 0x89, 0xfa, 0xfa, 0xfa, - 0x78, 0x8c, 0x11, 0x10, 0x10, 0x70, 0x91, 0xe5, 0x10, 0x13, 0xe4, 0x9a, 0xcb, 0x6e, 0x41, 0x3b, - 0x5f, 0x30, 0xdd, 0xda, 0x24, 0xb4, 0x9d, 0x5a, 0xe7, 0xd6, 0x53, 0x18, 0x36, 0x05, 0xef, 0x6c, - 0x77, 0xc5, 0x0b, 0x87, 0x76, 0xda, 0x89, 0x4a, 0x73, 0x33, 0x78, 0xec, 0x4a, 0xc4, 0x24, 0x3c, - 0x1a, 0xe4, 0xde, 0x6b, 0xa0, 0x9c, 0xc4, 0xa5, 0xc2, 0x0b, 0x39, 0x99, 0x6c, 0x8d, 0x2e, 0x1c, - 0xd6, 0x60, 0xfe, 0xde, 0x55, 0x0e, 0x9b, 0xa1, 0x60, 0xab, 0x0f, 0xde, 0xbb, 0x5e, 0x86, 0x0d, - 0x51, 0xfd, 0x35, 0xfa, 0x23, 0xd1, 0x76, 0x3f, 0xc1, 0x54, 0xb2, 0x4e, 0x78, 0x7f, 0x44, 0xe5, - 0xd6, 0x75, 0x46, 0x3d, 0x15, 0x75, 0x11, 0x93, 0x31, 0x2f, 0x35, 0xca, 0x4e, 0x54, 0x96, 0x97, - 0xc9, 0x63, 0xec, 0xd4, 0x09, 0x4a, 0xf7, 0xaf, 0x12, 0xe5, 0xec, 0x99, 0x2f, 0xb6, 0xfe, 0xf1, - 0x89, 0x68, 0x8c, 0x22, 0x5c, 0x7c, 0x7c, 0x7c, 0x76, 0x58, 0x2c, 0x16, 0xfa, 0x22, 0x76, 0xf3, - 0x7a, 0x0c, 0x1c, 0x36, 0x9b, 0x8d, 0xc7, 0x18, 0x4a, 0xa5, 0x32, 0x9f, 0xe5, 0xfc, 0xda, 0x08, - 0x0e, 0x45, 0x91, 0x7e, 0x62, 0xc6, 0xd1, 0xe5, 0xa2, 0xb4, 0x7f, 0x99, 0xcb, 0xfd, 0xc2, 0x7d, - 0x6b, 0x50, 0x97, 0xba, 0x09, 0x6f, 0x16, 0x65, 0xd9, 0x89, 0x1e, 0x54, 0x1b, 0x78, 0x8c, 0x71, - 0x60, 0x85, 0x6b, 0x33, 0xcb, 0x89, 0x9a, 0x23, 0x96, 0x32, 0xa1, 0x53, 0x35, 0xca, 0xd4, 0x28, - 0xb1, 0x30, 0x7a, 0xae, 0xc3, 0x1a, 0x19, 0xa2, 0x3c, 0x30, 0x27, 0x21, 0x02, 0x5f, 0xc6, 0x38, - 0x59, 0x23, 0x67, 0x9f, 0x0c, 0xa6, 0xe8, 0xc9, 0x98, 0xbd, 0x7b, 0x35, 0x7e, 0x88, 0x15, 0x9c, - 0x13, 0x85, 0xce, 0x14, 0x35, 0xdb, 0xfc, 0xc4, 0xd4, 0x50, 0xdf, 0xf1, 0x97, 0xf3, 0x8f, 0xc4, - 0xa2, 0xee, 0x74, 0x32, 0xd6, 0x54, 0x5f, 0xb3, 0x13, 0x35, 0x5b, 0xea, 0x79, 0x8c, 0x11, 0xb6, - 0xd8, 0xa3, 0x8e, 0xe5, 0xa8, 0x67, 0x89, 0xa9, 0x24, 0x1a, 0xe9, 0xd4, 0x7f, 0x86, 0x81, 0x4f, - 0xef, 0xc1, 0x86, 0x4a, 0xa5, 0xca, 0x75, 0xf4, 0xfb, 0x25, 0x1b, 0xf0, 0xf6, 0xf6, 0x0e, 0xd5, - 0x6a, 0xb5, 0xcf, 0x12, 0x13, 0x13, 0x9f, 0x3a, 0xc2, 0xdf, 0xdf, 0x3f, 0x63, 0xc8, 0xa2, 0xe1, - 0xe6, 0xff, 0x13, 0x7d, 0x07, 0xfe, 0xe8, 0x3e, 0x43, 0xfe, 0xb9, 0x4e, 0xe2, 0x00, 0x00, 0x00, - 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, + 0xce, 0x00, 0x00, 0x02, 0x03, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xd5, 0xd6, 0x4d, 0x4b, 0x55, + 0x51, 0x14, 0x06, 0xe0, 0xc7, 0xb2, 0x1b, 0x5a, 0x68, 0x59, 0x49, 0x4a, 0x54, 0x46, 0x93, 0x72, + 0x10, 0x12, 0x08, 0x22, 0x41, 0x14, 0x19, 0x82, 0x03, 0xa1, 0x2f, 0x6a, 0x62, 0x1f, 0x24, 0x12, + 0x92, 0x5a, 0x56, 0x60, 0x69, 0x06, 0xa5, 0x69, 0x9f, 0x5a, 0x6a, 0x90, 0x85, 0xd4, 0xa8, 0x41, + 0x34, 0x08, 0x0a, 0x07, 0x4d, 0xfa, 0x03, 0x11, 0x4d, 0xea, 0xd7, 0xdc, 0x26, 0x4b, 0x38, 0x9c, + 0x8e, 0xb7, 0x14, 0x6e, 0xe0, 0xe0, 0x85, 0xb5, 0xd6, 0x3e, 0x7b, 0xbf, 0x67, 0xaf, 0xbd, 0xf6, + 0xbb, 0xb6, 0x7c, 0x3e, 0xef, 0x7f, 0xc0, 0x8a, 0x23, 0x42, 0x09, 0x72, 0x58, 0x55, 0x6c, 0xa2, + 0xed, 0x98, 0xc1, 0x38, 0x3a, 0x8a, 0x4d, 0x74, 0x29, 0xec, 0x61, 0xac, 0xfb, 0x83, 0x08, 0x7b, + 0xd0, 0x8a, 0xaa, 0x02, 0x0b, 0xd5, 0xa0, 0x19, 0x75, 0x59, 0xe9, 0x49, 0x11, 0x5d, 0x44, 0x7d, + 0x6a, 0x5c, 0x2b, 0x06, 0x70, 0x02, 0x63, 0xc8, 0xa5, 0xf2, 0xde, 0x8e, 0x57, 0x98, 0x44, 0x1f, + 0xee, 0x63, 0x0e, 0x9d, 0x58, 0xbb, 0x08, 0xd1, 0x55, 0xd4, 0xa6, 0x89, 0x46, 0x51, 0x1a, 0x4e, + 0x03, 0x2a, 0xc2, 0xae, 0xc4, 0x10, 0xae, 0x63, 0x43, 0x6a, 0x52, 0x0e, 0x67, 0x31, 0x81, 0x1d, + 0x09, 0xa2, 0x31, 0x9c, 0xc3, 0x70, 0xc6, 0x8e, 0x8d, 0x87, 0x71, 0x05, 0x8f, 0xd1, 0x18, 0xfe, + 0x10, 0x8e, 0x65, 0x4c, 0xb8, 0x8d, 0xe6, 0xb0, 0x1b, 0x31, 0x8d, 0xb2, 0xc0, 0x51, 0x1c, 0xc2, + 0xfa, 0x2c, 0xa2, 0x01, 0xec, 0x0b, 0xa7, 0x13, 0x07, 0x70, 0x18, 0x83, 0x11, 0xdb, 0x96, 0x9a, + 0x30, 0x83, 0x41, 0xb4, 0x05, 0x9e, 0xe0, 0x79, 0xc2, 0xcf, 0xc2, 0x56, 0xd8, 0x8c, 0x5b, 0xb1, + 0xed, 0x5e, 0x54, 0xe0, 0x25, 0xb6, 0xc4, 0xc2, 0xf7, 0x70, 0x1e, 0xab, 0x13, 0x44, 0x9f, 0x31, + 0x1b, 0x78, 0x8d, 0x9f, 0x78, 0x9b, 0x88, 0xa5, 0xd1, 0x90, 0x55, 0x5d, 0xd5, 0x98, 0x4c, 0xf8, + 0x0f, 0xf1, 0x2e, 0xfe, 0xbc, 0x3a, 0x88, 0x5a, 0x52, 0x73, 0xfa, 0x16, 0x52, 0x5e, 0x50, 0x19, + 0xb0, 0x17, 0xfd, 0x71, 0xf0, 0x53, 0xf8, 0x88, 0x1b, 0x81, 0xaf, 0xf8, 0x81, 0xef, 0x98, 0xc7, + 0xfb, 0x0c, 0xa2, 0x76, 0x9c, 0xf9, 0x57, 0xa2, 0xcb, 0xe8, 0xc6, 0x03, 0x7c, 0x08, 0xbb, 0x1b, + 0x5f, 0xf0, 0x2d, 0x30, 0x8f, 0x4f, 0x19, 0x44, 0xc7, 0x71, 0x6a, 0x49, 0x5a, 0x87, 0x4d, 0x98, + 0xca, 0x48, 0xdd, 0x2c, 0x76, 0x2f, 0x92, 0xba, 0x6b, 0xd8, 0xbf, 0x64, 0x51, 0xc5, 0x8b, 0x85, + 0x6a, 0x8b, 0x7b, 0x36, 0x80, 0xf2, 0x44, 0x31, 0xbc, 0x49, 0x1c, 0xf4, 0x1c, 0x7e, 0xa5, 0x62, + 0x69, 0xec, 0x5a, 0x8c, 0xa8, 0x09, 0x23, 0xa1, 0x0c, 0xf5, 0x19, 0xe5, 0xdd, 0x83, 0x96, 0xc0, + 0xb3, 0xa8, 0xd8, 0x96, 0x02, 0xa8, 0x2c, 0x24, 0x92, 0xfd, 0xc9, 0xb2, 0x4e, 0xc4, 0x6f, 0xa2, + 0x29, 0xec, 0x23, 0x78, 0x8a, 0x35, 0xcb, 0xee, 0x47, 0x71, 0xd3, 0x7b, 0x70, 0x17, 0x3b, 0x51, + 0x92, 0x18, 0xab, 0x8a, 0xb1, 0x11, 0x54, 0x27, 0xe2, 0x1d, 0x51, 0x4c, 0xa3, 0xa8, 0x5b, 0x52, + 0x9b, 0xc0, 0xc1, 0x90, 0xa6, 0x39, 0xdc, 0x89, 0xf3, 0x9b, 0xc6, 0xc9, 0xe4, 0x6e, 0x43, 0xff, + 0x26, 0x50, 0x1a, 0xa9, 0x3f, 0xbd, 0xac, 0x7e, 0x84, 0xf2, 0xb8, 0x06, 0x1b, 0x0b, 0x7c, 0x73, + 0x21, 0xe4, 0xa8, 0x17, 0x35, 0xc5, 0x6a, 0x7c, 0xb5, 0xa1, 0x93, 0xb9, 0xd0, 0xb7, 0xa1, 0x62, + 0x11, 0x95, 0xe1, 0x51, 0xa4, 0xb4, 0x0b, 0x5d, 0x45, 0x7b, 0x05, 0x85, 0x16, 0xb6, 0x85, 0xfa, + 0x97, 0xac, 0xec, 0xe7, 0xd6, 0xdf, 0xf0, 0x1b, 0x78, 0x31, 0x40, 0x44, 0x3e, 0x72, 0xc2, 0xd2, + 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, }; const BITMAP_OPAQUE add_component_xpm[1] = {{ png, sizeof( png ), "add_component_xpm" }}; diff --git a/bitmaps_png/cpp_26/import_cmp_from_lib.cpp b/bitmaps_png/cpp_26/import_cmp_from_lib.cpp index 6e35a1b4a4..e2842915d1 100644 --- a/bitmaps_png/cpp_26/import_cmp_from_lib.cpp +++ b/bitmaps_png/cpp_26/import_cmp_from_lib.cpp @@ -8,54 +8,57 @@ static const unsigned char png[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c, - 0xce, 0x00, 0x00, 0x02, 0xf0, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xed, 0x96, 0x6d, 0x48, 0x53, - 0x51, 0x18, 0x80, 0xdf, 0x7b, 0x95, 0x32, 0xf1, 0x23, 0x1a, 0x45, 0x56, 0xa3, 0x2c, 0x32, 0xb5, - 0x4c, 0x51, 0x4c, 0x30, 0x6d, 0x1f, 0x69, 0x21, 0xea, 0x20, 0xe9, 0xd3, 0x55, 0xab, 0x39, 0x6b, - 0xa9, 0xb3, 0x34, 0x67, 0x6b, 0x04, 0xb3, 0x91, 0x96, 0x61, 0x9a, 0x66, 0x91, 0x46, 0x84, 0xc9, - 0xd8, 0x14, 0x03, 0xad, 0xf5, 0x4f, 0xa1, 0xfa, 0x97, 0x58, 0x0a, 0x45, 0x03, 0xa7, 0x46, 0x65, - 0xd8, 0x07, 0xd5, 0x9f, 0x54, 0x9c, 0xd0, 0xdb, 0x39, 0x97, 0x2d, 0x6e, 0x7a, 0x75, 0xfe, 0x88, - 0x28, 0xf0, 0x85, 0x87, 0xdd, 0x73, 0xde, 0x7b, 0xce, 0xc3, 0x3d, 0xf7, 0xdd, 0xbb, 0x01, 0x22, - 0xc2, 0xdf, 0x00, 0xe6, 0x45, 0xff, 0xbe, 0x88, 0x84, 0x2f, 0xe1, 0x08, 0x8f, 0xac, 0x29, 0x37, - 0xf8, 0xf0, 0xc7, 0x52, 0xa9, 0xb4, 0xdb, 0x68, 0x34, 0x3a, 0x3c, 0x28, 0x14, 0x8a, 0x61, 0xfa, - 0xa9, 0xd5, 0x6a, 0x07, 0x54, 0x2a, 0xd5, 0x6b, 0xcf, 0x3c, 0xb9, 0xef, 0xf9, 0xb4, 0x27, 0x22, - 0x31, 0x4e, 0x40, 0x37, 0x5f, 0xa7, 0x88, 0xce, 0xf1, 0xc7, 0x06, 0x83, 0xe1, 0x05, 0xf2, 0xc2, - 0x6e, 0xb7, 0x63, 0x45, 0x45, 0x05, 0x9a, 0x4c, 0x26, 0x9c, 0x98, 0x98, 0xf8, 0x35, 0x4f, 0x65, - 0x42, 0xa2, 0x41, 0x38, 0x4c, 0x24, 0x66, 0x42, 0x28, 0x27, 0xf3, 0xe3, 0x89, 0xfa, 0x57, 0x07, - 0x33, 0x75, 0x55, 0x72, 0xe6, 0x31, 0xe5, 0x7c, 0x5a, 0xc8, 0x98, 0xed, 0x94, 0x04, 0xcb, 0x8f, - 0x4a, 0x51, 0x28, 0x6a, 0x75, 0x0a, 0xa4, 0x79, 0x73, 0xc6, 0x8a, 0x51, 0xcf, 0x9a, 0x7d, 0x91, - 0xac, 0xce, 0xb3, 0xd9, 0x13, 0x38, 0x49, 0x04, 0x5d, 0x84, 0x2c, 0x4e, 0xb4, 0x87, 0x27, 0x1a, - 0xf0, 0x61, 0x60, 0xec, 0x5d, 0x3e, 0xa0, 0x55, 0x13, 0x81, 0x8d, 0xe6, 0x42, 0xfc, 0x40, 0x96, - 0xd9, 0x0e, 0xad, 0x14, 0x14, 0xb5, 0xe7, 0x6d, 0xc2, 0xf1, 0x12, 0xc0, 0x7a, 0x63, 0x0e, 0x5a, - 0x4f, 0xc4, 0x21, 0x1a, 0x00, 0xf3, 0xe2, 0xd8, 0x8b, 0x9e, 0xcd, 0xac, 0xb0, 0xcb, 0x2d, 0xaa, - 0x26, 0x30, 0xf0, 0x8c, 0xcc, 0x05, 0x71, 0xb9, 0x70, 0x18, 0x86, 0xf5, 0x80, 0xdb, 0xd7, 0x00, - 0xf6, 0xe6, 0x2f, 0xc1, 0xdb, 0xb9, 0xf1, 0x38, 0x59, 0x3a, 0xbb, 0x88, 0x6e, 0x7e, 0xf7, 0x78, - 0x2c, 0x76, 0x17, 0x2c, 0x9f, 0x26, 0x3a, 0x06, 0xb1, 0x6e, 0x11, 0x85, 0x3e, 0x9d, 0x1f, 0xbc, - 0x22, 0xf3, 0x7a, 0x88, 0x82, 0x6f, 0x60, 0x21, 0xe3, 0x40, 0xc0, 0xa5, 0xfe, 0x4c, 0x87, 0x32, - 0x3d, 0x79, 0xc4, 0xd6, 0x58, 0x8d, 0x6d, 0x4d, 0x37, 0x04, 0x45, 0xf6, 0x96, 0x3b, 0x48, 0xf3, - 0x07, 0x33, 0x25, 0x1f, 0x93, 0xc4, 0x6c, 0x31, 0x47, 0x28, 0x44, 0x7b, 0x44, 0x8b, 0x20, 0x08, - 0xbe, 0x40, 0x3b, 0x4f, 0x76, 0x8f, 0x50, 0x4c, 0x28, 0x71, 0x8f, 0xcb, 0x01, 0x19, 0x06, 0x26, - 0x33, 0x92, 0x63, 0x3e, 0xdb, 0x6e, 0x56, 0x62, 0xcb, 0xad, 0x1a, 0x41, 0xd1, 0x7d, 0x4b, 0x03, - 0xd2, 0xbc, 0x2a, 0x23, 0xf9, 0x53, 0xea, 0x5a, 0xf6, 0x0c, 0x45, 0x22, 0x86, 0x78, 0x7e, 0x75, - 0x5d, 0x80, 0x6d, 0x3c, 0x91, 0x10, 0x4a, 0x40, 0xb1, 0xc8, 0x1f, 0xbf, 0x9f, 0xf6, 0x7e, 0x74, - 0xd6, 0xfc, 0x2d, 0xd8, 0xa3, 0x0b, 0xf9, 0xfd, 0xe8, 0xdc, 0x22, 0x11, 0xe1, 0x29, 0x39, 0x44, - 0x84, 0xce, 0x19, 0x44, 0x4d, 0x80, 0x2c, 0xcb, 0xe0, 0xa3, 0x6c, 0xef, 0xc5, 0x50, 0x67, 0x50, - 0x4f, 0x2f, 0x06, 0x9e, 0xcc, 0x8f, 0x2b, 0x8c, 0x55, 0x64, 0xd3, 0x22, 0xc2, 0x75, 0xf7, 0x11, - 0x76, 0xb9, 0xe5, 0x31, 0x80, 0x49, 0xeb, 0x02, 0x5d, 0xb6, 0x92, 0x14, 0xbc, 0xa4, 0x49, 0x15, - 0x14, 0x5d, 0x2b, 0xca, 0x42, 0x9a, 0x37, 0xa5, 0x8b, 0x47, 0x2b, 0x65, 0x4c, 0x27, 0x65, 0x6f, - 0x24, 0xab, 0x9d, 0xa9, 0x5d, 0x24, 0x10, 0x0a, 0x09, 0x16, 0xd8, 0x08, 0x2e, 0x4e, 0x54, 0xcc, - 0x95, 0x7d, 0x8f, 0x5e, 0xaf, 0x7f, 0x89, 0x73, 0x08, 0xc1, 0x2f, 0xec, 0xac, 0x3d, 0x6a, 0x33, - 0x8c, 0x40, 0x2b, 0xa0, 0x6f, 0x20, 0xfc, 0x38, 0x9b, 0xc8, 0xbc, 0x2d, 0xdb, 0x21, 0x72, 0xd9, - 0x72, 0xd6, 0x63, 0x69, 0x66, 0x84, 0xa0, 0xc0, 0xac, 0x4c, 0x40, 0x9a, 0x37, 0xef, 0x14, 0xb9, - 0x6a, 0x53, 0x99, 0xc1, 0xc6, 0x34, 0xc6, 0xb9, 0x3b, 0x9c, 0x2d, 0xf3, 0x2e, 0x8a, 0x22, 0xa2, - 0x44, 0xc0, 0xab, 0x29, 0x80, 0xcd, 0xb9, 0xd1, 0xd8, 0xd6, 0x70, 0x19, 0xdf, 0x17, 0x78, 0x7f, - 0x47, 0xcd, 0x57, 0x8c, 0x68, 0xd5, 0x6d, 0x15, 0x7e, 0x47, 0x82, 0xa2, 0x85, 0xf0, 0x26, 0x60, - 0x01, 0x0c, 0xf4, 0xaa, 0x19, 0x7c, 0xa8, 0x0c, 0xc0, 0x9a, 0xfd, 0xe1, 0x48, 0xaf, 0x2b, 0x33, - 0x97, 0x09, 0x8a, 0xea, 0x0f, 0x84, 0x61, 0x1f, 0xc9, 0xd7, 0x67, 0x87, 0x61, 0x87, 0x72, 0x31, - 0x77, 0xad, 0x8e, 0x66, 0xab, 0xe6, 0xd2, 0xde, 0xfb, 0x08, 0x1b, 0x80, 0xf6, 0x08, 0x82, 0x5a, - 0xad, 0xee, 0x77, 0x38, 0x1c, 0xe8, 0x74, 0x3a, 0x05, 0x45, 0x43, 0x43, 0x43, 0x48, 0xf3, 0x1a, - 0x8d, 0x66, 0xd0, 0xb3, 0x86, 0x10, 0x3c, 0x17, 0x91, 0x64, 0xb6, 0xee, 0xfd, 0xc7, 0x8a, 0x61, - 0x2a, 0x32, 0x99, 0xcc, 0x42, 0x7e, 0x77, 0x1e, 0x78, 0x43, 0x2e, 0x97, 0xb7, 0xce, 0xff, 0x67, - 0xf8, 0xbf, 0x44, 0x3f, 0x01, 0xe5, 0xbf, 0xe2, 0x33, 0x82, 0x8c, 0xff, 0x48, 0x00, 0x00, 0x00, + 0xce, 0x00, 0x00, 0x03, 0x20, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0xd5, 0x5f, 0x68, 0x96, + 0x65, 0x18, 0xc7, 0xf1, 0xcf, 0x74, 0xd3, 0x21, 0xb8, 0x8d, 0xa5, 0x22, 0x15, 0x25, 0x6e, 0xfd, + 0x41, 0x11, 0x9a, 0x98, 0x36, 0xb7, 0xac, 0x06, 0x35, 0x92, 0x58, 0x53, 0x2a, 0x95, 0x46, 0x85, + 0x9a, 0x44, 0x27, 0xa9, 0x45, 0x96, 0x81, 0xa0, 0x31, 0x07, 0xfe, 0xe9, 0x8f, 0xff, 0x48, 0x11, + 0xa1, 0xb7, 0x3f, 0x62, 0x13, 0x0f, 0x8a, 0x54, 0x0a, 0x15, 0xb7, 0x99, 0x4b, 0x5f, 0x76, 0xd0, + 0x51, 0x81, 0xa3, 0x03, 0xdd, 0x7a, 0x0f, 0x3c, 0x0c, 0x92, 0x59, 0x3e, 0x9d, 0x5c, 0x2f, 0x3c, + 0xbd, 0xbe, 0x9b, 0x53, 0xf3, 0xe0, 0x07, 0xf7, 0xf5, 0x3c, 0xd7, 0x73, 0x7f, 0xef, 0xfb, 0xba, + 0x7f, 0xd7, 0xfd, 0xc0, 0x1e, 0x74, 0xa6, 0xb4, 0x3e, 0x49, 0x12, 0x79, 0xa1, 0x16, 0xe3, 0xd2, + 0xcf, 0x6e, 0x45, 0xb0, 0x65, 0xea, 0xbd, 0x4e, 0xcc, 0x6f, 0xf2, 0xd3, 0x9c, 0x06, 0x3d, 0xd8, + 0x5b, 0x90, 0xd0, 0x8c, 0xf7, 0xfe, 0x0f, 0xd0, 0xdb, 0x2d, 0x4b, 0x65, 0xb3, 0x39, 0xc9, 0xf9, + 0x3f, 0x5c, 0x9b, 0x34, 0xd9, 0x31, 0x54, 0xa6, 0x12, 0x16, 0xe2, 0x28, 0x96, 0xdd, 0x2e, 0xa8, + 0x6d, 0x5a, 0xad, 0x53, 0xd9, 0x9c, 0x24, 0x9b, 0x93, 0x2c, 0x7e, 0x45, 0x1f, 0x96, 0xa7, 0x12, + 0x9e, 0xab, 0x79, 0xd8, 0x29, 0x7c, 0x8f, 0x86, 0xdb, 0x01, 0x3d, 0x8e, 0xa3, 0x5d, 0xfd, 0x86, + 0xb2, 0x39, 0xc9, 0xc9, 0x5f, 0x5d, 0x99, 0xf1, 0x88, 0xd3, 0x78, 0x15, 0x13, 0xd0, 0xb2, 0xe3, + 0x6b, 0x03, 0x2d, 0xcb, 0x64, 0x71, 0x04, 0xd3, 0x6f, 0x15, 0x34, 0x16, 0xfb, 0x33, 0xc7, 0x5d, + 0xce, 0xef, 0xaa, 0xeb, 0x82, 0xa1, 0x4d, 0xbb, 0xfc, 0x3e, 0xbf, 0xc9, 0x99, 0xa9, 0xf7, 0xf8, + 0x6e, 0x4f, 0xa7, 0xc1, 0xde, 0x8b, 0xfe, 0x79, 0xb2, 0x59, 0x2f, 0x3e, 0x47, 0x55, 0x91, 0x89, + 0xa6, 0xe2, 0x05, 0xb4, 0xa0, 0xe2, 0xba, 0xf7, 0x91, 0xd4, 0x34, 0xb3, 0x4e, 0x57, 0x77, 0xbf, + 0xab, 0x79, 0x58, 0x31, 0x75, 0xf7, 0xbb, 0x5a, 0x57, 0xaf, 0x07, 0xdb, 0x51, 0x5a, 0x00, 0x9a, + 0x8b, 0x77, 0xf0, 0x62, 0xa1, 0x73, 0xd3, 0xa0, 0x12, 0x7c, 0xf2, 0xf4, 0xf3, 0x7e, 0x3e, 0x37, + 0xe0, 0xda, 0x48, 0xb0, 0x53, 0xbf, 0xb9, 0x52, 0x59, 0xed, 0x07, 0xac, 0x28, 0x02, 0x5a, 0x12, + 0xe3, 0x0d, 0x18, 0x53, 0x58, 0xba, 0x92, 0xb0, 0xf0, 0x0a, 0x6c, 0x7c, 0xb4, 0xd1, 0x99, 0x8f, + 0x32, 0x2e, 0x9d, 0xbd, 0xe8, 0xef, 0x6c, 0x4e, 0x72, 0x6e, 0x40, 0xd2, 0xd9, 0x2d, 0xd9, 0x7a, + 0x40, 0xb2, 0x76, 0xa3, 0x64, 0xe9, 0x4a, 0x97, 0xf1, 0x23, 0x6a, 0x46, 0x00, 0xbd, 0x8f, 0xf2, + 0x42, 0xd0, 0xcb, 0x58, 0x8e, 0x7a, 0x6c, 0xc5, 0x13, 0xd8, 0x70, 0xd7, 0x14, 0x5f, 0xcc, 0xae, + 0x77, 0xfe, 0xfe, 0x1a, 0xb9, 0x45, 0x6d, 0xfe, 0xea, 0xd8, 0x27, 0x69, 0xff, 0xcc, 0x9f, 0x65, + 0x65, 0xfa, 0xa2, 0xc9, 0x77, 0xa4, 0x8d, 0x91, 0x07, 0xa1, 0x1c, 0x1f, 0x16, 0x33, 0x43, 0x7b, + 0x0c, 0x26, 0xe2, 0x21, 0x8c, 0x8f, 0x78, 0x36, 0x0e, 0xa0, 0x63, 0xf7, 0x37, 0x06, 0xbb, 0xfb, + 0x0d, 0x85, 0xcd, 0x57, 0x47, 0x6e, 0x1d, 0xf6, 0x61, 0x41, 0xe4, 0xcf, 0xc2, 0x16, 0x6c, 0x46, + 0xe3, 0x48, 0xa0, 0x37, 0xb0, 0x3b, 0xec, 0x5e, 0x81, 0xbd, 0xb8, 0x0f, 0xad, 0x3b, 0x0f, 0x1a, + 0x0c, 0x7b, 0xaf, 0x47, 0x26, 0xdf, 0x4f, 0xe1, 0xb4, 0xfd, 0x98, 0x32, 0x1a, 0x7b, 0xbf, 0x1e, + 0xe5, 0xab, 0x8d, 0xda, 0xd6, 0x63, 0x0d, 0x16, 0x47, 0xc2, 0xe6, 0xb9, 0x8d, 0x7a, 0xb1, 0x0b, + 0xe3, 0xf1, 0x15, 0x0e, 0x62, 0x5b, 0xa8, 0x13, 0x3d, 0xa9, 0xb8, 0x98, 0xa6, 0xc0, 0x18, 0xbc, + 0x14, 0xd6, 0x7c, 0x16, 0xa5, 0xd1, 0x2b, 0x63, 0x03, 0xf4, 0x2d, 0xfa, 0x31, 0x2f, 0xe2, 0x2f, + 0xb1, 0x09, 0x6d, 0x29, 0x9d, 0xc0, 0xaa, 0x82, 0x67, 0x69, 0x55, 0xe4, 0xb7, 0x55, 0x1a, 0x75, + 0xaf, 0x8a, 0xb3, 0xd9, 0x16, 0xe3, 0x2a, 0x1c, 0xc3, 0x49, 0x1c, 0x8e, 0x1e, 0xc9, 0x14, 0x5e, + 0x45, 0xb1, 0xc8, 0x39, 0x23, 0x96, 0x2e, 0x12, 0x17, 0xc4, 0x44, 0x87, 0x71, 0x1a, 0x7d, 0xa9, + 0xf8, 0x02, 0x2e, 0x85, 0xba, 0x71, 0xb6, 0x08, 0x68, 0x19, 0x5a, 0x47, 0x03, 0x9a, 0x88, 0x07, + 0x43, 0xcf, 0x84, 0x29, 0xf2, 0x71, 0x06, 0xc7, 0xa3, 0x84, 0x1d, 0x71, 0x3e, 0x85, 0xa0, 0xb5, + 0xf9, 0xd2, 0x8e, 0x08, 0x2a, 0xf8, 0x68, 0x5c, 0x9c, 0x51, 0x49, 0xc4, 0x9f, 0xe2, 0x10, 0x5a, + 0x22, 0xce, 0x60, 0x25, 0x1a, 0x52, 0x3a, 0x12, 0xbf, 0x93, 0x86, 0x61, 0x54, 0x36, 0x9c, 0x15, + 0xd7, 0x61, 0x61, 0x8c, 0x57, 0xa3, 0x36, 0xf5, 0x2e, 0x13, 0x4e, 0xcb, 0xa4, 0x76, 0xfb, 0x4b, + 0x2a, 0x2e, 0xa6, 0xca, 0xe1, 0x40, 0xd5, 0xd1, 0x47, 0x93, 0xf3, 0x3b, 0x2b, 0x00, 0xe5, 0xfb, + 0xa8, 0x2a, 0x9a, 0xf6, 0xee, 0x1b, 0xf6, 0xd1, 0x08, 0x0d, 0x56, 0x1f, 0x57, 0xcd, 0xac, 0x82, + 0xe7, 0xf3, 0x30, 0x09, 0x35, 0xd8, 0x89, 0xe6, 0xd4, 0xbb, 0xc7, 0xa2, 0xf1, 0x5b, 0xaf, 0x5b, + 0xe0, 0x0d, 0xba, 0x79, 0x7a, 0x9c, 0xd1, 0x9a, 0xb8, 0x78, 0x67, 0x84, 0x59, 0xde, 0x8a, 0x45, + 0xcc, 0x28, 0xa8, 0xc2, 0xc7, 0x71, 0xe7, 0xad, 0xc3, 0xa2, 0x51, 0x83, 0x62, 0x82, 0xf1, 0x98, + 0x13, 0x8d, 0xf7, 0x01, 0x5e, 0x8b, 0x95, 0x4f, 0x28, 0x62, 0xa2, 0xed, 0x78, 0x33, 0xda, 0xa5, + 0xfc, 0xa6, 0x40, 0x37, 0xf1, 0xab, 0xae, 0xc6, 0x34, 0x34, 0xc5, 0xff, 0x68, 0xc9, 0x9d, 0x02, + 0xcd, 0x44, 0x3b, 0x1e, 0xc0, 0x52, 0xac, 0xba, 0x23, 0xa0, 0x80, 0x3d, 0x85, 0x77, 0xe3, 0xde, + 0xfb, 0x4f, 0x69, 0xff, 0x05, 0x20, 0xc0, 0x9a, 0xd2, 0x3a, 0xaf, 0x3c, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, }; diff --git a/bitmaps_png/cpp_26/new_component.cpp b/bitmaps_png/cpp_26/new_component.cpp index 6218cab434..1df6aa5de4 100644 --- a/bitmaps_png/cpp_26/new_component.cpp +++ b/bitmaps_png/cpp_26/new_component.cpp @@ -8,61 +8,56 @@ static const unsigned char png[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c, - 0xce, 0x00, 0x00, 0x03, 0x4b, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xdd, 0x95, 0x7d, 0x48, 0x53, - 0x51, 0x14, 0xc0, 0xcf, 0x1e, 0x25, 0x05, 0x2d, 0xc2, 0x4c, 0x0b, 0x8a, 0x84, 0x40, 0x94, 0xa8, - 0xe5, 0x14, 0x2d, 0x09, 0x29, 0x02, 0x4b, 0x10, 0x31, 0xd4, 0x2c, 0x58, 0x41, 0x24, 0xa4, 0x2b, - 0xfb, 0x43, 0x36, 0x4b, 0x51, 0x9f, 0x41, 0xf4, 0x21, 0x46, 0xa5, 0x65, 0x2c, 0xfa, 0x18, 0x46, - 0x3a, 0x45, 0x73, 0xb9, 0x10, 0x56, 0x66, 0x6a, 0xa4, 0x05, 0x4e, 0xd0, 0xcd, 0x4c, 0xa9, 0x3f, - 0x52, 0xca, 0x51, 0xe8, 0xfc, 0x64, 0xe9, 0x5a, 0xa7, 0x7b, 0x1e, 0x99, 0xe1, 0x7a, 0x6e, 0x33, - 0xfb, 0xa7, 0x0b, 0x3f, 0x76, 0xb9, 0xe7, 0x9e, 0xf3, 0xdb, 0x7b, 0xf7, 0xbc, 0xf7, 0x00, 0x11, - 0x61, 0xb1, 0xa8, 0xad, 0x85, 0x7c, 0x46, 0xda, 0x9f, 0x62, 0x8b, 0x29, 0x09, 0x78, 0xf2, 0x04, - 0x26, 0x1f, 0x3f, 0x86, 0x4f, 0x6c, 0xbe, 0xec, 0x5f, 0x8a, 0x6e, 0xf6, 0xf6, 0x02, 0x76, 0x76, - 0x02, 0xb2, 0x79, 0xe6, 0xa2, 0x88, 0x58, 0x21, 0x8e, 0xb1, 0x9e, 0xb1, 0x93, 0xa1, 0x60, 0xf0, - 0x8d, 0x8d, 0xf0, 0x6d, 0x7c, 0x1c, 0xd0, 0x66, 0x03, 0xac, 0xaf, 0x87, 0x21, 0xb6, 0x96, 0xc1, - 0x88, 0x65, 0x04, 0x31, 0x7c, 0x16, 0x2a, 0x8a, 0x64, 0x0c, 0x35, 0x37, 0x03, 0xf6, 0xf5, 0x01, - 0x5a, 0xad, 0x80, 0xa3, 0xa3, 0x80, 0x4e, 0x27, 0xa0, 0xc3, 0x01, 0x38, 0x3c, 0x0c, 0xd8, 0xdf, - 0x0f, 0x68, 0xb1, 0x00, 0x1a, 0x8d, 0xc2, 0x15, 0x0e, 0xfc, 0xcd, 0xad, 0xda, 0xac, 0xd7, 0xc3, - 0x47, 0x2a, 0x46, 0x92, 0xef, 0xdf, 0x67, 0xc3, 0x24, 0xa4, 0x2b, 0xeb, 0xe8, 0x10, 0x24, 0x3d, - 0x8c, 0x8d, 0xa2, 0x85, 0x22, 0x22, 0x22, 0x92, 0x15, 0x0a, 0x45, 0xed, 0x0c, 0xb1, 0xb1, 0xb1, - 0x0d, 0x29, 0x29, 0x29, 0x75, 0x34, 0x8f, 0x89, 0x89, 0x69, 0xa4, 0x5f, 0xa5, 0x32, 0xce, 0x58, - 0x5e, 0xbe, 0x7c, 0xbc, 0xbb, 0x1b, 0xd0, 0x6e, 0x9f, 0x4d, 0xa7, 0x5b, 0xd8, 0xde, 0x2e, 0x48, - 0x5a, 0x19, 0xab, 0xe7, 0x3d, 0xa3, 0xc8, 0xc8, 0xc8, 0x2b, 0xf8, 0xdb, 0x18, 0x18, 0x18, 0x40, - 0x9e, 0xe7, 0xd1, 0x60, 0x30, 0xa0, 0x46, 0xa3, 0xf9, 0xb5, 0x6e, 0x36, 0xe7, 0xe2, 0x8c, 0x68, - 0x6c, 0x0c, 0x70, 0x62, 0x02, 0x70, 0x72, 0x12, 0xb0, 0xad, 0x4d, 0x10, 0xed, 0x11, 0x6d, 0x86, - 0x84, 0x20, 0x8e, 0x3f, 0x2a, 0xe3, 0x8a, 0x12, 0xe5, 0xab, 0x4d, 0xba, 0xcb, 0x2a, 0x24, 0x4c, - 0x2d, 0x46, 0xa1, 0xe8, 0xc8, 0xc8, 0x08, 0xbb, 0xef, 0x16, 0x61, 0xde, 0xd9, 0xf6, 0x5c, 0x88, - 0x55, 0xdf, 0xdf, 0x84, 0x1f, 0x3e, 0x80, 0x40, 0x6b, 0x2b, 0xa0, 0xc9, 0x04, 0x38, 0x38, 0x08, - 0xd8, 0xd5, 0x25, 0x88, 0x32, 0x44, 0x45, 0xda, 0x38, 0x89, 0xc5, 0x91, 0x05, 0x78, 0x3d, 0x6d, - 0x37, 0x3e, 0x4d, 0x0b, 0x44, 0x3c, 0x03, 0x42, 0xc1, 0xb9, 0x43, 0x5f, 0xca, 0x0b, 0xb1, 0x47, - 0x15, 0x4b, 0x90, 0x9a, 0xa2, 0xbe, 0x0a, 0xb0, 0x92, 0x87, 0x2f, 0xd4, 0xe6, 0x75, 0x75, 0x30, - 0x45, 0x6b, 0x6c, 0xae, 0x99, 0x57, 0x64, 0x57, 0x01, 0x5e, 0xcd, 0x88, 0x47, 0x7d, 0x5a, 0xf0, - 0xbc, 0xa2, 0xa9, 0x5c, 0x56, 0xac, 0x62, 0x29, 0xde, 0x2d, 0xdc, 0x8a, 0x93, 0xec, 0xcf, 0x95, - 0xc5, 0x49, 0x7a, 0x7f, 0x36, 0xca, 0x06, 0xc6, 0x0d, 0x46, 0xa3, 0xa8, 0xe8, 0xf0, 0x16, 0xee, - 0x56, 0x4e, 0x14, 0x57, 0xa1, 0x8c, 0x5a, 0xf9, 0x56, 0x97, 0x7f, 0x08, 0x89, 0x16, 0x43, 0xb9, - 0x8b, 0xa8, 0xcd, 0x58, 0x83, 0xba, 0x82, 0x03, 0xf8, 0x20, 0x2f, 0x19, 0x4f, 0x44, 0x49, 0x2d, - 0x94, 0xc3, 0x72, 0xef, 0xcc, 0xe9, 0x4c, 0x5f, 0x51, 0x11, 0x1b, 0x2b, 0x18, 0xab, 0x42, 0x43, - 0x43, 0x4b, 0x6d, 0x36, 0x1b, 0x12, 0xd3, 0xd3, 0xd3, 0x2e, 0x22, 0x5a, 0xa3, 0x98, 0xd5, 0x6a, - 0x45, 0x99, 0x4c, 0x56, 0x44, 0x39, 0x0c, 0xa9, 0x58, 0x73, 0xb9, 0x2c, 0xa8, 0xb6, 0x4b, 0xcc, - 0x0d, 0x07, 0x25, 0xc3, 0x45, 0xf1, 0xfe, 0x8e, 0x87, 0x87, 0xd7, 0x60, 0x53, 0xaa, 0x2f, 0x96, - 0x15, 0xaa, 0x5d, 0x44, 0x55, 0x25, 0xbc, 0x10, 0x7b, 0xa8, 0xf0, 0x43, 0xb6, 0x77, 0x9a, 0x72, - 0xd4, 0xdb, 0x25, 0x3d, 0x1e, 0x8b, 0xe8, 0x8c, 0xc6, 0x32, 0x01, 0x6b, 0x4a, 0xcf, 0xa1, 0x36, - 0x7d, 0x87, 0xdb, 0x66, 0x78, 0x70, 0x32, 0x0a, 0xf5, 0x9a, 0xf3, 0x48, 0x39, 0x33, 0x67, 0xe4, - 0x91, 0x28, 0x3d, 0x4c, 0x62, 0xae, 0x4c, 0x90, 0x7c, 0x2e, 0xd8, 0xb7, 0xf6, 0xab, 0x36, 0x65, - 0x1d, 0xea, 0x8f, 0xf8, 0xa3, 0xf6, 0x92, 0xab, 0x48, 0x57, 0xcc, 0x0b, 0xb1, 0x7b, 0x6c, 0x4f, - 0xfe, 0xde, 0x80, 0x29, 0xca, 0x51, 0xca, 0x39, 0xcf, 0xaf, 0x88, 0x0d, 0x1f, 0xc6, 0xb2, 0xf0, - 0xf0, 0xf0, 0x12, 0xbb, 0xdd, 0x8e, 0x84, 0xd3, 0xe9, 0x74, 0x11, 0xd1, 0x1a, 0xc5, 0xe8, 0x9c, - 0xc2, 0xc2, 0xc2, 0x2e, 0x52, 0x0e, 0xe5, 0x7a, 0x2c, 0x4a, 0x95, 0x71, 0xb7, 0x2f, 0xec, 0xe2, - 0x74, 0xaa, 0x68, 0x69, 0xaf, 0xfe, 0xec, 0x41, 0x24, 0x9a, 0xf4, 0x65, 0x2e, 0xa2, 0x97, 0xf5, - 0x95, 0x42, 0xac, 0x86, 0x4f, 0x46, 0x75, 0xb4, 0xb4, 0x9b, 0x72, 0x8e, 0x6d, 0xe3, 0xb4, 0x5e, - 0x9d, 0x11, 0x3d, 0x47, 0xd7, 0x4e, 0xed, 0x77, 0xfb, 0x1c, 0x51, 0xcc, 0xa0, 0x0c, 0x11, 0xf6, - 0x52, 0x8e, 0x57, 0x67, 0xe4, 0xed, 0x9b, 0xe1, 0x59, 0x7a, 0x20, 0x96, 0x1c, 0xdf, 0x8d, 0x8e, - 0x2c, 0x2f, 0x45, 0x49, 0xc1, 0x9c, 0xea, 0x98, 0x8c, 0x3b, 0x9b, 0x28, 0xf7, 0x7b, 0x45, 0xc5, - 0x08, 0xf3, 0xeb, 0x26, 0x17, 0xd1, 0x1b, 0x53, 0xab, 0x10, 0xab, 0x2e, 0xce, 0xc1, 0x24, 0xb9, - 0xdf, 0x0b, 0xca, 0x49, 0x0a, 0xe1, 0x4e, 0x7b, 0x2c, 0x12, 0x7b, 0x7b, 0x8b, 0x0d, 0x6a, 0x08, - 0xf6, 0x49, 0x39, 0xe7, 0xee, 0xfb, 0x25, 0x1a, 0x90, 0xcb, 0xe5, 0x7c, 0x5e, 0x5e, 0xde, 0x3b, - 0x77, 0x64, 0x67, 0x67, 0xbf, 0x67, 0x7b, 0xd5, 0x0b, 0x16, 0x2d, 0x36, 0xff, 0x9f, 0xe8, 0x07, - 0x66, 0xdc, 0x5b, 0x5d, 0x7a, 0x1d, 0xec, 0x08, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, - 0xae, 0x42, 0x60, 0x82, + 0xce, 0x00, 0x00, 0x03, 0x07, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0x96, 0x5b, 0x48, 0x54, + 0x51, 0x14, 0x86, 0x97, 0x59, 0x59, 0x59, 0x7a, 0x12, 0x84, 0xac, 0x88, 0x2e, 0x8c, 0x45, 0x11, + 0x0d, 0x98, 0x60, 0x74, 0x7b, 0xe8, 0x26, 0x15, 0x41, 0x10, 0xbd, 0x18, 0xa5, 0x14, 0x81, 0x18, + 0x85, 0x14, 0xcc, 0x43, 0x0d, 0x11, 0x42, 0x49, 0x57, 0xcb, 0xe8, 0xa1, 0xcc, 0x7b, 0x46, 0x36, + 0xea, 0x78, 0x0d, 0x95, 0x06, 0x33, 0x11, 0xf1, 0x21, 0x33, 0x44, 0xc3, 0x8a, 0x42, 0x50, 0x50, + 0xc8, 0xdb, 0x43, 0x69, 0xa0, 0xbb, 0x7f, 0xcd, 0xac, 0xa1, 0xe3, 0xe1, 0xcc, 0x90, 0x97, 0x39, + 0xf0, 0x31, 0x7b, 0x9f, 0x75, 0xce, 0xfe, 0xf7, 0xfe, 0xf7, 0x5a, 0xfb, 0x0c, 0x29, 0xa5, 0x68, + 0x2e, 0xa8, 0xa9, 0xa1, 0x10, 0xa7, 0x93, 0x6c, 0xbe, 0xe2, 0x34, 0x57, 0x42, 0x65, 0x65, 0x74, + 0xb9, 0xbc, 0x9c, 0xfe, 0x54, 0x54, 0xd0, 0xba, 0x80, 0x09, 0x41, 0x44, 0xc3, 0x8a, 0x86, 0xba, + 0xbb, 0x49, 0xa1, 0x9d, 0x1b, 0x10, 0x21, 0x08, 0x84, 0x61, 0xf0, 0x8c, 0x8e, 0x0e, 0x52, 0xc3, + 0xc3, 0xa4, 0x5c, 0x2e, 0x9a, 0x28, 0x29, 0xa1, 0xd8, 0x59, 0x0b, 0x55, 0x56, 0xd2, 0x12, 0x0c, + 0x9c, 0x05, 0x8b, 0x3e, 0x34, 0x34, 0xd0, 0x48, 0x73, 0x33, 0xa9, 0xb6, 0x36, 0x52, 0xa3, 0xa3, + 0xa4, 0x26, 0x26, 0x48, 0xf5, 0xf4, 0x90, 0x6a, 0x6d, 0x25, 0xd5, 0xd8, 0x48, 0xbf, 0xeb, 0xeb, + 0xe9, 0x73, 0x69, 0x29, 0xbd, 0x06, 0x09, 0x33, 0xb5, 0x2a, 0x06, 0xfb, 0x31, 0xd0, 0xd9, 0x49, + 0x6a, 0x68, 0xc8, 0x23, 0xe0, 0x0d, 0x4f, 0x4e, 0x92, 0x1a, 0x1b, 0x23, 0x35, 0x30, 0x40, 0xaa, + 0xa9, 0x89, 0x14, 0x44, 0x5c, 0xc5, 0xc5, 0x14, 0x3e, 0x63, 0xcb, 0x30, 0x40, 0x34, 0x04, 0x7f, + 0xb4, 0xb7, 0x7b, 0x56, 0xe3, 0x0d, 0xb1, 0x68, 0x7f, 0xbf, 0xdb, 0x42, 0x85, 0x2c, 0x2c, 0x84, + 0xc8, 0xc2, 0x59, 0xef, 0x11, 0xf6, 0x62, 0x7d, 0x6d, 0xed, 0x3f, 0xdb, 0xc6, 0xc7, 0x3d, 0xbf, + 0x92, 0x14, 0xd5, 0x78, 0x24, 0x68, 0xca, 0x1e, 0xe1, 0x8a, 0x02, 0x3b, 0xc1, 0x52, 0xd3, 0x8c, + 0x21, 0x9a, 0x0f, 0xa2, 0xc1, 0x01, 0xb0, 0x19, 0xb8, 0x67, 0x09, 0xfb, 0xb6, 0xb3, 0x3d, 0x83, + 0x83, 0xa4, 0xfa, 0xfa, 0x3c, 0x02, 0xdc, 0xee, 0xed, 0x25, 0xe5, 0x70, 0xd0, 0x3b, 0xc3, 0x18, + 0xb4, 0x1b, 0xdc, 0x00, 0xa7, 0x41, 0x3a, 0x0f, 0xaa, 0x0b, 0x2e, 0x00, 0xe7, 0x40, 0x36, 0xb8, + 0x0e, 0x12, 0xc1, 0x55, 0x90, 0x05, 0x2e, 0x16, 0x15, 0x51, 0x4a, 0x4b, 0x0b, 0x29, 0x06, 0x2b, + 0xf8, 0x95, 0x97, 0x47, 0xdf, 0xeb, 0xea, 0x48, 0x75, 0x75, 0x91, 0xaa, 0xaa, 0xa2, 0x9f, 0x46, + 0xa1, 0x34, 0xef, 0x0c, 0x71, 0xc5, 0x81, 0x65, 0xd2, 0x5e, 0x01, 0xee, 0x83, 0x64, 0x10, 0x62, + 0x78, 0x29, 0x18, 0x24, 0xd8, 0xed, 0xd4, 0x01, 0xfb, 0x46, 0x20, 0x92, 0x66, 0xb5, 0xba, 0x57, + 0x9b, 0x19, 0x1f, 0x4f, 0x2f, 0x73, 0x72, 0xe8, 0x0b, 0xee, 0x29, 0xc4, 0xa2, 0xf4, 0x42, 0x37, + 0xa5, 0x91, 0x0a, 0xee, 0x82, 0x18, 0x19, 0x88, 0xdb, 0x7b, 0x4d, 0x6c, 0xe4, 0xd5, 0xec, 0xe0, + 0xb6, 0xcd, 0x46, 0x57, 0x34, 0x8d, 0x9e, 0xf1, 0x44, 0xc4, 0xde, 0xe5, 0x60, 0x31, 0xc7, 0x90, + 0x08, 0x87, 0x60, 0x9f, 0x45, 0x2f, 0x64, 0x03, 0x56, 0xe9, 0xb0, 0x4d, 0xbb, 0xc0, 0x49, 0x70, + 0x49, 0xee, 0x6d, 0x35, 0x08, 0x15, 0xf2, 0xe4, 0x40, 0x92, 0x90, 0x2d, 0x24, 0xf9, 0x21, 0x9c, + 0x5f, 0x8c, 0x10, 0xdf, 0xd3, 0x65, 0x55, 0x61, 0x20, 0x57, 0x67, 0x21, 0xaf, 0xec, 0x1a, 0x08, + 0x95, 0xfe, 0x0b, 0x50, 0x00, 0x6e, 0x09, 0xb7, 0xc1, 0x27, 0x70, 0x47, 0x77, 0xcf, 0x48, 0xa4, + 0x59, 0x86, 0xad, 0x02, 0xf7, 0x74, 0xfd, 0x47, 0xe0, 0x15, 0x78, 0x2e, 0x99, 0x97, 0xcf, 0x19, + 0x6a, 0x78, 0xc7, 0x0e, 0xb6, 0xf8, 0x2b, 0x05, 0xef, 0x83, 0xb1, 0x32, 0x20, 0xe3, 0x00, 0x0d, + 0xba, 0xfe, 0x47, 0xf0, 0x55, 0x78, 0x0b, 0x5c, 0x26, 0x42, 0xa7, 0xc0, 0xb1, 0xff, 0x11, 0x5a, + 0x0d, 0x8e, 0x0b, 0xa9, 0xb2, 0x0f, 0xde, 0x7e, 0x35, 0x68, 0x06, 0xef, 0x65, 0x12, 0x4e, 0x13, + 0xa1, 0x64, 0xb3, 0xc4, 0xf1, 0x7b, 0xa8, 0x72, 0xd1, 0x72, 0x66, 0x99, 0x58, 0x67, 0x97, 0x18, + 0x5b, 0x77, 0x10, 0x68, 0x3a, 0x32, 0xa5, 0x90, 0x35, 0x1f, 0x04, 0x91, 0x8f, 0x93, 0x80, 0x13, + 0x60, 0x9b, 0xb4, 0x39, 0xc3, 0x8e, 0xea, 0x62, 0x2c, 0x54, 0x29, 0xab, 0x63, 0xde, 0x80, 0x6f, + 0xba, 0xbe, 0x19, 0x9a, 0x2f, 0x21, 0xde, 0xf4, 0xc7, 0x52, 0x1f, 0x9a, 0x21, 0x96, 0x2f, 0x96, + 0xae, 0x05, 0x1b, 0xa4, 0xae, 0x8e, 0x48, 0xdf, 0x17, 0xc1, 0xbe, 0x3d, 0x45, 0xe5, 0xcb, 0xb1, + 0x13, 0x61, 0xb8, 0x9f, 0x28, 0x02, 0xa1, 0x52, 0x83, 0x29, 0xba, 0x58, 0x24, 0xd8, 0x0f, 0x36, + 0x4d, 0xeb, 0xc3, 0x87, 0x2b, 0x1e, 0x3c, 0x05, 0x87, 0xc1, 0x1a, 0xb7, 0xd7, 0x44, 0x2b, 0xc1, + 0x3e, 0xf0, 0x04, 0x9c, 0xe0, 0x7b, 0xf2, 0xec, 0x22, 0xf0, 0x40, 0x26, 0xc8, 0xb5, 0x15, 0x37, + 0xad, 0x2f, 0xac, 0x08, 0x9c, 0x91, 0xc2, 0x2b, 0x90, 0xc2, 0x3c, 0x0b, 0x2c, 0x86, 0xe7, 0xf8, + 0xf8, 0xc9, 0x90, 0x13, 0xde, 0x02, 0x36, 0x06, 0xe4, 0x5f, 0x90, 0x88, 0x71, 0xe6, 0x9d, 0x07, + 0x0f, 0xc1, 0x9e, 0x80, 0x08, 0xc9, 0xc9, 0xef, 0x3d, 0x1f, 0xf9, 0xd3, 0x73, 0x21, 0x50, 0x42, + 0xf3, 0x38, 0x31, 0x64, 0x7f, 0xb8, 0x24, 0xa6, 0xfc, 0xbf, 0xfb, 0x0b, 0x2f, 0x30, 0x34, 0x8f, + 0x1e, 0x47, 0xf9, 0x88, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, }; const BITMAP_OPAQUE new_component_xpm[1] = {{ png, sizeof( png ), "new_component_xpm" }}; diff --git a/bitmaps_png/cpp_26/new_pcb.cpp b/bitmaps_png/cpp_26/new_pcb.cpp index 8852fa11d0..da96f568b1 100644 --- a/bitmaps_png/cpp_26/new_pcb.cpp +++ b/bitmaps_png/cpp_26/new_pcb.cpp @@ -8,90 +8,96 @@ static const unsigned char png[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c, - 0xce, 0x00, 0x00, 0x05, 0x1a, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xad, 0x96, 0x6b, 0x4c, 0x93, - 0x57, 0x18, 0x80, 0x8f, 0x33, 0x4e, 0xb3, 0x2d, 0x61, 0x66, 0x6e, 0xfe, 0xda, 0xe2, 0x64, 0x43, - 0x1d, 0x99, 0x73, 0x99, 0xd3, 0xc5, 0x04, 0xb9, 0x53, 0x60, 0x8c, 0xa9, 0x98, 0x05, 0xca, 0x2a, - 0x20, 0x3a, 0x82, 0xdb, 0x8c, 0x59, 0x86, 0x2e, 0x2e, 0xc3, 0x00, 0x09, 0xfe, 0x20, 0x59, 0x62, - 0x06, 0x3f, 0x36, 0x63, 0x9c, 0x80, 0x5c, 0x06, 0xbd, 0x00, 0x2d, 0xb4, 0x50, 0x6b, 0xb1, 0x1f, - 0x5d, 0xb1, 0x20, 0x05, 0x8a, 0xb5, 0x68, 0x4a, 0x0b, 0x85, 0xb6, 0x94, 0x22, 0x50, 0x6e, 0xbd, - 0x9e, 0x9d, 0x97, 0x6f, 0xc5, 0x72, 0x11, 0x74, 0xee, 0xc7, 0x93, 0x9e, 0xef, 0x3d, 0xdf, 0x77, - 0x9e, 0x73, 0x7b, 0xcf, 0x29, 0xc2, 0x18, 0xa3, 0xe8, 0xe8, 0xe8, 0xfd, 0xb1, 0xb1, 0xb1, 0xe9, - 0x00, 0x29, 0xaf, 0x4b, 0x44, 0x44, 0xc4, 0x12, 0x98, 0xcc, 0x4f, 0xce, 0x5d, 0xbe, 0xbc, 0xfd, - 0x7a, 0x58, 0x58, 0x58, 0xfa, 0x72, 0x42, 0x43, 0x43, 0xe3, 0xc0, 0x81, 0xe2, 0xe3, 0xe3, 0x3f, - 0xcc, 0xcb, 0xcb, 0xd3, 0xf7, 0xf4, 0xf4, 0x2c, 0xa1, 0xbb, 0xbb, 0xfb, 0x99, 0x11, 0x8b, 0x8f, - 0x4d, 0xd5, 0xd7, 0x6f, 0x73, 0x77, 0x75, 0xdd, 0x35, 0xa8, 0x54, 0x2a, 0xbd, 0x3f, 0x57, 0xaf, - 0x5e, 0x35, 0x30, 0x18, 0x8c, 0x0c, 0x14, 0x13, 0x13, 0x73, 0x44, 0x2e, 0x97, 0xeb, 0x88, 0x55, - 0x8c, 0xbd, 0x5e, 0xf6, 0xd4, 0x90, 0x51, 0xe0, 0x8f, 0xdb, 0xe5, 0xe2, 0x90, 0x3a, 0xf6, 0xd3, - 0xb0, 0xdb, 0xb5, 0x8d, 0x02, 0xc1, 0x26, 0x4f, 0x6b, 0x2b, 0xc2, 0xf7, 0xef, 0xe7, 0x76, 0x2d, - 0xab, 0xe7, 0x58, 0x2c, 0x96, 0x21, 0x32, 0x98, 0x2b, 0x0b, 0xa2, 0xb6, 0xb6, 0x36, 0x10, 0xf1, - 0x1d, 0x76, 0xfb, 0x4d, 0xc1, 0xd7, 0xdf, 0x0c, 0xf0, 0x99, 0xa7, 0xf5, 0xfc, 0xe4, 0x53, 0x86, - 0x86, 0xe4, 0x93, 0x83, 0xdc, 0x23, 0xa9, 0x23, 0x73, 0xe3, 0x13, 0x15, 0x1e, 0xb7, 0xbb, 0x54, - 0xc0, 0xca, 0x1a, 0xb0, 0x0f, 0x0e, 0x57, 0x93, 0x77, 0x6f, 0x08, 0x4f, 0x7e, 0xff, 0x68, 0x4c, - 0xad, 0xe1, 0x28, 0x14, 0x5f, 0x3e, 0xe8, 0xec, 0x44, 0xd8, 0x60, 0x40, 0xb8, 0xba, 0xfa, 0x15, - 0xc7, 0xf0, 0xb0, 0x7e, 0xa1, 0xfe, 0x5f, 0xca, 0x56, 0x88, 0xfa, 0xa7, 0x1e, 0x4a, 0x5b, 0x4c, - 0xb7, 0xc5, 0x80, 0xc4, 0x2c, 0x6b, 0xf6, 0x60, 0x4f, 0x29, 0xbc, 0xdc, 0xcf, 0xe1, 0xb7, 0x70, - 0x12, 0x53, 0x4c, 0x73, 0xb6, 0xf1, 0x8a, 0xa1, 0xdb, 0x94, 0x80, 0x1d, 0xff, 0x95, 0x65, 0x72, - 0xd0, 0x58, 0x6d, 0xed, 0xe9, 0xe3, 0xb2, 0x53, 0xa2, 0x6c, 0x02, 0xc1, 0x46, 0xcf, 0xe8, 0x28, - 0xc2, 0x93, 0x93, 0x08, 0xcb, 0x64, 0x08, 0x53, 0xd4, 0x99, 0xce, 0x35, 0x45, 0x69, 0xf2, 0xec, - 0x99, 0xa4, 0x3b, 0x27, 0x5c, 0xc0, 0x71, 0x59, 0xba, 0xe3, 0x87, 0xce, 0x9f, 0x8d, 0x4e, 0x8f, - 0x73, 0x41, 0xf6, 0xb0, 0xae, 0xb1, 0xb9, 0xe1, 0x5c, 0x9c, 0x59, 0xa9, 0x4c, 0x56, 0x8b, 0xf9, - 0x1f, 0x9b, 0xb8, 0x7f, 0x06, 0xb8, 0x84, 0xc2, 0x97, 0x5d, 0x12, 0x09, 0xc2, 0x7d, 0x7d, 0x08, - 0xcf, 0xce, 0x22, 0xec, 0x72, 0xd1, 0xa3, 0x82, 0x58, 0x53, 0xd3, 0x66, 0x57, 0x73, 0x73, 0xe0, - 0x18, 0x45, 0x45, 0x0c, 0x28, 0x95, 0xe7, 0x26, 0xcf, 0x9f, 0xdf, 0xcd, 0x5f, 0x14, 0xa5, 0xcb, - 0xcf, 0xcc, 0x24, 0x4a, 0x53, 0xb0, 0x8f, 0x63, 0xad, 0x2c, 0x77, 0xa1, 0xfa, 0x57, 0x8d, 0xaf, - 0x77, 0x35, 0x89, 0x5f, 0x8c, 0xc1, 0xc7, 0x4d, 0x4d, 0x08, 0x0f, 0x0f, 0x23, 0x3c, 0x36, 0x86, - 0xf0, 0xf4, 0x34, 0xc2, 0x73, 0x73, 0x88, 0x2c, 0x2d, 0x82, 0x8d, 0x85, 0xe7, 0xe7, 0xe9, 0xd8, - 0xf8, 0x38, 0xc2, 0x66, 0x33, 0x3d, 0xc2, 0xba, 0xba, 0xcd, 0xde, 0x9c, 0x9c, 0x3d, 0xf5, 0x28, - 0x32, 0x32, 0x72, 0x55, 0x11, 0x90, 0xd3, 0x99, 0x3b, 0xb8, 0x28, 0x62, 0x24, 0x59, 0xe7, 0xe7, - 0xcd, 0x95, 0x2d, 0x2d, 0x41, 0xd6, 0xe6, 0x66, 0x84, 0x47, 0x46, 0xe8, 0x46, 0x41, 0xe0, 0x8f, - 0xd3, 0x49, 0x77, 0x42, 0xa9, 0x04, 0xc9, 0x16, 0x97, 0x56, 0x5b, 0x39, 0x4a, 0xd2, 0xe6, 0xca, - 0x73, 0x89, 0xe0, 0x77, 0x7e, 0x7e, 0xb4, 0x82, 0xfb, 0xc7, 0x1b, 0x4e, 0x91, 0x88, 0x96, 0x39, - 0x1c, 0x4f, 0x24, 0x30, 0x32, 0x90, 0x28, 0x14, 0x08, 0xd7, 0xd7, 0xbf, 0xea, 0x30, 0x99, 0xea, - 0x9a, 0xcc, 0x66, 0xf3, 0xd0, 0x33, 0x8b, 0x1c, 0x0e, 0x47, 0x69, 0xfe, 0x81, 0xd0, 0x89, 0xca, - 0xca, 0x4a, 0x11, 0x90, 0x77, 0x38, 0xe4, 0x31, 0x97, 0xbb, 0xc5, 0x39, 0x30, 0x40, 0xaf, 0x8d, - 0xc7, 0x83, 0xb0, 0xdb, 0x4d, 0xcb, 0xac, 0x56, 0x18, 0x09, 0x74, 0x82, 0xd3, 0x08, 0x9b, 0x01, - 0x44, 0x64, 0x79, 0xd6, 0x17, 0xf5, 0xf7, 0xf7, 0xff, 0xb5, 0x73, 0xe7, 0x4e, 0x5b, 0xec, 0x3b, - 0x81, 0xb3, 0x99, 0x99, 0x99, 0x2a, 0xe0, 0xf8, 0xee, 0x5d, 0xd3, 0x3c, 0xde, 0x06, 0x6c, 0xb1, - 0x20, 0x6c, 0xb7, 0xd3, 0xa3, 0x00, 0xc1, 0xd4, 0x14, 0xbd, 0x3e, 0xf4, 0xd4, 0x72, 0x57, 0x8a, - 0x28, 0x8a, 0x7a, 0xaa, 0xe8, 0xec, 0xd9, 0xb3, 0x1d, 0x2c, 0x16, 0xab, 0x67, 0xd3, 0xc6, 0x8d, - 0x5e, 0x83, 0xc1, 0x50, 0x25, 0x12, 0x89, 0x1a, 0x76, 0x05, 0xbd, 0xe4, 0x15, 0x0a, 0xe9, 0xc6, - 0x75, 0x3a, 0x84, 0xa5, 0x52, 0xba, 0x71, 0xad, 0x96, 0x8e, 0x51, 0x14, 0xc2, 0x1a, 0x4d, 0xae, - 0xfc, 0xb9, 0x44, 0xa9, 0xa9, 0xa9, 0xbd, 0x69, 0x69, 0x69, 0xdd, 0x08, 0x21, 0x4c, 0x46, 0xce, - 0xbb, 0x76, 0xed, 0x9a, 0x38, 0x2a, 0x8a, 0x6e, 0x18, 0x4e, 0x03, 0x0e, 0x07, 0xe1, 0xb2, 0xb2, - 0xc0, 0x31, 0xa9, 0x34, 0xf6, 0x61, 0x6d, 0x2d, 0xc2, 0x62, 0x31, 0x1d, 0x6f, 0x6f, 0x3f, 0x7e, - 0x7f, 0x89, 0x88, 0x1c, 0x7c, 0xeb, 0x8a, 0x0a, 0x0a, 0x0a, 0xa8, 0xa0, 0xa0, 0x20, 0xab, 0xc9, - 0x64, 0xaa, 0x54, 0xab, 0xd5, 0xb5, 0x39, 0x39, 0x01, 0x73, 0x5c, 0x2e, 0xc2, 0xb7, 0x6e, 0xed, - 0x37, 0x86, 0x87, 0xbf, 0xfd, 0x58, 0x28, 0x14, 0x36, 0x38, 0x9d, 0xce, 0xd2, 0xc3, 0x87, 0xdf, - 0xb7, 0x96, 0x95, 0xed, 0xb1, 0x80, 0x5c, 0x22, 0xd9, 0x37, 0xe2, 0x13, 0x91, 0x83, 0xf8, 0xd9, - 0x44, 0x3c, 0x1e, 0xaf, 0xd1, 0x2f, 0xdb, 0x6f, 0xa8, 0x54, 0xd9, 0xf7, 0xcc, 0x66, 0xbe, 0xc0, - 0x3f, 0xf6, 0xa4, 0x4e, 0xc5, 0x66, 0x32, 0x3f, 0x1b, 0x54, 0x28, 0x12, 0x1f, 0xbc, 0xb0, 0x68, - 0x2d, 0x40, 0x44, 0xa6, 0xea, 0x91, 0xef, 0x08, 0x7a, 0x2e, 0x51, 0x51, 0x51, 0x51, 0xeb, 0xa1, - 0x43, 0x87, 0x0c, 0xd3, 0xd3, 0xd3, 0xe5, 0x1a, 0x8d, 0xa6, 0xe6, 0xe0, 0xc1, 0x83, 0x43, 0x46, - 0xa3, 0xb1, 0xca, 0x66, 0xb3, 0xdd, 0x84, 0xb8, 0x42, 0xa1, 0xe0, 0xc2, 0xd4, 0x85, 0x87, 0x87, - 0xeb, 0x4a, 0x4a, 0x4a, 0x24, 0xff, 0x59, 0xb4, 0x7c, 0x33, 0x40, 0x19, 0xf2, 0x09, 0x9e, 0xa1, - 0x9c, 0x9f, 0x9f, 0x4f, 0xc1, 0xfa, 0x41, 0x99, 0xc9, 0x64, 0xf6, 0x2e, 0x17, 0x91, 0x0d, 0xb7, - 0xbe, 0x28, 0x2b, 0x2b, 0xeb, 0x5e, 0x46, 0x46, 0x86, 0x2a, 0x62, 0xeb, 0x76, 0x6f, 0x5f, 0x5f, - 0x5f, 0x8d, 0x40, 0x20, 0xe0, 0x87, 0xbe, 0xfe, 0x26, 0x86, 0x6d, 0x0e, 0x39, 0x16, 0xb6, 0xf5, - 0x2d, 0x6f, 0x71, 0x71, 0xb1, 0xc4, 0x6e, 0xb7, 0x97, 0xef, 0x0b, 0xd8, 0xe6, 0xce, 0x66, 0x7c, - 0xae, 0x3f, 0x7a, 0xf4, 0xa8, 0x66, 0x85, 0x28, 0x24, 0x24, 0xe4, 0x88, 0x4c, 0x26, 0x5b, 0x55, - 0x74, 0xe1, 0xde, 0x25, 0x43, 0x47, 0x47, 0x07, 0x67, 0xc7, 0x8e, 0x1d, 0xe3, 0x29, 0xef, 0x7d, - 0x30, 0x73, 0xf1, 0xe2, 0xc5, 0xbf, 0x81, 0xb4, 0xdd, 0x1f, 0xd9, 0x57, 0x2b, 0x9f, 0x4a, 0x4f, - 0xef, 0x79, 0x37, 0x60, 0xab, 0xf3, 0xb7, 0x13, 0xa7, 0xb5, 0xea, 0x1b, 0x15, 0xd2, 0x55, 0x45, - 0xdf, 0x2a, 0x73, 0x1e, 0xa7, 0x50, 0x99, 0xb3, 0x3e, 0x52, 0xdb, 0x4e, 0xcf, 0xa8, 0xc6, 0x7b, - 0xeb, 0xa1, 0x67, 0x5a, 0x65, 0x07, 0xf7, 0xbb, 0xbd, 0x07, 0x26, 0x61, 0x8a, 0x80, 0xec, 0xbd, - 0x9f, 0xfa, 0x97, 0x27, 0x2e, 0x5d, 0xf8, 0xa9, 0x1d, 0xca, 0x85, 0x85, 0x85, 0x32, 0x75, 0x57, - 0x37, 0xbb, 0xfb, 0xf7, 0xeb, 0x32, 0x4d, 0x45, 0xad, 0x64, 0x55, 0x11, 0xdc, 0xb0, 0xd0, 0xe8, - 0x84, 0x4e, 0x5f, 0x63, 0xd3, 0xf4, 0xb3, 0x7d, 0x98, 0xee, 0x76, 0xd6, 0xd5, 0x32, 0x92, 0x46, - 0x07, 0x44, 0xb7, 0x9a, 0x7c, 0x3b, 0x8b, 0x93, 0x90, 0x6c, 0xf6, 0x95, 0x21, 0x0e, 0x97, 0xa1, - 0x59, 0xd9, 0xc5, 0xf3, 0xff, 0x0e, 0xda, 0xf1, 0x89, 0xc8, 0x26, 0x59, 0x29, 0x92, 0xfe, 0xf8, - 0x4b, 0x2f, 0x5c, 0xd9, 0x3e, 0x1a, 0x59, 0xd9, 0x3a, 0x83, 0xe4, 0xce, 0x92, 0x9c, 0x19, 0xa6, - 0xda, 0x1b, 0xfc, 0x9f, 0xa1, 0x1e, 0xde, 0xf3, 0xff, 0x0e, 0xda, 0x59, 0x53, 0xf4, 0x3f, 0xb3, - 0x44, 0xc4, 0x28, 0x2f, 0x2f, 0xd7, 0x93, 0x3c, 0x00, 0x74, 0xfe, 0x90, 0xeb, 0xe1, 0x85, 0x21, - 0x09, 0x3c, 0x48, 0x1c, 0x85, 0x64, 0xeb, 0xa3, 0x0d, 0x71, 0x71, 0x71, 0x45, 0x09, 0x09, 0x09, - 0x52, 0xf2, 0x27, 0x62, 0x11, 0x12, 0x5b, 0x84, 0x5c, 0x5c, 0x2b, 0x20, 0xb9, 0xb2, 0x08, 0x49, - 0xc8, 0x55, 0x89, 0x8a, 0x8a, 0x92, 0x92, 0xd1, 0x54, 0x05, 0x07, 0x07, 0xbf, 0xf6, 0x0f, 0xc5, - 0xb8, 0xfc, 0x62, 0xa1, 0xff, 0x53, 0xb9, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, - 0x42, 0x60, 0x82, + 0xce, 0x00, 0x00, 0x05, 0x82, 0x49, 0x44, 0x41, 0x54, 0x48, 0x4b, 0xa5, 0x96, 0x4b, 0x4c, 0x5c, + 0x65, 0x18, 0x86, 0x7f, 0x83, 0x34, 0x4d, 0x34, 0x35, 0xd6, 0x05, 0x89, 0x69, 0x62, 0x4c, 0x8c, + 0xd6, 0xd0, 0x88, 0x1b, 0x63, 0x63, 0x5c, 0x19, 0xc3, 0xd2, 0x85, 0x31, 0x2e, 0xdd, 0x35, 0x71, + 0x63, 0x89, 0x0b, 0x17, 0x4d, 0xdc, 0x75, 0x59, 0x8d, 0x0b, 0xee, 0xd7, 0x34, 0xa5, 0x94, 0x60, + 0x68, 0xb8, 0xb5, 0xc0, 0x14, 0x4a, 0x5b, 0x2e, 0x03, 0xc3, 0x70, 0x29, 0xe5, 0x7e, 0x9b, 0x81, + 0x69, 0x61, 0x18, 0xae, 0x33, 0xcc, 0xe1, 0x3a, 0xcc, 0x7c, 0xbe, 0xef, 0x77, 0x3c, 0xc3, 0x4c, + 0xad, 0x1b, 0x3d, 0xc9, 0x1b, 0xce, 0xfc, 0xff, 0x39, 0xdf, 0xf3, 0x5d, 0xff, 0x83, 0x31, 0xc6, + 0x9c, 0xbb, 0x78, 0xf1, 0xe2, 0x87, 0x39, 0x39, 0x39, 0x97, 0xfe, 0x8f, 0x6e, 0xde, 0xcc, 0xac, + 0xa9, 0xad, 0xcd, 0xe8, 0x7f, 0x79, 0x3d, 0x3b, 0x3b, 0xfb, 0x63, 0x30, 0xde, 0x86, 0x4c, 0xf6, + 0x6a, 0x30, 0x18, 0x5e, 0xdf, 0xd8, 0x90, 0x8d, 0xcd, 0x4d, 0xd9, 0xdc, 0xda, 0x12, 0x9f, 0xdf, + 0x2f, 0xdb, 0x3b, 0x3b, 0xb2, 0x13, 0x0e, 0xcb, 0x06, 0xd6, 0x7d, 0x3e, 0x9f, 0x84, 0x23, 0x91, + 0xa4, 0xe6, 0x17, 0x16, 0x64, 0x37, 0x1a, 0x55, 0x3d, 0x7f, 0xfe, 0x1c, 0xef, 0xcc, 0x49, 0x4b, + 0xcb, 0x19, 0x71, 0xb9, 0x8c, 0xcc, 0xcc, 0x34, 0x4b, 0xd4, 0xb2, 0xc4, 0x82, 0xf4, 0xef, 0xde, + 0x5e, 0x0c, 0x8c, 0xcf, 0x09, 0xfa, 0x24, 0x18, 0x0c, 0x5a, 0x3e, 0xff, 0x92, 0xac, 0x85, 0xd6, + 0x55, 0x8d, 0x4d, 0x4d, 0x32, 0xf6, 0xec, 0x99, 0x42, 0x43, 0xeb, 0xf8, 0xdd, 0xd8, 0x28, 0xd3, + 0x33, 0x33, 0x0a, 0xa6, 0x03, 0xdc, 0x5f, 0x5b, 0x5b, 0x93, 0x08, 0xa0, 0x4d, 0xb8, 0x1f, 0xf4, + 0x5e, 0x91, 0xe1, 0x61, 0x23, 0xd3, 0xd3, 0x46, 0xda, 0xdb, 0xbf, 0x4c, 0x3a, 0x41, 0x01, 0x14, + 0x07, 0xe3, 0x0b, 0x05, 0xad, 0x85, 0x42, 0xd6, 0x72, 0x20, 0x20, 0xfe, 0xa5, 0x25, 0x19, 0x7d, + 0xfa, 0x54, 0x18, 0x9d, 0x1a, 0x9f, 0x9e, 0x56, 0xc3, 0x5b, 0xdb, 0xdb, 0x72, 0xff, 0xfe, 0x7d, + 0x8d, 0x94, 0xc6, 0x1f, 0x76, 0x75, 0x09, 0x9c, 0x53, 0x43, 0xcd, 0xcd, 0x55, 0xd2, 0xda, 0x7a, + 0x46, 0x42, 0x21, 0x23, 0x5b, 0x5b, 0x46, 0xa3, 0x5a, 0x5d, 0xed, 0xd5, 0x88, 0xa8, 0xbd, 0x54, + 0x50, 0x08, 0x20, 0xcf, 0xe0, 0xa0, 0x8c, 0x4f, 0x4c, 0x48, 0x49, 0x49, 0x89, 0x02, 0x99, 0x46, + 0x7a, 0x3e, 0x3f, 0x3f, 0xaf, 0xe9, 0x62, 0x84, 0x5e, 0xef, 0x9f, 0x32, 0x3b, 0x57, 0x22, 0x6d, + 0x6d, 0x3f, 0x48, 0x4f, 0xcf, 0xb7, 0xd2, 0xd5, 0xf5, 0x99, 0xdc, 0xbb, 0xf7, 0x86, 0x8c, 0x8d, + 0x19, 0x18, 0x34, 0x72, 0x70, 0xe0, 0x44, 0xf5, 0x8e, 0x74, 0x77, 0x7f, 0x8d, 0x28, 0x7f, 0x44, + 0x2a, 0x7f, 0x4f, 0x5c, 0xbd, 0x6a, 0x7e, 0x56, 0xd0, 0xfa, 0xfa, 0xba, 0xc5, 0x34, 0x4d, 0x21, + 0x82, 0xfc, 0xfc, 0x7c, 0xa9, 0xbe, 0x7d, 0x5b, 0xa3, 0x7a, 0xb1, 0xb2, 0xa2, 0xde, 0xef, 0xee, + 0xee, 0xca, 0xb3, 0xf1, 0x71, 0x19, 0x1a, 0xaa, 0x45, 0x2d, 0xde, 0x52, 0xaf, 0xfd, 0x7e, 0xa3, + 0x51, 0x44, 0x22, 0x46, 0xa2, 0x51, 0x23, 0x89, 0x84, 0x11, 0x11, 0xfb, 0x3e, 0x1c, 0x36, 0x88, + 0xd8, 0xc8, 0xc2, 0x82, 0x81, 0x33, 0x46, 0x1a, 0x1a, 0x0c, 0xa3, 0x02, 0x68, 0x63, 0xc3, 0x62, + 0xca, 0x58, 0x87, 0xfc, 0x82, 0x02, 0x29, 0x80, 0x9e, 0x3c, 0x79, 0x22, 0x68, 0x12, 0xe9, 0x7a, + 0xf4, 0x48, 0x8b, 0x3a, 0x0e, 0xd0, 0x04, 0x22, 0x0e, 0xae, 0xf5, 0x21, 0xad, 0xe7, 0xa4, 0xbf, + 0xdf, 0xc8, 0xe6, 0xa6, 0x91, 0xa3, 0x23, 0x1b, 0x90, 0xaa, 0x58, 0xcc, 0x4e, 0x23, 0x23, 0x6d, + 0x6c, 0xcc, 0x94, 0x6b, 0xd7, 0xcc, 0xaf, 0x0a, 0x42, 0x67, 0x59, 0xac, 0xc3, 0x0c, 0x40, 0x84, + 0x14, 0x14, 0x16, 0x2a, 0x88, 0x05, 0x7f, 0x04, 0x10, 0x0a, 0x2a, 0x13, 0x93, 0x93, 0x32, 0x09, + 0x1d, 0x1c, 0x1c, 0xc0, 0xcb, 0x4a, 0xa4, 0xec, 0xbc, 0xb8, 0xdd, 0x36, 0xec, 0xe4, 0xe4, 0x14, + 0x12, 0x8f, 0xdb, 0x6b, 0x6c, 0x8e, 0xa6, 0xa6, 0xb3, 0xf2, 0xe2, 0x45, 0x53, 0x22, 0x59, 0x23, + 0xd4, 0xc3, 0x5a, 0x44, 0x0b, 0xcf, 0xcc, 0xce, 0x2a, 0xa4, 0xb0, 0xa8, 0x48, 0x41, 0xa8, 0x9d, + 0x3c, 0x7e, 0xfc, 0x58, 0xf6, 0xf7, 0xf7, 0x65, 0x6a, 0x6a, 0x4a, 0x75, 0x78, 0x78, 0x88, 0xfa, + 0xf4, 0x48, 0x20, 0xd0, 0x0d, 0x6f, 0x33, 0xd0, 0xde, 0x36, 0x88, 0xa9, 0x73, 0xb4, 0xba, 0xaa, + 0xe9, 0x82, 0xa3, 0x9d, 0x72, 0x7c, 0x7c, 0x7c, 0xda, 0x0c, 0xa8, 0x8f, 0x35, 0x09, 0x23, 0x04, + 0x11, 0x52, 0x04, 0xf5, 0xf4, 0xf6, 0x2a, 0x88, 0x40, 0x46, 0xc1, 0x0e, 0x64, 0xc4, 0x47, 0x47, + 0x47, 0xd2, 0xab, 0x7b, 0xb3, 0xf0, 0xd8, 0x60, 0xce, 0xec, 0x26, 0x60, 0xaa, 0x28, 0xe7, 0xbe, + 0xa5, 0xc5, 0xa0, 0xeb, 0x02, 0xe9, 0xa0, 0x2d, 0x80, 0xd8, 0xc6, 0x73, 0xe8, 0x30, 0x42, 0x8a, + 0x8a, 0x8b, 0xa5, 0xcf, 0xed, 0xd6, 0x86, 0x60, 0x44, 0x8c, 0x82, 0xd1, 0x10, 0x84, 0x17, 0x35, + 0x22, 0x9f, 0xaf, 0x41, 0x3a, 0x3b, 0x6d, 0xd0, 0xca, 0x8a, 0x91, 0x81, 0x01, 0x5b, 0xbc, 0xe7, + 0x1a, 0xf7, 0x82, 0x41, 0x17, 0xea, 0x15, 0x4b, 0x07, 0x0d, 0x0d, 0x0d, 0xe9, 0xc4, 0x13, 0x52, + 0x0c, 0xb9, 0xfb, 0xfb, 0xc5, 0x8b, 0x35, 0x82, 0x19, 0x05, 0x07, 0x93, 0xb3, 0x84, 0x17, 0x75, + 0xbf, 0xa7, 0xe7, 0x17, 0x44, 0x6b, 0xc4, 0xe3, 0x61, 0x2d, 0xd8, 0x5d, 0x9f, 0x4a, 0x7d, 0xfd, + 0x05, 0xbd, 0xf7, 0x7a, 0x0d, 0xda, 0xdb, 0x60, 0x34, 0xfe, 0x40, 0x5a, 0x4f, 0x4e, 0x41, 0xdb, + 0xdb, 0xdb, 0x56, 0x14, 0xc3, 0xb7, 0x00, 0x10, 0x8d, 0x14, 0x63, 0x96, 0x06, 0x06, 0x06, 0x64, + 0x68, 0x78, 0x58, 0xaa, 0xab, 0xab, 0x35, 0x0a, 0x97, 0xcb, 0x25, 0x1d, 0x1d, 0x1d, 0x0a, 0xaa, + 0xa9, 0xa9, 0x81, 0xc7, 0xdf, 0x68, 0x1d, 0xea, 0xeb, 0xdf, 0x45, 0x93, 0x54, 0xa0, 0x09, 0x4e, + 0xa4, 0xa2, 0xa2, 0x1c, 0xe0, 0xdf, 0xe4, 0xc1, 0x83, 0x0f, 0x74, 0x6f, 0x64, 0xe4, 0xca, 0x3f, + 0x41, 0x73, 0x73, 0x73, 0xb2, 0xb8, 0xb8, 0xa8, 0x20, 0x0e, 0xad, 0xc7, 0xe3, 0x11, 0xac, 0xeb, + 0x1a, 0x8d, 0xf3, 0x24, 0x60, 0x17, 0xe2, 0x45, 0x5d, 0x73, 0xbb, 0xbf, 0x43, 0x43, 0xdc, 0x41, + 0xed, 0x26, 0x75, 0x3f, 0x91, 0x48, 0x00, 0x54, 0xa1, 0xb5, 0x8c, 0xc7, 0x8f, 0x91, 0xda, 0x12, + 0x19, 0x1c, 0xfc, 0xfe, 0x25, 0xd0, 0xce, 0x8e, 0xc5, 0x99, 0xe1, 0xe1, 0x49, 0x48, 0x69, 0x69, + 0x29, 0x1e, 0x1a, 0xd4, 0x48, 0x68, 0x84, 0x22, 0x80, 0x8a, 0xc7, 0xe3, 0x49, 0xd1, 0xb8, 0x23, + 0x5e, 0x95, 0x95, 0x95, 0x5a, 0x47, 0x67, 0x2d, 0x1e, 0x8f, 0xf1, 0xb9, 0x53, 0xd0, 0x0e, 0x40, + 0xec, 0x30, 0x9e, 0x65, 0x84, 0x50, 0xac, 0xd9, 0xbf, 0x41, 0x5e, 0x06, 0xf0, 0xe2, 0x7a, 0x79, + 0x79, 0xb9, 0xce, 0x1a, 0xdf, 0x71, 0x9c, 0x4c, 0xeb, 0x3a, 0x82, 0x46, 0x46, 0x46, 0x34, 0x22, + 0x42, 0xca, 0xca, 0xca, 0x30, 0x70, 0xc3, 0xda, 0x04, 0x3c, 0x44, 0x09, 0xe1, 0x2c, 0xb1, 0xcd, + 0x69, 0x9c, 0x87, 0x25, 0x0d, 0xf3, 0x0a, 0xe3, 0x44, 0xa7, 0x41, 0x3e, 0xcb, 0x6c, 0x3c, 0xc5, + 0x09, 0xe3, 0x1c, 0xa8, 0x14, 0xde, 0x4b, 0x07, 0xed, 0xc3, 0xc8, 0x12, 0x0e, 0x53, 0x07, 0x44, + 0xf0, 0xd8, 0xd8, 0x98, 0xd4, 0xd5, 0xd5, 0x29, 0xa8, 0x0b, 0x67, 0x1e, 0x67, 0x8a, 0x20, 0xae, + 0xcd, 0x62, 0xe6, 0xd8, 0x40, 0x7c, 0x96, 0xf5, 0xe3, 0x3d, 0x4f, 0x15, 0xa6, 0x1c, 0x5d, 0x9c, + 0x14, 0x1c, 0x3d, 0x01, 0xe3, 0xb2, 0x0d, 0x0a, 0x87, 0x2d, 0xce, 0x49, 0x2a, 0x68, 0x74, 0x74, + 0x54, 0x61, 0x4c, 0x07, 0xbd, 0x6f, 0x6d, 0x6d, 0xc5, 0xa9, 0xdd, 0xa6, 0xa0, 0xaa, 0xaa, 0x2a, + 0xf5, 0x9c, 0xd1, 0xdc, 0xb8, 0x71, 0x43, 0xeb, 0x42, 0xa3, 0x7d, 0x7d, 0x7d, 0x7a, 0xda, 0x2f, + 0x2f, 0x2f, 0xab, 0xfc, 0x28, 0xc5, 0xdd, 0xbb, 0x77, 0x1f, 0x82, 0xf1, 0x9e, 0x82, 0xf0, 0x82, + 0xb6, 0xf7, 0x12, 0x36, 0x09, 0x61, 0xf7, 0x30, 0x1a, 0xd6, 0x8d, 0x00, 0x82, 0xf8, 0x9b, 0xe2, + 0xc5, 0x35, 0xee, 0x31, 0x9d, 0xfd, 0x98, 0x37, 0x46, 0xd8, 0xde, 0xde, 0x8e, 0xb6, 0x7e, 0xa0, + 0x83, 0x4d, 0x00, 0x0f, 0x60, 0xd8, 0x6a, 0x87, 0xfd, 0xf7, 0xa1, 0xcc, 0x24, 0x88, 0x9f, 0xe4, + 0x00, 0x3e, 0x7e, 0xb7, 0x6e, 0xdd, 0xc2, 0xb0, 0x75, 0x6b, 0xce, 0xe9, 0xb1, 0x1b, 0x27, 0x04, + 0x41, 0x9c, 0x31, 0x8a, 0x17, 0xd7, 0x36, 0xf1, 0xbd, 0xa2, 0x73, 0x8c, 0x84, 0xc6, 0xef, 0xd4, + 0xd6, 0xea, 0x1e, 0xd7, 0xe9, 0xd0, 0xf5, 0xeb, 0xd7, 0xef, 0xfc, 0x1d, 0xc9, 0xeb, 0x58, 0x26, + 0xc7, 0x06, 0x31, 0x7c, 0x16, 0x9b, 0xc5, 0x77, 0xba, 0x8d, 0xe9, 0xb1, 0xe7, 0xc2, 0x06, 0x71, + 0x7e, 0x98, 0x3a, 0x1a, 0xf6, 0x7a, 0xbd, 0xea, 0x08, 0xbe, 0x65, 0xba, 0xce, 0x63, 0x89, 0x51, + 0xa2, 0x89, 0x12, 0x79, 0x79, 0x79, 0x45, 0xb0, 0x7b, 0xc1, 0x81, 0xa4, 0x81, 0xd8, 0x21, 0x8c, + 0x82, 0x30, 0xa6, 0x84, 0x03, 0x4b, 0x90, 0xd3, 0xd2, 0xa9, 0x20, 0xb6, 0x2e, 0x8b, 0xce, 0x4f, + 0x08, 0xb3, 0xc0, 0x08, 0xd8, 0xd6, 0x48, 0x63, 0x2c, 0x37, 0x37, 0xf7, 0x27, 0xd8, 0xcc, 0x82, + 0x32, 0x1c, 0x48, 0x1a, 0x88, 0x0f, 0x13, 0xc4, 0xf9, 0x61, 0x87, 0x31, 0xc2, 0xd4, 0xd9, 0xc1, + 0xb7, 0x5f, 0x1d, 0x70, 0x40, 0xfc, 0xcd, 0x11, 0x68, 0x68, 0x68, 0xc0, 0xff, 0x0d, 0xcd, 0x3c, + 0xa2, 0x22, 0x59, 0x59, 0x59, 0x5f, 0xc1, 0xde, 0x9b, 0xd0, 0x6b, 0xa9, 0x10, 0x07, 0x74, 0x09, + 0xed, 0x19, 0x84, 0x91, 0x18, 0xa2, 0x89, 0xe1, 0xa4, 0x4e, 0x0a, 0xe0, 0x18, 0x8c, 0x26, 0xc5, + 0x8b, 0x7f, 0xb9, 0x87, 0x0c, 0xc4, 0x90, 0xe6, 0x18, 0x6a, 0x12, 0x03, 0xc4, 0x03, 0x3b, 0x1f, + 0x41, 0x67, 0x5f, 0x05, 0x71, 0x40, 0xfc, 0xe7, 0x2e, 0x1b, 0xca, 0xf9, 0x8f, 0xe2, 0xbb, 0xe7, + 0x4d, 0x4a, 0x3d, 0x5e, 0xa5, 0xbf, 0x00, 0x97, 0xfc, 0xbf, 0x4b, 0x82, 0x71, 0x63, 0x29, 0x00, + 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, }; const BITMAP_OPAQUE new_pcb_xpm[1] = {{ png, sizeof( png ), "new_pcb_xpm" }}; diff --git a/bitmaps_png/cpp_26/open_brd_file.cpp b/bitmaps_png/cpp_26/open_brd_file.cpp index 22eb41aa35..e9cb719ede 100644 --- a/bitmaps_png/cpp_26/open_brd_file.cpp +++ b/bitmaps_png/cpp_26/open_brd_file.cpp @@ -8,90 +8,85 @@ static const unsigned char png[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c, - 0xce, 0x00, 0x00, 0x05, 0x25, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0x96, 0x7b, 0x4c, 0x9b, - 0x55, 0x18, 0xc6, 0x61, 0x98, 0x68, 0x8c, 0x81, 0x60, 0xb2, 0xf9, 0xcf, 0x34, 0x81, 0x68, 0x28, - 0x97, 0xe1, 0x10, 0x36, 0x36, 0x22, 0x08, 0x71, 0x8e, 0x65, 0x13, 0xe2, 0xc0, 0x0d, 0xdd, 0x84, - 0x29, 0x6c, 0x12, 0x90, 0xcb, 0x1f, 0x5e, 0x18, 0x09, 0x62, 0xc6, 0x74, 0x13, 0x76, 0x41, 0x37, - 0x66, 0xdc, 0xcd, 0xcd, 0x84, 0x19, 0x71, 0x0c, 0x98, 0xeb, 0xc6, 0xa0, 0x5c, 0x56, 0xb0, 0x40, - 0x29, 0xa5, 0x74, 0xa3, 0x50, 0x2e, 0x2d, 0x94, 0xb6, 0x14, 0x81, 0xb6, 0x40, 0xcb, 0xfd, 0xf2, - 0x78, 0xce, 0x59, 0xca, 0x5a, 0x9c, 0xa3, 0xd1, 0xf8, 0x25, 0x4f, 0x7b, 0xbe, 0x7c, 0xed, 0xf3, - 0x3b, 0xef, 0xfb, 0x9e, 0xf3, 0x9e, 0xcf, 0xc1, 0xc1, 0xc1, 0xe1, 0xb9, 0xb5, 0x6b, 0xd7, 0xbe, - 0xee, 0xe6, 0xe6, 0x16, 0xf2, 0x7f, 0x89, 0x30, 0xd6, 0x3b, 0xd0, 0x0f, 0xb9, 0x5c, 0xde, 0x3f, - 0x36, 0x36, 0x86, 0xde, 0xda, 0x3a, 0x08, 0x8e, 0x9d, 0x86, 0x20, 0xf7, 0x3b, 0x34, 0x9e, 0x38, - 0x03, 0xe1, 0x99, 0x1f, 0x61, 0x1c, 0x1e, 0x81, 0xd9, 0x6c, 0x86, 0x41, 0x3b, 0x08, 0xbd, 0x46, - 0x0b, 0xf3, 0xe4, 0x24, 0x26, 0xf4, 0x06, 0x0c, 0xf7, 0x28, 0x30, 0x39, 0x35, 0xc5, 0x34, 0x45, - 0xbf, 0x4d, 0x66, 0x18, 0x07, 0x75, 0x98, 0x9a, 0x9e, 0xb6, 0xd1, 0xfc, 0xfc, 0x3c, 0x08, 0x23, - 0x94, 0x81, 0xba, 0xba, 0xbb, 0x35, 0x83, 0xba, 0x21, 0xf4, 0x3d, 0x68, 0x47, 0x47, 0x45, 0x15, - 0x3a, 0x2a, 0xab, 0xd1, 0xc9, 0xab, 0x81, 0xf8, 0xea, 0x2f, 0x28, 0x7b, 0x2f, 0x01, 0x43, 0x03, - 0x6a, 0x28, 0x05, 0x4d, 0x28, 0x8d, 0x8a, 0xc5, 0x90, 0x42, 0x09, 0xad, 0xac, 0x13, 0x25, 0xef, - 0xec, 0x87, 0xfa, 0x81, 0x0c, 0xe3, 0xe3, 0xe3, 0x18, 0x9f, 0x98, 0xc0, 0x9f, 0x7d, 0xfd, 0xa8, - 0x4c, 0xfd, 0x02, 0x13, 0x64, 0x6c, 0xad, 0x99, 0x99, 0x99, 0x47, 0xa0, 0x6f, 0x45, 0xf9, 0xa6, - 0x93, 0x6d, 0x67, 0x71, 0x52, 0x5a, 0x80, 0x53, 0x44, 0xa7, 0xef, 0x9f, 0x43, 0x9d, 0xaa, 0x01, - 0x7a, 0x83, 0x01, 0x9d, 0xb7, 0x2b, 0x50, 0xb6, 0xf7, 0x23, 0x0c, 0xab, 0x35, 0x50, 0x36, 0x08, - 0x51, 0x1a, 0x1d, 0xf7, 0x10, 0xd6, 0xde, 0x81, 0x92, 0xdd, 0x1f, 0xb0, 0x6f, 0x93, 0xc9, 0x84, - 0x91, 0x7e, 0x15, 0x03, 0x99, 0x48, 0xf4, 0xd6, 0x9a, 0x9d, 0x9d, 0x7d, 0x04, 0xda, 0x53, 0xf7, - 0xe1, 0x62, 0xe4, 0xbd, 0xf7, 0xb1, 0x52, 0xc7, 0xda, 0x4e, 0x41, 0x35, 0xaa, 0x86, 0xf0, 0xec, - 0x05, 0xc8, 0x6e, 0xfc, 0xce, 0x66, 0xde, 0x5e, 0x54, 0x82, 0x96, 0x73, 0x97, 0x98, 0x89, 0xa2, - 0x9a, 0x8f, 0xfa, 0x9c, 0x3c, 0x96, 0x4e, 0x3d, 0x89, 0x9a, 0x97, 0x96, 0x81, 0x49, 0x32, 0xb6, - 0xd6, 0xdc, 0xdc, 0xdc, 0xea, 0x20, 0xaa, 0x52, 0xc5, 0x2d, 0x48, 0xae, 0x5c, 0x43, 0x7b, 0xf1, - 0x4d, 0x36, 0x73, 0xf9, 0xad, 0xbb, 0x10, 0x11, 0x30, 0x35, 0x51, 0x35, 0x89, 0xf0, 0xc7, 0x91, - 0x5c, 0x56, 0x23, 0x03, 0x89, 0x98, 0x82, 0xa6, 0x49, 0x5d, 0xac, 0x65, 0x53, 0xa3, 0xd5, 0x40, - 0x6d, 0xa4, 0x56, 0x1d, 0x24, 0x22, 0x3a, 0xf3, 0x2e, 0x6e, 0x05, 0x5a, 0x0a, 0x2e, 0x32, 0x73, - 0x75, 0xb3, 0x18, 0x02, 0x12, 0xd1, 0x34, 0xa9, 0xc3, 0x18, 0x59, 0x2c, 0x55, 0xe9, 0x87, 0x59, - 0x4d, 0xac, 0x65, 0x37, 0xa8, 0x4c, 0xc9, 0x5d, 0x06, 0x51, 0xf3, 0xee, 0x3b, 0x3c, 0x88, 0x49, - 0xea, 0xa8, 0x89, 0x46, 0xd4, 0xca, 0x40, 0xb4, 0x0e, 0xe3, 0x64, 0xc5, 0x51, 0x10, 0x4d, 0x95, - 0xb5, 0x16, 0x16, 0x16, 0xec, 0x03, 0xfd, 0x2c, 0xba, 0x86, 0x43, 0x91, 0xbb, 0xf1, 0xe6, 0xe6, - 0x40, 0x44, 0x44, 0x44, 0x60, 0xdb, 0x96, 0x20, 0x84, 0xfa, 0xfa, 0xb1, 0x71, 0xf8, 0x1b, 0xa1, - 0x08, 0xf6, 0xf4, 0x66, 0xe3, 0x5d, 0xe1, 0x3b, 0xb0, 0xcb, 0x67, 0x23, 0x24, 0x12, 0x09, 0x8b, - 0xc2, 0xa2, 0xc5, 0xc5, 0x45, 0x38, 0x39, 0x39, 0x85, 0xad, 0x0a, 0xda, 0xfc, 0xd6, 0x16, 0x7c, - 0x12, 0xbd, 0x17, 0xe7, 0xb3, 0xbe, 0x82, 0x4a, 0xa5, 0xc2, 0x4f, 0x47, 0x8f, 0xe3, 0x78, 0x42, - 0x22, 0x06, 0x06, 0x06, 0x50, 0x76, 0xf9, 0x0a, 0x32, 0x77, 0xef, 0x81, 0x5a, 0xad, 0x46, 0x3d, - 0xaf, 0x0a, 0x07, 0xb6, 0x06, 0x23, 0x20, 0x20, 0x80, 0xd5, 0xcf, 0x1a, 0xb4, 0x6e, 0xdd, 0xba, - 0xed, 0xab, 0x82, 0x5e, 0xf6, 0x7d, 0x05, 0xbe, 0x3e, 0x1b, 0x10, 0x1a, 0x1c, 0xcc, 0x52, 0xf1, - 0xf6, 0xce, 0x9d, 0xf0, 0xf4, 0xf0, 0x60, 0x26, 0x07, 0xe3, 0xe3, 0xf1, 0xbc, 0xab, 0x2b, 0x1b, - 0x7f, 0x99, 0x95, 0x05, 0x47, 0x47, 0x47, 0x24, 0x26, 0x26, 0xa2, 0xb1, 0xb1, 0x91, 0xa5, 0x8c, - 0xca, 0x6e, 0x90, 0x87, 0x9f, 0x07, 0xfc, 0xfd, 0xfd, 0x11, 0x16, 0x16, 0xc6, 0x40, 0x51, 0x51, - 0x51, 0xe0, 0x70, 0x38, 0xcc, 0x3c, 0x39, 0x39, 0x19, 0xae, 0x04, 0x44, 0x0d, 0x73, 0x72, 0x72, - 0x68, 0x2d, 0x90, 0x92, 0x92, 0x02, 0x81, 0x40, 0xc0, 0x00, 0x16, 0xd9, 0x0d, 0xe2, 0xf3, 0xf9, - 0x10, 0x0a, 0x85, 0xcc, 0x5c, 0x2c, 0x16, 0xa3, 0xa6, 0xa6, 0x86, 0x99, 0x77, 0x76, 0x76, 0x82, - 0xcb, 0xe5, 0x32, 0x33, 0x8d, 0x46, 0x83, 0xa2, 0xa2, 0x22, 0xa4, 0xa5, 0xa5, 0xd9, 0x80, 0x96, - 0x96, 0x96, 0xec, 0x05, 0x71, 0x6c, 0x8a, 0x6b, 0x49, 0x89, 0x25, 0x2d, 0xd6, 0x86, 0x54, 0xe9, - 0xe9, 0xe9, 0x68, 0x68, 0x68, 0x58, 0xbe, 0xa7, 0x72, 0x76, 0x76, 0xde, 0x66, 0x17, 0x68, 0x64, - 0x64, 0x04, 0x06, 0xd2, 0x8e, 0xa8, 0x39, 0x6d, 0xbe, 0xf4, 0x9e, 0x9a, 0xd3, 0xe5, 0x3e, 0x34, - 0x34, 0xc4, 0xcc, 0xe8, 0x24, 0x68, 0x54, 0x14, 0x44, 0x6b, 0x64, 0xb9, 0xe8, 0x33, 0xbb, 0x96, - 0x37, 0x05, 0xd1, 0xfa, 0xd0, 0xda, 0x50, 0x50, 0x5c, 0x5c, 0x1c, 0x82, 0x82, 0x82, 0x98, 0x41, - 0x46, 0x46, 0x06, 0xdc, 0xdd, 0xdd, 0xd9, 0x38, 0x3f, 0x3f, 0x9f, 0xce, 0x1c, 0xa9, 0xa9, 0xa9, - 0x2c, 0x22, 0x4b, 0x94, 0xf4, 0xb2, 0x1b, 0xe4, 0xeb, 0xeb, 0x8b, 0x90, 0x90, 0x10, 0xf6, 0xe7, - 0xc8, 0xc8, 0x48, 0x78, 0x90, 0x55, 0x47, 0x4d, 0xe8, 0x0a, 0x73, 0x71, 0x71, 0x61, 0x66, 0xd9, - 0xd9, 0xd9, 0x78, 0x7a, 0xcd, 0x1a, 0x24, 0x25, 0x25, 0xb1, 0x9a, 0xd2, 0x68, 0x69, 0x0b, 0x9a, - 0xb1, 0xb7, 0xd7, 0x71, 0xfc, 0x3d, 0x71, 0x74, 0xdf, 0x01, 0x14, 0xa4, 0x7f, 0xca, 0x40, 0x97, - 0x32, 0xb3, 0x71, 0x22, 0x26, 0x96, 0x81, 0xae, 0x9f, 0xfd, 0x01, 0xdf, 0x84, 0x47, 0xb2, 0xb4, - 0xf1, 0x78, 0x3c, 0x7c, 0xbd, 0x29, 0x04, 0x01, 0x5e, 0xde, 0x90, 0x4a, 0xa5, 0x6c, 0x9f, 0x69, - 0xb5, 0x5a, 0x0c, 0x8e, 0xe8, 0xe7, 0x09, 0x23, 0xf8, 0x89, 0xa0, 0x28, 0x7e, 0x2c, 0xce, 0xdf, - 0xbc, 0x88, 0x4d, 0x9e, 0x5e, 0x78, 0xd5, 0x83, 0x83, 0xc0, 0xc0, 0x40, 0x6c, 0xe4, 0x78, 0x62, - 0x83, 0x9b, 0x3b, 0x1b, 0xbf, 0x46, 0xf6, 0x97, 0xd7, 0xfa, 0x97, 0xd8, 0x26, 0xf5, 0xf3, 0xf3, - 0x83, 0x8f, 0xb7, 0x37, 0x0e, 0xf9, 0x6f, 0x45, 0xe1, 0x8e, 0x68, 0x94, 0x17, 0x90, 0x8e, 0xdf, - 0xd5, 0xb3, 0xf0, 0xd9, 0xe1, 0xcc, 0x0b, 0x84, 0xf1, 0x0c, 0x03, 0x15, 0xb7, 0x97, 0xe9, 0xab, - 0x35, 0x7c, 0x50, 0xd5, 0x68, 0xeb, 0x50, 0x3b, 0x58, 0xcf, 0xd4, 0x3f, 0x31, 0x80, 0x59, 0xf3, - 0x24, 0xca, 0xe3, 0x53, 0xa0, 0x13, 0xb7, 0xb1, 0x28, 0xfa, 0x2a, 0x6b, 0x21, 0x3d, 0x7f, 0x95, - 0x8d, 0x8d, 0xe4, 0x68, 0x28, 0x7b, 0xf7, 0x00, 0xe4, 0x12, 0x29, 0xee, 0xf1, 0xeb, 0x50, 0x59, - 0xc9, 0x43, 0x5b, 0x9b, 0x14, 0x3a, 0x9d, 0x0e, 0xbd, 0x0a, 0xc5, 0xd2, 0xc1, 0xa4, 0xe4, 0x7c, - 0xe2, 0xef, 0xf4, 0xb0, 0x4c, 0x04, 0xa4, 0x54, 0x2a, 0x35, 0x34, 0x9f, 0xa3, 0xbd, 0x4a, 0x08, - 0xf3, 0xbe, 0x5f, 0x56, 0x33, 0x39, 0xce, 0xb9, 0xfb, 0x3f, 0x86, 0x82, 0x74, 0x6c, 0x4b, 0x71, - 0x35, 0x02, 0x21, 0xe4, 0x45, 0xa5, 0x6c, 0x61, 0xd0, 0x23, 0xbe, 0x9d, 0x9c, 0xc6, 0xd7, 0xf7, - 0x25, 0xe0, 0xd7, 0xa2, 0xdf, 0xd8, 0xf3, 0xd9, 0xd9, 0x19, 0xc8, 0x3a, 0x64, 0x4b, 0x31, 0x71, - 0xb1, 0x9f, 0x53, 0x80, 0x45, 0x36, 0x20, 0x33, 0x79, 0x17, 0xd0, 0xb6, 0x48, 0x30, 0x48, 0x66, - 0x4f, 0xa5, 0x6b, 0x95, 0xc2, 0xa0, 0xe8, 0xb3, 0xd9, 0x2b, 0x96, 0x25, 0x4b, 0xbb, 0x84, 0xd1, - 0x68, 0x84, 0x4c, 0x26, 0xc3, 0x6d, 0xee, 0x1d, 0x94, 0x97, 0xdf, 0x25, 0xc5, 0x9f, 0x42, 0x53, - 0xb3, 0x70, 0x21, 0x7a, 0x5f, 0x4c, 0x9c, 0x35, 0xe4, 0x6f, 0x20, 0xda, 0xee, 0xa9, 0xc1, 0xca, - 0xcd, 0xf9, 0x38, 0x10, 0xfd, 0xed, 0xe8, 0xe8, 0x28, 0x5a, 0x5a, 0xc4, 0xb8, 0x51, 0x52, 0x02, - 0x25, 0x39, 0xca, 0x6f, 0x55, 0x54, 0x98, 0xc2, 0xb6, 0x87, 0x05, 0xae, 0x84, 0xfc, 0x27, 0x10, - 0x3d, 0x8f, 0xe8, 0xc6, 0x15, 0x89, 0x5a, 0xd0, 0xd8, 0x2a, 0x59, 0xba, 0x5c, 0x58, 0xd8, 0x4b, - 0x5a, 0xcd, 0x0b, 0x8f, 0x83, 0x2c, 0x83, 0xba, 0xbb, 0xbb, 0xfb, 0x2d, 0x80, 0x95, 0xad, 0xc5, - 0xba, 0xbd, 0xd8, 0x44, 0x44, 0x7e, 0xaf, 0x37, 0x8e, 0xe3, 0xbe, 0xbc, 0x67, 0xfe, 0x48, 0x6e, - 0x5e, 0x31, 0xf1, 0x79, 0xf6, 0x9f, 0x20, 0x16, 0xd0, 0xbf, 0x7e, 0x81, 0x7c, 0x91, 0x88, 0x74, - 0x83, 0x4d, 0xc4, 0xe3, 0xa9, 0x27, 0x41, 0xa8, 0xfe, 0x02, 0x33, 0x31, 0x2c, 0x1a, 0x6a, 0xeb, - 0x4f, 0x55, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, + 0xce, 0x00, 0x00, 0x04, 0xd4, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0x96, 0x49, 0x4f, 0x5d, + 0x75, 0x18, 0x87, 0x31, 0x6a, 0xe2, 0xc2, 0x98, 0xe8, 0x86, 0x8d, 0x89, 0x71, 0xa3, 0x18, 0x1a, + 0x59, 0x6a, 0x5c, 0xba, 0xe0, 0xdb, 0x98, 0x7e, 0x08, 0x16, 0x5d, 0xb0, 0x64, 0x86, 0x96, 0x05, + 0x94, 0x36, 0x1d, 0x80, 0x96, 0x99, 0x36, 0x05, 0x0a, 0x65, 0x86, 0x32, 0xcf, 0x73, 0x69, 0x65, + 0x86, 0x0b, 0x1c, 0xc6, 0x0b, 0xbc, 0xfe, 0x9e, 0x57, 0xcf, 0xe5, 0x5c, 0x5b, 0x63, 0x62, 0xe2, + 0x49, 0xde, 0x1c, 0xee, 0xff, 0x9c, 0xfb, 0x7b, 0xde, 0xf9, 0x92, 0x92, 0x92, 0x92, 0xf2, 0x45, + 0x5a, 0x5a, 0xda, 0x77, 0x19, 0x19, 0x19, 0x37, 0xfe, 0x0f, 0x4b, 0x4f, 0x4f, 0xff, 0x41, 0x8c, + 0x2f, 0x65, 0x29, 0xe9, 0xbf, 0xaf, 0xad, 0xc5, 0x36, 0xb7, 0xb6, 0x6c, 0x6b, 0x7b, 0xdb, 0xb6, + 0x77, 0x76, 0x6c, 0x71, 0x69, 0xc9, 0x76, 0xf7, 0xf6, 0x6c, 0x2f, 0x16, 0xb3, 0x2d, 0x9d, 0x2f, + 0x2e, 0x2e, 0x5a, 0x6c, 0x7f, 0x3f, 0x61, 0x73, 0xf3, 0xf3, 0x76, 0x70, 0x78, 0xe8, 0xb6, 0xba, + 0xba, 0x6a, 0x87, 0x41, 0x60, 0x83, 0xaf, 0x5f, 0x5b, 0x4d, 0x6d, 0xad, 0xad, 0xbe, 0x7d, 0xeb, + 0x9f, 0x03, 0x99, 0xdf, 0x8f, 0x8e, 0xe2, 0x62, 0xfc, 0x04, 0xe8, 0xc7, 0xb5, 0xb5, 0xb5, 0x60, + 0x71, 0x69, 0xd9, 0xd6, 0x37, 0x36, 0xdd, 0x9e, 0x3c, 0x7d, 0x6a, 0x23, 0xa3, 0xa3, 0x0e, 0xdd, + 0xd8, 0xd4, 0xe7, 0x27, 0x4f, 0x6c, 0x6a, 0x7a, 0xda, 0xc1, 0x38, 0xc0, 0xf3, 0xf5, 0xf5, 0x75, + 0xdb, 0x17, 0xf4, 0xa9, 0xfe, 0xde, 0x3f, 0x38, 0xb0, 0x87, 0x0f, 0x1f, 0x5a, 0x5e, 0x5e, 0x9e, + 0x03, 0x43, 0x27, 0x30, 0x81, 0x2e, 0xc5, 0xf8, 0xc5, 0x41, 0xeb, 0x1b, 0x1b, 0xc1, 0xca, 0x9b, + 0x37, 0xb6, 0xb4, 0xbc, 0x6c, 0x43, 0xc3, 0xc3, 0x46, 0x74, 0x2e, 0x3e, 0x35, 0xe5, 0xc2, 0x3b, + 0xbb, 0xbb, 0x56, 0x5f, 0x5f, 0xef, 0x91, 0x22, 0xfe, 0xa2, 0xa5, 0xc5, 0xe4, 0x9c, 0x0b, 0xd5, + 0xd4, 0xd4, 0xd8, 0xa1, 0xee, 0x8f, 0x1e, 0x3d, 0xb2, 0xfc, 0xfc, 0x7c, 0x1b, 0x1a, 0x1a, 0xf2, + 0x68, 0x42, 0x3b, 0x8a, 0x82, 0x36, 0x04, 0xea, 0xed, 0xeb, 0xb3, 0xb1, 0xf1, 0x71, 0x2b, 0x2c, + 0x2c, 0x74, 0x20, 0x69, 0xc4, 0xf3, 0xb9, 0xb9, 0x39, 0x4f, 0x17, 0x11, 0x8e, 0xca, 0x10, 0x6f, + 0x6d, 0x6d, 0x55, 0xe4, 0x1b, 0x2e, 0x54, 0x5b, 0x57, 0x87, 0x98, 0x3d, 0x7e, 0xfc, 0xd8, 0x0a, + 0x0a, 0x0a, 0x6c, 0x58, 0x8e, 0x1e, 0x1d, 0x1f, 0x27, 0xec, 0xf8, 0xe4, 0xe4, 0x1a, 0xb4, 0xb9, + 0xb9, 0x19, 0x90, 0xa6, 0x49, 0x45, 0x90, 0x93, 0x93, 0x63, 0xe5, 0x77, 0xef, 0x7a, 0x54, 0x6f, + 0xdf, 0xbd, 0x73, 0xef, 0x0f, 0x94, 0x9a, 0xd1, 0xb1, 0x31, 0x1b, 0x93, 0x21, 0xde, 0xda, 0xd6, + 0x66, 0x72, 0xce, 0x85, 0xea, 0x04, 0x3a, 0xd6, 0xbd, 0xb2, 0xb2, 0xd2, 0x9d, 0x1c, 0x19, 0x19, + 0xb1, 0x93, 0x93, 0x93, 0xa8, 0x45, 0x40, 0x5b, 0x5b, 0x01, 0x29, 0xa3, 0x0e, 0x39, 0xb9, 0xb9, + 0x96, 0x2b, 0x7b, 0xf9, 0xf2, 0xa5, 0xa9, 0x49, 0xac, 0x45, 0xde, 0x53, 0x54, 0x20, 0xe3, 0x8a, + 0x18, 0x71, 0x9e, 0xe1, 0x08, 0x42, 0xa4, 0xf4, 0xf4, 0xf4, 0xd4, 0xaa, 0xaa, 0xaa, 0xac, 0xa8, + 0xa8, 0xc8, 0xa3, 0x3e, 0x3d, 0x3b, 0xb3, 0x33, 0x19, 0x77, 0x3d, 0xbb, 0x06, 0xa9, 0xb3, 0x02, + 0xea, 0x30, 0x2d, 0x10, 0x90, 0x5c, 0x15, 0x15, 0x31, 0x0a, 0x4e, 0x9a, 0x54, 0x50, 0x1b, 0x9f, + 0x98, 0xb0, 0x09, 0x19, 0xe2, 0xed, 0xed, 0xed, 0xb6, 0xad, 0xd4, 0x02, 0x68, 0x6c, 0x6c, 0x74, + 0xd1, 0xea, 0xea, 0x6a, 0x2b, 0x2e, 0x2e, 0x76, 0x67, 0xce, 0xcf, 0xcf, 0xa3, 0x16, 0x01, 0x6d, + 0x6f, 0x07, 0x0b, 0x6a, 0xe1, 0xe9, 0x99, 0x19, 0x87, 0xe4, 0xa9, 0xa8, 0x80, 0x48, 0x4f, 0x9b, + 0xd2, 0x44, 0x6a, 0x26, 0x27, 0x27, 0xdd, 0x10, 0xef, 0xe8, 0xe8, 0xb0, 0x1d, 0xa5, 0x1a, 0x21, + 0x40, 0xdc, 0x01, 0x95, 0x94, 0x94, 0xb8, 0x33, 0xf1, 0x78, 0x3c, 0x61, 0x49, 0x20, 0xd5, 0x27, + 0x98, 0x90, 0x08, 0x20, 0x20, 0x74, 0x4f, 0xc7, 0xab, 0x57, 0x0e, 0x02, 0x48, 0x14, 0x74, 0x20, + 0x11, 0xe3, 0xfd, 0x2b, 0x3d, 0xdb, 0x55, 0x06, 0x10, 0x6a, 0x6a, 0x6a, 0xf2, 0x7b, 0x43, 0x43, + 0x43, 0x12, 0xe8, 0xe2, 0xe2, 0xe2, 0x7d, 0x90, 0xbc, 0x0b, 0x68, 0xe3, 0x59, 0x75, 0x18, 0x90, + 0x7c, 0x75, 0x4f, 0x67, 0x57, 0x97, 0xd7, 0x81, 0x88, 0x88, 0x82, 0x68, 0x00, 0xe1, 0x3d, 0x11, + 0xed, 0xe9, 0x7d, 0x84, 0x88, 0x08, 0x51, 0x3a, 0x2f, 0x04, 0xf1, 0x39, 0x34, 0xbd, 0x93, 0x0c, + 0x1a, 0x18, 0x18, 0xf0, 0x89, 0x07, 0x42, 0x9b, 0x76, 0x75, 0x77, 0x5b, 0xbf, 0xce, 0x00, 0x13, + 0x05, 0x83, 0x49, 0xe1, 0x11, 0xe7, 0x79, 0xd8, 0x81, 0xb7, 0x6e, 0xdd, 0xf2, 0xe8, 0x2e, 0x2f, + 0x2f, 0xed, 0xf6, 0xed, 0xdb, 0xee, 0x10, 0x7f, 0x87, 0x26, 0xd8, 0x35, 0x48, 0x2f, 0x06, 0x0c, + 0xdd, 0xbc, 0x40, 0x88, 0x14, 0xa8, 0x4d, 0x7b, 0x7a, 0x7a, 0x6c, 0x60, 0x70, 0xd0, 0xca, 0xcb, + 0xcb, 0x3d, 0x8a, 0xe6, 0xe6, 0x66, 0x7b, 0xfe, 0xfc, 0xb9, 0x83, 0x2a, 0x2a, 0x2a, 0xbc, 0xbb, + 0x18, 0x5e, 0xc4, 0x19, 0xde, 0x10, 0x44, 0x8a, 0xaf, 0xae, 0xae, 0x12, 0xf6, 0x1e, 0x68, 0x76, + 0x76, 0xd6, 0x16, 0x16, 0x16, 0x1c, 0xc4, 0x3c, 0xf4, 0xf6, 0xf6, 0xba, 0xa7, 0x9c, 0x21, 0x8e, + 0x18, 0x5d, 0x48, 0x3a, 0x38, 0x63, 0xb6, 0x10, 0x47, 0x98, 0xe7, 0x88, 0xfe, 0x3b, 0x68, 0x6f, + 0x2f, 0x60, 0x66, 0x58, 0x9e, 0x40, 0x98, 0x87, 0x3e, 0x6d, 0x0a, 0x22, 0x09, 0xbb, 0x27, 0xcc, + 0x79, 0x34, 0x2d, 0x51, 0x41, 0xae, 0x3b, 0x77, 0xee, 0x78, 0x1d, 0xa3, 0xe7, 0x7a, 0xef, 0x1a, + 0xa4, 0xc2, 0x06, 0x74, 0x18, 0xbb, 0x0c, 0x08, 0x46, 0xcd, 0xfe, 0x09, 0xf2, 0x77, 0x00, 0x17, + 0xe7, 0xd1, 0xae, 0x0b, 0x9d, 0x4c, 0xea, 0x3a, 0x40, 0xaf, 0xb5, 0x75, 0x89, 0x08, 0x08, 0x83, + 0x37, 0xa8, 0xfa, 0xd0, 0x04, 0xd4, 0x01, 0x08, 0xb3, 0x44, 0x9b, 0x23, 0x4e, 0x13, 0x20, 0xcc, + 0x15, 0xd3, 0x46, 0x47, 0x90, 0x77, 0xc9, 0x06, 0xbb, 0x2e, 0xba, 0x54, 0xf5, 0xbd, 0x64, 0x90, + 0x96, 0x9f, 0x2d, 0x6b, 0x99, 0x86, 0x20, 0xc0, 0xec, 0xad, 0x07, 0x0f, 0x1e, 0x38, 0xa8, 0x45, + 0x3b, 0x8f, 0x99, 0x02, 0xc4, 0xd9, 0x8c, 0x66, 0x8e, 0x06, 0xe2, 0x5d, 0xea, 0xc7, 0xdf, 0x6c, + 0x15, 0x52, 0xce, 0x30, 0x87, 0x26, 0x47, 0x2f, 0xc4, 0xf8, 0xf9, 0x4f, 0x50, 0x2c, 0x16, 0xd0, + 0x96, 0x51, 0x10, 0xeb, 0x1e, 0x18, 0xe9, 0xc0, 0x7b, 0x06, 0x92, 0x99, 0x01, 0x54, 0x5a, 0x5a, + 0xea, 0x9e, 0x13, 0x4d, 0x76, 0x76, 0xb6, 0xd7, 0x05, 0xd1, 0xce, 0xce, 0x4e, 0xdf, 0xf6, 0x2b, + 0x2b, 0x2b, 0x6e, 0x4b, 0x2a, 0x85, 0x96, 0xed, 0x0b, 0x31, 0xbe, 0x71, 0x90, 0xbe, 0xe0, 0xed, + 0xbd, 0xac, 0x87, 0x40, 0xe8, 0x1e, 0xa2, 0xa1, 0x6e, 0x00, 0x00, 0xf1, 0x19, 0xe3, 0xe2, 0x8c, + 0x67, 0xa4, 0xb3, 0x5b, 0xf3, 0x46, 0x84, 0x6c, 0x88, 0x67, 0xcf, 0x9e, 0xf9, 0x1c, 0x01, 0x60, + 0xe7, 0x49, 0xab, 0x49, 0xfa, 0xdf, 0xca, 0x3e, 0x4d, 0x80, 0xf8, 0x49, 0x7e, 0xa3, 0x1f, 0xbf, + 0xb2, 0xb2, 0x32, 0x5f, 0x9a, 0xe4, 0x1c, 0x8f, 0xbb, 0xb4, 0x21, 0x00, 0x31, 0x63, 0x18, 0x17, + 0x67, 0x2c, 0x55, 0x9c, 0x23, 0x12, 0xc4, 0xef, 0xdd, 0xbf, 0xef, 0xcf, 0x38, 0xc7, 0xa1, 0xac, + 0xac, 0xac, 0x7b, 0x7f, 0x45, 0xf2, 0x89, 0x8e, 0x53, 0x12, 0x20, 0xc2, 0xa7, 0xd8, 0x14, 0x3f, + 0xec, 0x36, 0xd2, 0xc3, 0x5c, 0x84, 0x20, 0xe6, 0x87, 0xd4, 0x21, 0xdc, 0xdf, 0xdf, 0xef, 0x8e, + 0xe8, 0xb7, 0xcc, 0xcf, 0x59, 0x4b, 0x44, 0xa9, 0x26, 0xba, 0xba, 0x79, 0xf3, 0x66, 0xbe, 0x74, + 0xbf, 0x0e, 0x21, 0x49, 0x20, 0x3a, 0x84, 0x28, 0x80, 0x91, 0x12, 0x06, 0x16, 0x50, 0xd8, 0xd2, + 0x51, 0x10, 0xad, 0x4b, 0xd1, 0xf9, 0x09, 0x21, 0x0b, 0x44, 0x40, 0x5b, 0x2b, 0x8d, 0xf1, 0xcc, + 0xcc, 0xcc, 0xdf, 0xa4, 0x99, 0x2a, 0xfb, 0x38, 0x84, 0x24, 0x81, 0x78, 0x19, 0x10, 0xf3, 0x43, + 0x87, 0x11, 0x61, 0x74, 0x76, 0x58, 0x9a, 0x38, 0x10, 0x82, 0xf8, 0xcc, 0x08, 0xf0, 0xf3, 0xc0, + 0xff, 0x0d, 0x5a, 0x51, 0xfb, 0xa9, 0xa9, 0xa9, 0xbf, 0x4a, 0xef, 0x73, 0xd9, 0x47, 0x51, 0x48, + 0x08, 0xba, 0xa1, 0xf6, 0x5c, 0x93, 0x48, 0x5c, 0xd1, 0xc4, 0xb5, 0xa9, 0x13, 0x26, 0x70, 0x5c, + 0xa2, 0x09, 0xe3, 0xe2, 0xce, 0x33, 0x65, 0x20, 0xae, 0x34, 0xc7, 0x55, 0x93, 0xb8, 0x20, 0xbd, + 0xd2, 0xf9, 0x5e, 0xf6, 0xd9, 0x87, 0x20, 0x21, 0x88, 0x7f, 0xee, 0xd2, 0x65, 0x19, 0xff, 0xd1, + 0xf8, 0xee, 0x57, 0xd1, 0x7a, 0x7c, 0xc8, 0xfe, 0x00, 0x0a, 0x0d, 0x10, 0x76, 0xc6, 0x00, 0x96, + 0x87, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, }; const BITMAP_OPAQUE open_brd_file_xpm[1] = {{ png, sizeof( png ), "open_brd_file_xpm" }}; diff --git a/bitmaps_png/cpp_26/tree_nosel.cpp b/bitmaps_png/cpp_26/tree_nosel.cpp index 4c6686b1aa..a371fbcc2a 100644 --- a/bitmaps_png/cpp_26/tree_nosel.cpp +++ b/bitmaps_png/cpp_26/tree_nosel.cpp @@ -8,91 +8,92 @@ static const unsigned char png[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c, - 0xce, 0x00, 0x00, 0x05, 0x36, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xbd, 0x96, 0x7b, 0x4c, 0x53, - 0x57, 0x1c, 0xc7, 0x71, 0x80, 0x28, 0x2c, 0xf3, 0x3d, 0x41, 0x5e, 0xbe, 0xd8, 0x7c, 0x84, 0x6d, - 0x2e, 0x66, 0x71, 0x21, 0xdb, 0x94, 0xa9, 0xc1, 0x25, 0xdb, 0x3f, 0x9b, 0x0b, 0x7b, 0xb9, 0xb9, - 0x38, 0x34, 0xcb, 0x9c, 0xa8, 0x28, 0x42, 0x6f, 0xcb, 0x6d, 0x29, 0x6d, 0x01, 0x2b, 0xf1, 0x01, - 0x58, 0x68, 0xef, 0xed, 0x05, 0x01, 0x2d, 0x05, 0x82, 0x22, 0x4c, 0x98, 0x63, 0xf8, 0x62, 0x53, - 0x51, 0xa7, 0x80, 0xb5, 0x20, 0x15, 0xb1, 0x3c, 0x04, 0x85, 0x3e, 0x79, 0xca, 0x6f, 0xe7, 0x34, - 0x17, 0x73, 0xc7, 0xa4, 0xb0, 0xcc, 0xf8, 0xc7, 0x37, 0xb7, 0x37, 0xfd, 0x9d, 0xdf, 0xe7, 0xdc, - 0xdf, 0xeb, 0x1c, 0x17, 0x00, 0x70, 0x79, 0x11, 0x1a, 0xf3, 0x0f, 0x9a, 0x26, 0xe7, 0xd3, 0x2a, - 0xe2, 0x07, 0x9a, 0xe6, 0xef, 0xa2, 0x69, 0x22, 0x4e, 0x4d, 0x09, 0x36, 0x53, 0x54, 0xcc, 0x9c, - 0xe7, 0x06, 0xca, 0x56, 0x11, 0xaf, 0x53, 0x14, 0x5f, 0xa1, 0xa6, 0xf8, 0x9d, 0x34, 0xc5, 0xef, - 0x46, 0x7a, 0xcc, 0x51, 0x17, 0x02, 0x97, 0xa0, 0x4d, 0x2c, 0xf9, 0x5f, 0x20, 0xe4, 0xe0, 0x2d, - 0x04, 0xa8, 0x67, 0x94, 0x44, 0xf3, 0xb9, 0xa4, 0xad, 0x5d, 0x0f, 0x77, 0x86, 0x0d, 0x9a, 0x7e, - 0x5e, 0x37, 0x6c, 0x46, 0xea, 0xd8, 0xb9, 0x61, 0xe0, 0x8a, 0xf8, 0xdb, 0xee, 0x63, 0x99, 0x31, - 0xcd, 0x08, 0x58, 0xcb, 0x50, 0xc4, 0x5a, 0xee, 0xda, 0x18, 0x32, 0x66, 0x19, 0x8f, 0x8c, 0x7e, - 0x7f, 0x5c, 0x90, 0x5a, 0x4d, 0x2c, 0x42, 0x0e, 0xce, 0xe5, 0x1c, 0x8d, 0xae, 0x33, 0x6c, 0x5b, - 0xdb, 0xdf, 0xfe, 0xe9, 0x8a, 0x21, 0x53, 0xf0, 0x74, 0xb0, 0x2c, 0x9c, 0x0c, 0x96, 0x05, 0xee, - 0x60, 0x0a, 0x9e, 0x06, 0x0f, 0x3f, 0x5a, 0x32, 0x6c, 0xd8, 0x1a, 0x3a, 0xa0, 0x4d, 0x8d, 0xaa, - 0xa7, 0x29, 0xc1, 0xf5, 0x2c, 0x15, 0xb9, 0x52, 0x2c, 0x21, 0x05, 0xb2, 0xa4, 0x04, 0x53, 0x56, - 0xb6, 0xda, 0x74, 0x54, 0x91, 0x66, 0xe3, 0x93, 0xbc, 0x5d, 0x4e, 0x41, 0xb4, 0x8a, 0x2f, 0x67, - 0x32, 0x63, 0x2f, 0xdc, 0xdc, 0xfc, 0x81, 0xbd, 0x25, 0xc4, 0x6f, 0xb8, 0x6b, 0xbe, 0x3b, 0x3c, - 0x4b, 0xc6, 0x95, 0x73, 0xa1, 0x6e, 0x53, 0xc8, 0x00, 0xa3, 0xe4, 0x9d, 0x97, 0xcb, 0x85, 0x75, - 0xda, 0xc2, 0x7c, 0x7b, 0x4b, 0x4b, 0x0b, 0xe8, 0xee, 0xe8, 0x40, 0x9e, 0x92, 0xdc, 0x43, 0x10, - 0x7b, 0x97, 0x8e, 0x09, 0x52, 0x2a, 0xc9, 0x99, 0x28, 0x2f, 0xc5, 0x27, 0x05, 0xdf, 0xd4, 0xdc, - 0x5a, 0xb7, 0x64, 0xc0, 0x18, 0x88, 0x1c, 0x3a, 0xd1, 0xad, 0xd0, 0xc5, 0x43, 0x9a, 0x3d, 0x5f, - 0x19, 0x98, 0x2c, 0x6a, 0xb0, 0xbb, 0xbb, 0x1b, 0x30, 0xe8, 0x48, 0xea, 0x21, 0x9b, 0x40, 0x10, - 0xbb, 0xce, 0x69, 0xe8, 0xd4, 0x2a, 0x62, 0x3d, 0x0a, 0x5b, 0x4e, 0xc5, 0x67, 0xab, 0x3a, 0xea, - 0x97, 0x4d, 0x03, 0x43, 0x80, 0xdb, 0x53, 0x35, 0x3d, 0x43, 0x77, 0x82, 0xbc, 0x80, 0xda, 0x16, - 0xde, 0x57, 0x73, 0xed, 0xea, 0x70, 0x4f, 0x4f, 0x0f, 0xdc, 0xbd, 0xdb, 0x08, 0x62, 0x89, 0xf0, - 0xfa, 0x68, 0xe7, 0xa4, 0x88, 0x7f, 0x10, 0xc1, 0x37, 0x3c, 0x05, 0x51, 0x14, 0x11, 0x8a, 0xca, - 0x37, 0xed, 0xd4, 0xfa, 0xe0, 0xc7, 0x37, 0x17, 0x7a, 0x82, 0xce, 0xcf, 0xcd, 0xa9, 0xea, 0x02, - 0x3d, 0xe0, 0xf0, 0x8e, 0x2d, 0x43, 0x7a, 0xbd, 0x0e, 0x30, 0xa8, 0xa1, 0xa1, 0x01, 0xe2, 0x13, - 0xc8, 0x5b, 0x2e, 0x2e, 0x2e, 0x93, 0x46, 0x20, 0xc2, 0x78, 0x41, 0x74, 0x6e, 0x5e, 0x8e, 0x35, - 0x31, 0x49, 0xda, 0xc7, 0x01, 0x91, 0x6f, 0xa3, 0xb2, 0x95, 0xe6, 0x86, 0x2e, 0x35, 0x5e, 0x5a, - 0xe0, 0x05, 0x7f, 0xf9, 0xba, 0x39, 0xd5, 0xe5, 0xc0, 0x29, 0x90, 0xf1, 0xc9, 0x7b, 0x96, 0xd3, - 0xa5, 0xc5, 0x03, 0x66, 0xb3, 0x19, 0x8c, 0x46, 0x23, 0x14, 0x9f, 0x2c, 0xb2, 0x89, 0xa5, 0xc2, - 0x93, 0x3c, 0x92, 0xb7, 0x0a, 0x7d, 0xc5, 0x6e, 0x45, 0x46, 0xba, 0xf9, 0xc1, 0x83, 0x07, 0x70, - 0x20, 0x25, 0xd9, 0xbe, 0x71, 0xe3, 0x46, 0x57, 0x07, 0x88, 0x61, 0x78, 0xbe, 0xa8, 0x18, 0xf6, - 0x65, 0x84, 0xaf, 0x29, 0xce, 0x5d, 0x3a, 0xbb, 0xff, 0xca, 0x3c, 0x57, 0xc0, 0xba, 0x3c, 0x86, - 0x0a, 0x83, 0xa6, 0x0f, 0xa6, 0x86, 0x87, 0x56, 0xca, 0x92, 0xa4, 0x4f, 0x30, 0xa8, 0xb5, 0xb5, - 0x15, 0x9a, 0x9a, 0x9a, 0xe0, 0xe2, 0xc5, 0xf3, 0x7d, 0xda, 0xa2, 0x7c, 0x53, 0xc5, 0xaf, 0xe5, - 0xbd, 0xfa, 0x06, 0x3d, 0x34, 0x37, 0x37, 0x83, 0x44, 0x16, 0x6f, 0x8f, 0x88, 0x88, 0x70, 0xe7, - 0xf4, 0x90, 0xe0, 0x63, 0x65, 0xfa, 0xde, 0x9f, 0xf6, 0xbf, 0xf6, 0x6a, 0x4f, 0xb1, 0xdf, 0x94, - 0xe1, 0x0b, 0x3e, 0xae, 0x30, 0x5a, 0xe7, 0x91, 0x4e, 0xf9, 0x7a, 0x40, 0xf2, 0x72, 0x7f, 0x6b, - 0x62, 0x62, 0xfc, 0xe3, 0xdb, 0xba, 0x7a, 0x07, 0xa8, 0xad, 0xad, 0xcd, 0x11, 0x3e, 0x93, 0xc9, - 0x04, 0xed, 0xed, 0xed, 0x28, 0x67, 0x77, 0xc1, 0x60, 0x30, 0x40, 0x79, 0xc5, 0x99, 0x7e, 0x91, - 0x38, 0x2e, 0xf5, 0x1f, 0xe5, 0xcd, 0x30, 0x92, 0x59, 0x28, 0x7c, 0x5f, 0x1e, 0xde, 0xf3, 0xf5, - 0x0e, 0x32, 0x60, 0x46, 0x97, 0xc2, 0x67, 0xea, 0xe0, 0x69, 0x6f, 0x37, 0x38, 0xeb, 0xed, 0xea, - 0x50, 0x19, 0xfa, 0x9d, 0x31, 0xcf, 0x73, 0x50, 0xe0, 0x3f, 0xcb, 0x2c, 0x95, 0xc4, 0xb5, 0xdd, - 0xb8, 0x71, 0x6d, 0xa8, 0xbf, 0xbf, 0x1f, 0x46, 0x40, 0x8d, 0x8d, 0x8d, 0xd0, 0xda, 0xd6, 0x0a, - 0xf7, 0xef, 0xdf, 0x07, 0x9d, 0x4e, 0x07, 0x85, 0x45, 0x05, 0x76, 0x51, 0x02, 0xd9, 0x10, 0x15, - 0x15, 0xe5, 0xf5, 0xac, 0xc9, 0xe0, 0x4d, 0x2b, 0x89, 0xb0, 0x74, 0xd1, 0xb6, 0xcf, 0x63, 0x96, - 0x07, 0xe4, 0xef, 0x9e, 0xe5, 0xd9, 0xb5, 0x6b, 0x86, 0x87, 0x3d, 0x72, 0xba, 0x47, 0x5f, 0x24, - 0x7a, 0x0a, 0x43, 0xde, 0xac, 0x90, 0x24, 0x08, 0x74, 0x7f, 0xfc, 0x79, 0x69, 0xa0, 0xb7, 0xb7, - 0x17, 0x30, 0xc8, 0x62, 0xb1, 0x38, 0xca, 0x3b, 0x53, 0x95, 0x61, 0xd9, 0x7f, 0x20, 0xe9, 0x76, - 0xd2, 0x7e, 0x59, 0xa3, 0x2c, 0x31, 0xa1, 0x21, 0x41, 0x2a, 0xfa, 0x1e, 0xe7, 0x66, 0xcc, 0x59, - 0x97, 0x95, 0x15, 0xe5, 0xa5, 0x54, 0xf2, 0x57, 0xa8, 0xd5, 0xfc, 0x10, 0xac, 0x83, 0xc4, 0x77, - 0x61, 0x99, 0x29, 0x91, 0xab, 0x8f, 0x1d, 0x13, 0xaf, 0x4e, 0x96, 0x4b, 0xae, 0x56, 0xfe, 0xfe, - 0x5b, 0x9f, 0xcd, 0x66, 0x03, 0xbb, 0xdd, 0xee, 0x00, 0x3d, 0x7a, 0xf4, 0x08, 0x68, 0x46, 0x65, - 0x2d, 0x28, 0xca, 0x8f, 0x47, 0xeb, 0x67, 0xb3, 0x7e, 0x70, 0xf5, 0x2d, 0x9c, 0xd0, 0xf4, 0xd6, - 0x68, 0xc8, 0xc9, 0x0a, 0x05, 0x39, 0xbb, 0xba, 0xba, 0xec, 0x8d, 0xda, 0xda, 0x4b, 0xef, 0xc8, - 0x53, 0x12, 0x7f, 0x29, 0x2b, 0x3b, 0x6d, 0xc7, 0x79, 0xb0, 0x5a, 0xad, 0x0e, 0x90, 0xd9, 0x6c, - 0x82, 0xac, 0x6c, 0xca, 0x22, 0x10, 0xf2, 0xbe, 0x60, 0x9d, 0x7f, 0xc8, 0xf1, 0x81, 0x27, 0xfd, - 0x62, 0x16, 0xf8, 0xca, 0x44, 0x26, 0x6f, 0x90, 0x48, 0x4c, 0xa6, 0x14, 0x15, 0x17, 0xda, 0x3a, - 0x3a, 0x3a, 0x1c, 0x7d, 0x83, 0x41, 0xf8, 0x99, 0x9d, 0xc3, 0x58, 0x51, 0x53, 0x6e, 0xe2, 0xd8, - 0xae, 0x41, 0x72, 0xe5, 0xbc, 0x63, 0xf8, 0xcb, 0x18, 0x36, 0x2e, 0x08, 0xcd, 0x2f, 0xd9, 0x71, - 0x4d, 0x9e, 0x1d, 0x27, 0x19, 0x83, 0xf0, 0xc8, 0xc1, 0xca, 0x3b, 0x91, 0x6b, 0x43, 0xc9, 0xde, - 0x32, 0xca, 0x9e, 0x3b, 0xd1, 0xfd, 0x90, 0x02, 0xd9, 0x2f, 0x73, 0x77, 0x0a, 0x41, 0xbb, 0xfd, - 0x91, 0xc9, 0x56, 0xdb, 0x70, 0xe9, 0x62, 0x10, 0x2e, 0xdd, 0xce, 0xce, 0x4e, 0x0c, 0xb1, 0x32, - 0xd9, 0xb4, 0x1c, 0xd9, 0x84, 0x20, 0x4d, 0x45, 0x0a, 0x40, 0x0a, 0x43, 0x9a, 0xcb, 0x59, 0xbf, - 0x68, 0x42, 0x39, 0xe2, 0x93, 0xb1, 0xe1, 0x2a, 0x2a, 0xd3, 0x5a, 0x5b, 0x5b, 0x0b, 0x23, 0x20, - 0x63, 0xab, 0x11, 0x4e, 0x68, 0x8e, 0x5b, 0x51, 0x28, 0x23, 0x59, 0xbb, 0x29, 0x48, 0xef, 0xb2, - 0xb9, 0xe0, 0xae, 0xc7, 0x70, 0xff, 0x71, 0x41, 0x04, 0xb9, 0x2f, 0xec, 0x68, 0x46, 0xaa, 0xb5, - 0xa6, 0xa6, 0x06, 0x46, 0x40, 0xf7, 0xee, 0xdd, 0x03, 0x6d, 0x81, 0xc6, 0x8e, 0x20, 0x7b, 0x91, - 0xcd, 0x4b, 0x4e, 0x22, 0xe1, 0xc9, 0x3e, 0x31, 0xdc, 0x63, 0x4c, 0x10, 0x9f, 0x1f, 0x1d, 0x7c, - 0x24, 0xed, 0x90, 0xa5, 0xba, 0xba, 0x1a, 0x46, 0x40, 0x7a, 0xbd, 0x1e, 0x0a, 0xd0, 0xb9, 0x23, - 0x91, 0x89, 0x85, 0xc8, 0x06, 0x1f, 0xe3, 0x0b, 0xd8, 0x6a, 0xf2, 0x66, 0x13, 0xee, 0xca, 0xe6, - 0x03, 0x3b, 0xf7, 0x65, 0x6d, 0xe6, 0x70, 0x4b, 0xfc, 0x5f, 0x20, 0x51, 0x7c, 0x5c, 0xce, 0xd9, - 0xb3, 0x15, 0xc3, 0x25, 0x25, 0x25, 0x50, 0x59, 0x59, 0xe9, 0x00, 0xa1, 0x1e, 0xb1, 0x22, 0x88, - 0x94, 0x05, 0x4c, 0xe2, 0xd8, 0xcf, 0x64, 0x7b, 0xc7, 0x9f, 0x0d, 0x23, 0xd7, 0xd7, 0x5c, 0xa7, - 0xa1, 0x43, 0x95, 0x44, 0x97, 0x97, 0x9f, 0x79, 0x52, 0x5a, 0x5a, 0x0a, 0x55, 0x55, 0x55, 0x08, - 0xa2, 0xb5, 0xa1, 0x70, 0x25, 0x8f, 0x11, 0xa6, 0x91, 0xc6, 0x5c, 0xf4, 0x9f, 0x6f, 0x41, 0x24, - 0xb9, 0x6f, 0x71, 0xb2, 0x5c, 0x6a, 0xd1, 0x6a, 0x35, 0x96, 0x74, 0x45, 0xaa, 0x05, 0x9d, 0x2b, - 0xbc, 0x71, 0x9c, 0xf8, 0x8c, 0xde, 0xfd, 0x84, 0xef, 0x75, 0xdb, 0xb7, 0x6f, 0xf7, 0x40, 0x05, - 0xb1, 0x36, 0x36, 0x36, 0xd6, 0xe7, 0x79, 0x5d, 0x20, 0xff, 0x06, 0xc3, 0x7c, 0x44, 0xc5, 0xb8, - 0x7d, 0x88, 0xca, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, + 0xce, 0x00, 0x00, 0x05, 0x39, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xbd, 0x96, 0x7b, 0x4c, 0x53, + 0x57, 0x1c, 0xc7, 0x71, 0x80, 0x20, 0x2c, 0xf3, 0x3d, 0x61, 0x20, 0x28, 0xe8, 0xa6, 0x6e, 0x6c, + 0x73, 0x31, 0x8b, 0x0b, 0x7b, 0x28, 0x3e, 0x82, 0x4b, 0x96, 0xfd, 0xb1, 0xb9, 0x30, 0xb3, 0xb9, + 0xb9, 0x87, 0x9a, 0x65, 0x4e, 0x54, 0x14, 0xa1, 0xb7, 0xf5, 0xd2, 0x96, 0xb6, 0x14, 0x2a, 0xd1, + 0x81, 0x58, 0x68, 0xef, 0x6d, 0xe9, 0x40, 0x29, 0xaf, 0xa1, 0x08, 0x91, 0xc7, 0x98, 0x4f, 0x8c, + 0x0e, 0xc9, 0x14, 0xb0, 0x16, 0xa4, 0x22, 0xb6, 0x80, 0xa0, 0xd0, 0x27, 0x4f, 0xf9, 0xed, 0x9c, + 0xe6, 0x62, 0xee, 0x98, 0x14, 0x96, 0x99, 0xfd, 0xf1, 0xcd, 0xed, 0x4d, 0x7f, 0xe7, 0xf7, 0x39, + 0xf7, 0xf7, 0x3a, 0xc7, 0x0d, 0x00, 0xdc, 0xfe, 0x0f, 0x4d, 0xf8, 0x07, 0x4d, 0x93, 0x8b, 0x68, + 0x25, 0xf1, 0x3d, 0x4d, 0x73, 0xf7, 0xd2, 0x34, 0x71, 0x48, 0x45, 0xf1, 0xb6, 0x51, 0x54, 0xdc, + 0xfc, 0x67, 0x06, 0xd2, 0x28, 0x89, 0x57, 0x28, 0x8a, 0x2b, 0x57, 0x51, 0xdc, 0x6e, 0x9a, 0xe2, + 0xf6, 0x22, 0x3d, 0x62, 0xa9, 0x07, 0x81, 0x4b, 0xd1, 0x26, 0x96, 0xfd, 0x27, 0x10, 0x72, 0xf0, + 0x26, 0x02, 0x34, 0xa9, 0x15, 0x44, 0xdb, 0x79, 0xe9, 0x8e, 0x9e, 0x07, 0x7b, 0x22, 0x87, 0xcd, + 0x3f, 0x6d, 0x18, 0xb5, 0x20, 0x75, 0xed, 0xd9, 0x34, 0x74, 0x4d, 0xf8, 0x55, 0xef, 0x2f, 0x59, + 0x71, 0x6d, 0x08, 0xd8, 0xa0, 0xa6, 0x88, 0xf5, 0xec, 0xb5, 0x71, 0x64, 0xdc, 0x0a, 0x0e, 0x19, + 0xfb, 0xfe, 0xa4, 0x20, 0x95, 0x8a, 0x08, 0x45, 0x0e, 0xce, 0xe7, 0x1c, 0x8f, 0x6d, 0x34, 0xec, + 0x5c, 0x3f, 0xd8, 0xf9, 0xc9, 0xca, 0x11, 0x73, 0xd8, 0x2c, 0xb0, 0x86, 0x4c, 0x07, 0xeb, 0x62, + 0x4f, 0x30, 0x87, 0xcd, 0x84, 0x07, 0x1f, 0x2e, 0x1b, 0x35, 0xec, 0x88, 0x18, 0x2a, 0x48, 0x8f, + 0x69, 0xa2, 0x29, 0x5e, 0x7d, 0xb6, 0x92, 0x5c, 0x25, 0x14, 0x91, 0x3c, 0x89, 0x34, 0xd1, 0x9c, + 0xad, 0x51, 0x99, 0x8f, 0xcb, 0x8f, 0xd9, 0xb9, 0x24, 0x67, 0xaf, 0x4b, 0x10, 0xad, 0xe4, 0xca, + 0xd4, 0x59, 0xf1, 0x17, 0x6f, 0x6c, 0xfb, 0xc0, 0xd1, 0x1e, 0x1e, 0x38, 0xda, 0xb3, 0xc8, 0x13, + 0x9e, 0x26, 0xe3, 0xaa, 0x05, 0xd0, 0xb8, 0x35, 0x7c, 0x48, 0xad, 0xe0, 0x5c, 0x48, 0x91, 0x91, + 0x8d, 0x05, 0x45, 0xf9, 0x8e, 0xf6, 0xf6, 0x76, 0xd0, 0xdd, 0xd6, 0x81, 0x2c, 0x35, 0xb9, 0x8f, + 0x20, 0x0e, 0x2c, 0x9f, 0x10, 0xa4, 0x50, 0x90, 0x73, 0x50, 0x5e, 0x4a, 0x4e, 0xf1, 0xbe, 0xac, + 0xbb, 0xb9, 0x61, 0xd9, 0x90, 0x31, 0x18, 0x39, 0x74, 0xa1, 0x9b, 0x11, 0x4b, 0x46, 0xb4, 0xfb, + 0xb7, 0x18, 0xd4, 0xd9, 0xca, 0x91, 0xde, 0xde, 0x5e, 0xc0, 0xa0, 0xb4, 0xf4, 0xa3, 0x76, 0x1e, + 0x2f, 0x7e, 0x83, 0xcb, 0xd0, 0xa9, 0x94, 0xc4, 0x46, 0x14, 0xb6, 0x9c, 0xca, 0x4f, 0x57, 0x77, + 0x35, 0xad, 0x98, 0x09, 0x86, 0x20, 0x8f, 0x27, 0x6a, 0x7d, 0x8a, 0x6e, 0x2f, 0xf5, 0x05, 0x6a, + 0x67, 0xd4, 0xc0, 0xf5, 0xfa, 0xba, 0xc7, 0x7d, 0x7d, 0x7d, 0x70, 0xe7, 0x4e, 0x0b, 0x08, 0x45, + 0x09, 0xf5, 0xe3, 0x9d, 0x93, 0x7c, 0xee, 0x11, 0x04, 0xdf, 0xf4, 0x04, 0x44, 0x51, 0x44, 0x04, + 0x2a, 0xdf, 0x63, 0xa7, 0x37, 0x86, 0x3d, 0xba, 0x11, 0xe2, 0x03, 0xba, 0x40, 0x0f, 0x97, 0x6a, + 0x0c, 0xf6, 0x82, 0xb4, 0xdd, 0xdf, 0x8e, 0xe8, 0xf5, 0x3a, 0xc0, 0xa0, 0xe6, 0xe6, 0x66, 0x10, + 0x24, 0x92, 0x37, 0xdd, 0xdc, 0xdc, 0xa6, 0x8d, 0x41, 0x12, 0x04, 0xbc, 0xd8, 0xdc, 0x13, 0x39, + 0xb6, 0x24, 0xa9, 0x78, 0x80, 0x05, 0x22, 0xdf, 0x42, 0x65, 0x2b, 0xce, 0x8d, 0x58, 0x6e, 0xbc, + 0xbc, 0xd8, 0x17, 0xfe, 0x0c, 0xf0, 0x70, 0xa9, 0xab, 0xc1, 0xde, 0x20, 0xff, 0xf8, 0x3d, 0xeb, + 0x99, 0xb2, 0x92, 0x21, 0x8b, 0xc5, 0x02, 0x46, 0xa3, 0x11, 0x4a, 0x4e, 0x15, 0xdb, 0x85, 0xe2, + 0x84, 0x53, 0x1c, 0x92, 0xb3, 0x1a, 0x7d, 0xc5, 0x3e, 0x79, 0x66, 0x86, 0xe5, 0xfe, 0xfd, 0xfb, + 0x70, 0x38, 0x35, 0xd9, 0xb1, 0x79, 0xf3, 0x66, 0x77, 0x27, 0x48, 0xad, 0xe6, 0x04, 0xa0, 0x62, + 0x38, 0x98, 0x19, 0xb5, 0xb6, 0x24, 0x77, 0xf9, 0xbc, 0xc1, 0x6b, 0x2f, 0xb9, 0x03, 0xd6, 0xd5, + 0x09, 0x54, 0xb4, 0x74, 0xd6, 0x70, 0x5a, 0xd4, 0xba, 0x1a, 0x89, 0x54, 0xf4, 0x18, 0x83, 0x4c, + 0x26, 0x13, 0xb4, 0xb6, 0xb6, 0xc2, 0xa5, 0x4b, 0x17, 0x06, 0x0a, 0x8a, 0xf3, 0xcd, 0x55, 0x55, + 0x15, 0xfd, 0xfa, 0x66, 0x3d, 0xb4, 0xb5, 0xb5, 0x81, 0x48, 0x22, 0x70, 0x6c, 0xdf, 0xbe, 0xdd, + 0x93, 0xd5, 0x43, 0xbc, 0x8f, 0x14, 0x19, 0x07, 0x7e, 0x4c, 0x79, 0xf9, 0xc5, 0xbe, 0x92, 0x40, + 0xef, 0xd1, 0x8b, 0xfe, 0xee, 0x30, 0x5e, 0x17, 0x90, 0x4e, 0x07, 0x78, 0x81, 0xf4, 0xb5, 0x85, + 0xb6, 0xa4, 0x24, 0xc1, 0xa3, 0x5b, 0xb7, 0x9a, 0x9c, 0xa0, 0x8e, 0x8e, 0x0e, 0x67, 0xf8, 0xcc, + 0x66, 0x33, 0x74, 0x76, 0x76, 0xa2, 0x9c, 0xdd, 0x01, 0x83, 0xc1, 0x00, 0x95, 0x95, 0x67, 0x07, + 0xf8, 0xc2, 0x43, 0xe9, 0x7f, 0x2b, 0x6f, 0xb5, 0x5a, 0x34, 0x17, 0x85, 0x6f, 0xcb, 0xcf, 0xfb, + 0xbf, 0xd8, 0x4d, 0x06, 0xcd, 0xee, 0x91, 0xfb, 0xcf, 0x18, 0x3e, 0xe3, 0xe7, 0x01, 0xd5, 0x7e, + 0xee, 0x4e, 0x95, 0xa3, 0xdf, 0x72, 0x7f, 0x9f, 0x61, 0x5e, 0xf0, 0x5c, 0x8b, 0x58, 0x44, 0x9a, + 0xea, 0xeb, 0xaf, 0x8f, 0x0c, 0x0e, 0x0e, 0xc2, 0x18, 0xa8, 0xa5, 0xa5, 0x05, 0x4c, 0x1d, 0x26, + 0xb8, 0x77, 0xef, 0x1e, 0xe8, 0x74, 0x3a, 0x28, 0xfe, 0xb5, 0xd0, 0xce, 0x4f, 0x24, 0x9b, 0x63, + 0x62, 0x62, 0x7c, 0x9f, 0x36, 0x19, 0xfc, 0x68, 0x05, 0x11, 0x99, 0xc1, 0xdf, 0xf9, 0x59, 0xdc, + 0xab, 0x41, 0xf9, 0xfb, 0xe6, 0xfa, 0xf4, 0xec, 0x9d, 0xed, 0xe5, 0x88, 0x9e, 0xe5, 0x35, 0x10, + 0x8d, 0x9e, 0xfc, 0x77, 0xdf, 0xa8, 0x12, 0x27, 0xf2, 0x74, 0xb5, 0xb5, 0x97, 0x86, 0xfb, 0xfb, + 0xfb, 0x01, 0x83, 0xac, 0x56, 0xab, 0xb3, 0xbc, 0xb3, 0x94, 0x99, 0xd6, 0x94, 0xc3, 0xd2, 0x5b, + 0xd2, 0x14, 0x49, 0x8b, 0x24, 0x29, 0xb1, 0x39, 0x51, 0xcc, 0xff, 0x06, 0xe7, 0x66, 0xc2, 0x59, + 0x97, 0x9d, 0x1d, 0xe3, 0xab, 0x50, 0x70, 0x57, 0xaa, 0x54, 0xdc, 0x70, 0xac, 0x23, 0xc4, 0xd7, + 0x91, 0x59, 0xa9, 0xd1, 0x6b, 0x34, 0x1a, 0xc1, 0x9a, 0x64, 0x99, 0xe8, 0x8f, 0xdf, 0x7e, 0xaf, + 0x1e, 0xb4, 0xdb, 0xed, 0xe0, 0x70, 0x38, 0x9c, 0xa0, 0x87, 0x0f, 0x1f, 0x02, 0x45, 0x2b, 0xec, + 0x85, 0xc5, 0xf9, 0x02, 0xb4, 0x7e, 0x1e, 0xe3, 0x07, 0x57, 0x5f, 0xc8, 0x94, 0xa6, 0xb7, 0x56, + 0x4b, 0x4e, 0x97, 0xcb, 0xc9, 0x79, 0x57, 0xae, 0x94, 0xbf, 0xde, 0xd8, 0x78, 0xf9, 0x6d, 0xd9, + 0xe1, 0xa4, 0xf2, 0xf2, 0xf2, 0x33, 0xfd, 0x38, 0x0f, 0x36, 0x9b, 0xcd, 0x09, 0xb2, 0x58, 0xcc, + 0x90, 0xad, 0xa1, 0xac, 0xbc, 0x04, 0xce, 0xe7, 0x8c, 0xf3, 0x75, 0x2c, 0x1f, 0x78, 0xd2, 0x2f, + 0x61, 0x80, 0x2f, 0x4c, 0x65, 0xf2, 0x2e, 0xe5, 0x0b, 0xc9, 0xd4, 0xe2, 0x92, 0x22, 0x7b, 0x57, + 0x57, 0x97, 0xb3, 0x6f, 0x30, 0x08, 0x3f, 0x35, 0x39, 0x6a, 0x1b, 0x6a, 0xca, 0xad, 0x2c, 0xdb, + 0xb5, 0x48, 0xee, 0xac, 0x77, 0x0c, 0x7f, 0x1e, 0xc3, 0x26, 0x05, 0xc9, 0x52, 0xa5, 0x49, 0x79, + 0xda, 0x13, 0x0e, 0x9c, 0x64, 0x0c, 0xc2, 0x23, 0x07, 0xeb, 0x64, 0x5e, 0x0e, 0x4e, 0xf6, 0x77, + 0xe3, 0xec, 0xd9, 0x13, 0x3d, 0x10, 0x29, 0x98, 0xf9, 0x32, 0x4f, 0x97, 0x10, 0xb4, 0xdb, 0x1f, + 0xd4, 0x1a, 0x95, 0x1d, 0x97, 0x2e, 0x06, 0xe1, 0xd2, 0xed, 0xee, 0xee, 0x86, 0x13, 0x79, 0xb9, + 0x36, 0xb5, 0x86, 0x96, 0x21, 0x9b, 0x70, 0xa4, 0x19, 0x48, 0x41, 0x48, 0x91, 0x48, 0x0b, 0x58, + 0xeb, 0x43, 0xa7, 0x94, 0x23, 0x2e, 0x19, 0x1f, 0xa5, 0xa4, 0xb2, 0x6c, 0x0d, 0x0d, 0x0d, 0x30, + 0x06, 0x32, 0x9a, 0x8c, 0x90, 0xa7, 0x3d, 0x69, 0x43, 0xa1, 0x8c, 0x66, 0xec, 0xbc, 0x91, 0xde, + 0x61, 0x72, 0xc1, 0x5e, 0x8f, 0xe1, 0x0b, 0x27, 0x05, 0x11, 0xe4, 0xc1, 0xc8, 0xe3, 0x99, 0xe9, + 0xb6, 0xba, 0xba, 0x3a, 0x18, 0x03, 0xdd, 0xbd, 0x7b, 0x17, 0xf2, 0x0b, 0xb5, 0x0e, 0x04, 0x39, + 0x80, 0x6c, 0x9e, 0x73, 0x11, 0x09, 0x1f, 0xe6, 0x89, 0xe1, 0x5e, 0x13, 0x82, 0xb8, 0xdc, 0xd8, + 0xb0, 0xb4, 0x63, 0x47, 0xad, 0xb5, 0xb5, 0xb5, 0x30, 0x06, 0xd2, 0xeb, 0xf5, 0x50, 0x88, 0xce, + 0x1d, 0x91, 0x84, 0x9f, 0x80, 0x6c, 0xf0, 0x31, 0xbe, 0x98, 0xa9, 0x26, 0x3f, 0x26, 0xe1, 0xee, + 0x4c, 0x3e, 0xb0, 0xf3, 0x00, 0xc6, 0x66, 0x3e, 0xbb, 0xc4, 0xff, 0x01, 0xe2, 0x0b, 0x0e, 0xe5, + 0x54, 0x57, 0x57, 0x8e, 0x96, 0x96, 0x96, 0x42, 0x4d, 0x4d, 0x8d, 0x13, 0x84, 0x7a, 0xc4, 0x26, + 0x91, 0x0a, 0xc5, 0x0c, 0x60, 0x1a, 0xcb, 0x7e, 0x0e, 0xd3, 0x3b, 0x0b, 0x99, 0x30, 0xb2, 0x7d, + 0x2d, 0x70, 0x19, 0x3a, 0x54, 0x49, 0x74, 0x45, 0xc5, 0xd9, 0xc7, 0x65, 0x65, 0x65, 0x70, 0xee, + 0xdc, 0x39, 0x04, 0x29, 0xb0, 0xa3, 0x70, 0x25, 0x4f, 0x10, 0xa6, 0xb1, 0xc6, 0x0c, 0xfd, 0xd7, + 0xb7, 0x20, 0x92, 0x3c, 0xb8, 0x24, 0x59, 0x26, 0xb6, 0x16, 0x14, 0x68, 0xad, 0x19, 0xf2, 0x74, + 0x2b, 0x3a, 0x57, 0x38, 0x93, 0x38, 0xf1, 0x1f, 0xbf, 0xfb, 0x29, 0xdf, 0xeb, 0x76, 0xed, 0xda, + 0xe5, 0x85, 0x0a, 0x62, 0x7d, 0x7c, 0x7c, 0xbc, 0xff, 0xb3, 0xba, 0x40, 0xfe, 0x05, 0xa3, 0x0e, + 0x44, 0xc1, 0xe1, 0x8b, 0x0f, 0x11, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, + 0x60, 0x82, }; const BITMAP_OPAQUE tree_nosel_xpm[1] = {{ png, sizeof( png ), "tree_nosel_xpm" }}; diff --git a/bitmaps_png/sources/add_component.svg b/bitmaps_png/sources/add_component.svg index d3e526cd8d..ab96ac6f2b 100644 --- a/bitmaps_png/sources/add_component.svg +++ b/bitmaps_png/sources/add_component.svg @@ -11,8 +11,8 @@ width="48" version="1.1" id="svg2" - inkscape:version="0.47 r22583" - sodipodi:docname="add_component2.svg"> + inkscape:version="0.48.1 " + sodipodi:docname="add_component.svg"> @@ -34,14 +34,14 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1280" - inkscape:window-height="949" + inkscape:window-height="968" id="namedview96" showgrid="false" - inkscape:zoom="4.9166667" - inkscape:cx="20.949153" - inkscape:cy="26.644068" - inkscape:window-x="0" - inkscape:window-y="25" + inkscape:zoom="16.144186" + inkscape:cx="23.860729" + inkscape:cy="21.637301" + inkscape:window-x="-4" + inkscape:window-y="-4" inkscape:window-maximized="1" inkscape:current-layer="svg2" /> - - - - - - - - - - - - - - - - - - - - - - - - + id="g3046" + transform="matrix(2.4202879,0,0,2.5639849,28.046412,133.81959)"> + style="opacity:0.67577999;fill:none;stroke:#000000;stroke-width:0.70607585;stroke-linecap:square" + id="path53" + d="m 2.2394675,-42.863241 a 4.9810917,4.9419407 0 0 1 -9.9621834,0 4.9810917,4.9419407 0 1 1 9.9621834,0 z" + inkscape:connector-curvature="0" /> + style="opacity:0.67577999;fill:none;stroke:#000000;stroke-width:0.95099938" + id="path55" + d="m -1.8474096,-46.3301 0,6.969857" + inkscape:connector-curvature="0" /> + style="opacity:0.67577999;fill-rule:evenodd;stroke:#000000;stroke-width:0.75682741" + id="path57" + d="m -4.9075736,-44.616426 0,3.652544 2.592539,-1.826209 -2.592539,-1.826218 z" + inkscape:connector-curvature="0" /> + + + + G + D + S diff --git a/bitmaps_png/sources/import_cmp_from_lib.svg b/bitmaps_png/sources/import_cmp_from_lib.svg index 5c309d7207..cb8ac4684d 100644 --- a/bitmaps_png/sources/import_cmp_from_lib.svg +++ b/bitmaps_png/sources/import_cmp_from_lib.svg @@ -11,7 +11,7 @@ width="48" version="1.1" id="svg2" - inkscape:version="0.47 r22583" + inkscape:version="0.48.1 " sodipodi:docname="import_cmp_from_lib.svg"> @@ -44,14 +44,14 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1280" - inkscape:window-height="949" + inkscape:window-height="968" id="namedview66" showgrid="false" - inkscape:zoom="4.9166667" - inkscape:cx="24" - inkscape:cy="39.864407" - inkscape:window-x="0" - inkscape:window-y="25" + inkscape:zoom="14.0462" + inkscape:cx="12.856289" + inkscape:cy="20.34142" + inkscape:window-x="-4" + inkscape:window-y="-4" inkscape:window-maximized="1" inkscape:current-layer="svg2" /> - - - - - - - - - - - - - - - - - - - - - - + id="g3772"> + + + id="g3046" + transform="matrix(2.4046373,0,0,2.5262435,27.904736,136.96894)"> + style="opacity:0.67577999;fill:none;stroke:#000000;stroke-width:0.70607585;stroke-linecap:square" + id="path53" + d="m 2.2394675,-42.863241 a 4.9810917,4.9419407 0 0 1 -9.9621834,0 4.9810917,4.9419407 0 1 1 9.9621834,0 z" + inkscape:connector-curvature="0" /> + style="opacity:0.67577999;fill:none;stroke:#000000;stroke-width:0.95099938" + id="path55" + d="m -1.8474096,-46.3301 0,6.969857" + inkscape:connector-curvature="0" /> + + + + + G + D + S diff --git a/bitmaps_png/sources/new_component.svg b/bitmaps_png/sources/new_component.svg index 3e5c1b5d4a..4f21743b6f 100644 --- a/bitmaps_png/sources/new_component.svg +++ b/bitmaps_png/sources/new_component.svg @@ -11,7 +11,7 @@ width="48" version="1.1" id="svg2" - inkscape:version="0.47 r22583" + inkscape:version="0.48.1 " sodipodi:docname="new_component.svg"> @@ -34,14 +34,14 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1280" - inkscape:window-height="949" + inkscape:window-height="968" id="namedview96" showgrid="false" - inkscape:zoom="4.9166667" + inkscape:zoom="15.230143" inkscape:cx="24.000001" inkscape:cy="26.237289" - inkscape:window-x="0" - inkscape:window-y="25" + inkscape:window-x="-4" + inkscape:window-y="-4" inkscape:window-maximized="1" inkscape:current-layer="svg2" /> - - - - - - - - - - - - - - - - - - - - - - + id="g3046" + transform="matrix(2.4046373,0,0,2.5262435,27.904736,137.42856)"> + + + + + + + G + D + S + d="M 12,5.5 9.4826,4.1505 6.9438,5.4592 7.4494,2.648 5.4202,0.6379 8.25,0.25 9.5347,-2.301 10.778,0.2704 13.601,0.70392 11.54,2.68102 z" + transform="matrix(0.86499,0,0,0.86499,3.3638,-4.5167)" + id="path80" + inkscape:connector-curvature="0" + style="fill:#afaf00" /> + d="M 12,5.5 9.4826,4.1505 6.9438,5.4592 7.4494,2.648 5.4202,0.6379 8.25,0.25 9.5347,-2.301 10.778,0.2704 13.601,0.70392 11.54,2.68102 z" + transform="matrix(0.61624,0,0,0.61624,5.7296,-4.1188)" + id="path82" + inkscape:connector-curvature="0" + style="fill:#ebeb00" /> + d="M 12,5.5 9.4826,4.1505 6.9438,5.4592 7.4494,2.648 5.4202,0.6379 8.25,0.25 9.5347,-2.301 10.778,0.2704 13.601,0.70392 11.54,2.68102 z" + transform="matrix(0.3815,0,0,0.3815,7.9622,-3.7434)" + id="path84" + inkscape:connector-curvature="0" + style="fill:#ffff00" /> diff --git a/bitmaps_png/sources/new_pcb.svg b/bitmaps_png/sources/new_pcb.svg index b0711d202c..39ad8f31f2 100644 --- a/bitmaps_png/sources/new_pcb.svg +++ b/bitmaps_png/sources/new_pcb.svg @@ -12,7 +12,7 @@ width="48" version="1.0" id="svg2" - inkscape:version="0.48.1 " + inkscape:version="0.47 r22583" sodipodi:docname="new_pcb.svg"> @@ -22,6 +22,7 @@ image/svg+xml + @@ -35,345 +36,1312 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1280" - inkscape:window-height="968" + inkscape:window-height="949" id="namedview356" - showgrid="false" - inkscape:zoom="16.29279" - inkscape:cx="24.689762" - inkscape:cy="24.293552" - inkscape:window-x="-4" - inkscape:window-y="-4" + showgrid="true" + inkscape:zoom="8.146395" + inkscape:cx="33.215195" + inkscape:cy="37.915782" + inkscape:window-x="0" + inkscape:window-y="25" inkscape:window-maximized="1" - inkscape:current-layer="svg2" /> + inkscape:current-layer="svg2" + inkscape:snap-grids="false" + inkscape:snap-to-guides="false"> + + + + + + cy="112.3" + cx="102" + gradientTransform="matrix(0.21025443,0,0,0.20683793,-0.54460205,-0.44781288)" + r="139.56"> + id="stop203" /> + + + + + + id="stop215" /> + + + + + + + x2="153" + gradientTransform="translate(-143,-64)" + y1="175.56" + x1="153"> + id="stop16-8" /> - - - - - - - - - + id="stop18-7" /> + x2="151.89999" + gradientTransform="translate(-143,-64)" + y1="175.10001" + x1="154.10001"> + id="stop21-2" /> - - - - - - - - - - - - - - - + id="stop23-8" /> + x2="153" + gradientTransform="translate(-143,-64)" + y1="167.56" + x1="153"> + id="stop26-2" /> + id="stop28-9" /> + x2="151.89999" + gradientTransform="translate(-143,-64)" + y1="167.10001" + x1="154.10001"> + id="stop31" /> + id="stop33-9" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + gradientTransform="matrix(0.45698973,0,0,0.39472284,-5.1395578,-1.3667406)" + x1="98.616997" + y1="106.41" + x2="91.228996" + y2="99.254997" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + style="opacity:0.5;filter:url(#bb)" /> + style="fill:#ffffff" /> + style="fill:url(#radialGradient3436)" /> - - - - - - - - - - - - - - + style="opacity:0.4;filter:url(#bc)" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bitmaps_png/sources/open_brd_file.svg b/bitmaps_png/sources/open_brd_file.svg index f13da4aded..b735dc23b9 100644 --- a/bitmaps_png/sources/open_brd_file.svg +++ b/bitmaps_png/sources/open_brd_file.svg @@ -12,7 +12,7 @@ width="48" version="1.0" id="svg2" - inkscape:version="0.48.1 " + inkscape:version="0.47 r22583" sodipodi:docname="open_brd_file.svg"> @@ -22,7 +22,7 @@ image/svg+xml - + @@ -36,588 +36,1320 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1280" - inkscape:window-height="968" + inkscape:window-height="949" id="namedview356" - showgrid="false" - inkscape:zoom="3.8205006" - inkscape:cx="-50.573174" - inkscape:cy="36.531716" - inkscape:window-x="-4" - inkscape:window-y="-4" + showgrid="true" + inkscape:zoom="8.146395" + inkscape:cx="35.0565" + inkscape:cy="37.424768" + inkscape:window-x="0" + inkscape:window-y="25" inkscape:window-maximized="1" - inkscape:current-layer="svg2" /> + inkscape:current-layer="svg2" + inkscape:snap-grids="false" + inkscape:snap-to-guides="false"> + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + stdDeviation="2.0786429" + id="feGaussianBlur7" /> - - - - - - - - - - - - + id="stop203" /> + offset=".18851" + id="stop205" /> + offset=".25718" + id="stop207" /> + offset=".30111" + id="stop209" /> + id="stop211" /> + id="stop213" /> + id="stop215" /> + + + + + + + x2="153" + gradientTransform="translate(-143,-64)" + y1="175.56" + x1="153"> + id="stop16-8" /> + id="stop18-7" /> + x2="151.89999" + gradientTransform="translate(-143,-64)" + y1="175.10001" + x1="154.10001"> + + + + + id="stop26-2" /> + id="stop28-9" /> + x2="151.89999" + gradientTransform="translate(-143,-64)" + y1="167.10001" + x1="154.10001"> + + + + + id="stop36" /> + id="stop38-6" /> + x2="151.89999" + gradientTransform="translate(-143,-64)" + y1="159.10001" + x1="154.10001"> + id="stop41" /> + stop-color="#616161" + offset="1" + id="stop43-0" /> + + + stop-color="#fff" + offset="0" + id="stop46" /> + stop-color="#ddd" + offset="1" + id="stop48" /> + + + stop-color="#bbb" + offset="0" + id="stop51-2" /> + stop-color="#616161" + offset="1" + id="stop53" /> + + + stop-color="#fff" + offset="0" + id="stop56" /> + stop-color="#ddd" + offset="1" + id="stop58" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id="stop195" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + transform="matrix(0.45698973,0,0,0.39472284,-52.666726,12.843402)" + id="g225"> - - - - - - - - - - - + transform="translate(116,-32)" + id="g227"> + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + d="m -22.813695,19.734658 0,-18.0827607" + id="path313-8" + inkscape:connector-curvature="0" /> + + + + + + + + + + + + + + + diff --git a/eeschema/dialogs/dialog_lib_edit_text.cpp b/eeschema/dialogs/dialog_lib_edit_text.cpp index 9fbc0ea901..4019f0c1fb 100644 --- a/eeschema/dialogs/dialog_lib_edit_text.cpp +++ b/eeschema/dialogs/dialog_lib_edit_text.cpp @@ -1,8 +1,31 @@ -/**********************************/ -/* dialog_lib_edit_text.cpp */ -/**********************************/ +/** + * @file dialog_lib_edit_text.cpp + * @brief dialog to editing graphic texts (not fields) in bodu components. + */ -/* Code for editing component library text items, not fields. */ +/* + * This program source code file is part of KiCad, a free EDA CAD application. + * + * Copyright (C) 20011 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com + * Copyright (C) 2004-2011 KiCad Developers, see change_log.txt for contributors. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, you may find one here: + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + * or you may search the http://www.gnu.org website for the version 2 license, + * or you may write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ #include "fctsys.h" #include "gr_basic.h" @@ -22,15 +45,18 @@ DIALOG_LIB_EDIT_TEXT::DIALOG_LIB_EDIT_TEXT( LIB_EDIT_FRAME* aParent, LIB_TEXT* a { m_Parent = aParent; m_GraphicText = aText; - InitDialog(); + initDlg(); + + GetSizer()->SetSizeHints(this); + Centre(); } -void DIALOG_LIB_EDIT_TEXT::InitDialog( ) +void DIALOG_LIB_EDIT_TEXT::initDlg( ) { wxString msg; - SetFocus(); + m_TextValue->SetFocus(); if ( m_GraphicText ) { @@ -102,10 +128,6 @@ void DIALOG_LIB_EDIT_TEXT::InitDialog( ) msg = m_TextSizeText->GetLabel() + ReturnUnitSymbol(); m_TextSizeText->SetLabel( msg ); - GetSizer()->SetSizeHints(this); - - Centre(); - m_sdbSizerButtonsOK->SetDefault(); } diff --git a/eeschema/dialogs/dialog_lib_edit_text.h b/eeschema/dialogs/dialog_lib_edit_text.h index ceff55a22a..bae3b40c92 100644 --- a/eeschema/dialogs/dialog_lib_edit_text.h +++ b/eeschema/dialogs/dialog_lib_edit_text.h @@ -21,7 +21,7 @@ public: ~DIALOG_LIB_EDIT_TEXT() {}; private: - void InitDialog( ); + void initDlg( ); void OnOkClick( wxCommandEvent& aEvent ); void OnCancelClick( wxCommandEvent& aEvent ); }; diff --git a/eeschema/sch_field.cpp b/eeschema/sch_field.cpp index dc17157a06..e8ecd1da84 100644 --- a/eeschema/sch_field.cpp +++ b/eeschema/sch_field.cpp @@ -174,10 +174,8 @@ void SCH_FIELD::Draw( EDA_DRAW_PANEL* panel, wxDC* DC, * so the more easily way is to use no justifications ( Centered text ) * and use GetBoundaryBox to know the text coordinate considered as centered */ - EDA_RECT BoundaryBox = GetBoundingBox(); - GRTextHorizJustifyType hjustify = GR_TEXT_HJUSTIFY_CENTER; - GRTextVertJustifyType vjustify = GR_TEXT_VJUSTIFY_CENTER; - textpos = BoundaryBox.Centre(); + EDA_RECT boundaryBox = GetBoundingBox(); + textpos = boundaryBox.Centre(); if( m_FieldId == REFERENCE ) color = ReturnLayerColor( LAYER_REFERENCEPART ); @@ -186,20 +184,17 @@ void SCH_FIELD::Draw( EDA_DRAW_PANEL* panel, wxDC* DC, else color = ReturnLayerColor( LAYER_FIELDS ); - DrawGraphicText( panel, DC, textpos, color, GetText(), orient, m_Size, hjustify, vjustify, + DrawGraphicText( panel, DC, textpos, color, GetText(), orient, m_Size, + GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER, LineWidth, m_Italic, m_Bold ); /* Enable this to draw the bounding box around the text field to validate * the bounding box calculations. */ -#if 0 +#if 1 // Draw boundary box: - int x1 = BoundaryBox.GetX(); - int y1 = BoundaryBox.GetY(); - int x2 = BoundaryBox.GetRight(); - int y2 = BoundaryBox.GetBottom(); - GRRect( &panel->m_ClipBox, DC, x1, y1, x2, y2, BROWN ); + GRRect( &panel->m_ClipBox, DC, boundaryBox, 0, BROWN ); // Draw the text anchor point @@ -208,11 +203,11 @@ void SCH_FIELD::Draw( EDA_DRAW_PANEL* panel, wxDC* DC, textpos = m_Pos - parentComponent->GetPosition(); textpos = parentComponent->GetScreenCoord( textpos ); textpos += parentComponent->GetPosition(); - x1 = textpos.x; - y1 = textpos.y; - int len = 10; - GRLine( &panel->m_ClipBox, DC, x1 - len, y1, x1 + len, y1, 0, BLUE ); - GRLine( &panel->m_ClipBox, DC, x1, y1 - len, x1, y1 + len, 0, BLUE ); + const int len = 10; + GRLine( &panel->m_ClipBox, DC, + textpos.x - len, textpos.y, textpos.x + len, textpos.y, 0, BLUE ); + GRLine( &panel->m_ClipBox, DC, + textpos.x, textpos.y - len, textpos.x, textpos.y + len, 0, BLUE ); #endif } @@ -255,96 +250,39 @@ void SCH_FIELD::SwapData( SCH_ITEM* aItem ) EDA_RECT SCH_FIELD::GetBoundingBox() const { - EDA_RECT BoundaryBox; - int hjustify, vjustify; - int orient; - wxSize size; - wxPoint pos1, pos2; - SCH_COMPONENT* parentComponent = (SCH_COMPONENT*) m_Parent; - - orient = m_Orient; - wxPoint pos = parentComponent->GetPosition(); - pos1 = m_Pos - pos; - - size.x = LenSize( m_Text ); - size.y = m_Size.y; - hjustify = m_HJustify; - vjustify = m_VJustify; - - pos2 = pos + parentComponent->GetTransform().TransformCoordinate( pos1 ); - - // Calculate the text orientation, according to the component orientation/mirror. - if( parentComponent->GetTransform().y1 ) - { - if( orient == TEXT_ORIENT_HORIZ ) - orient = TEXT_ORIENT_VERT; - else - orient = TEXT_ORIENT_HORIZ; - } - - // Calculate the text justification, according to the component orientation/mirror. - if( parentComponent->GetTransform().y1 ) - { - /* is it mirrored (for text justify)*/ - EXCHG( hjustify, vjustify ); - - if( parentComponent->GetTransform().x2 < 0 ) - NEGATE( vjustify ); - - if( parentComponent->GetTransform().y1 > 0 ) - NEGATE( hjustify ); - } - else /* component horizontal: is it mirrored (for text justify)*/ - { - if( parentComponent->GetTransform().x1 < 0 ) - NEGATE( hjustify ); - - if( parentComponent->GetTransform().y2 > 0 ) - NEGATE( vjustify ); - } - - if( orient == TEXT_ORIENT_VERT ) - EXCHG( size.x, size.y ); - - switch( hjustify ) - { - case GR_TEXT_HJUSTIFY_CENTER: - pos1.x = pos2.x - (size.x / 2); - break; - - case GR_TEXT_HJUSTIFY_RIGHT: - pos1.x = pos2.x - size.x; - break; - - default: - pos1.x = pos2.x; - break; - } - - switch( vjustify ) - { - case GR_TEXT_VJUSTIFY_CENTER: - pos1.y = pos2.y - (size.y / 2); - break; - - case GR_TEXT_VJUSTIFY_BOTTOM: - pos1.y = pos2.y - size.y; - break; - - default: - pos1.y = pos2.y; - break; - } - - BoundaryBox.SetOrigin( pos1 ); - BoundaryBox.SetSize( size ); - - // Take thickness in account: int linewidth = ( m_Thickness == 0 ) ? g_DrawDefaultLineThickness : m_Thickness; - BoundaryBox.Inflate( linewidth, linewidth ); - return BoundaryBox; + // We must pass the effective text thickness to GetTextBox + // when calculating the bounding box + linewidth = Clamp_Text_PenSize( linewidth, m_Size, m_Bold ); + + // Calculate the text bounding box: + EDA_RECT rect = GetTextBox( -1, linewidth ); + + // Calculate the bounding box position relative to the component: + wxPoint origin = parentComponent->GetPosition(); + wxPoint pos = m_Pos - origin; + wxPoint begin = rect.GetOrigin() - origin; + wxPoint end = rect.GetEnd() - origin; + RotatePoint( &begin, pos, m_Orient ); + RotatePoint( &end, pos, m_Orient ); + // Due to the Y axis direction, we must mirror the bounding box, + // relative to the text position: + begin.y -= pos.y; + end.y -= pos.y; + NEGATE( begin.y ); + NEGATE( end.y ); + begin.y += pos.y; + end.y += pos.y; + // Now, apply the component transform (mirror/rot) + begin = parentComponent->GetTransform().TransformCoordinate( begin ); + end = parentComponent->GetTransform().TransformCoordinate( end ); + rect.SetOrigin( begin); + rect.SetEnd( end); + rect.Move( origin ); + rect.Normalize(); + return rect; }