Remove BITMAP_OPAQUE just like the TODO said :D
This commit is contained in:
Marek Roszko
parent
bee6e6be01
commit
63ba3b8ea7
|
|
@ -1,81 +0,0 @@
|
|||
# This program source code file is part of KICAD, a free EDA CAD application.
|
||||
#
|
||||
# Copyright (C) 2011 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
|
||||
# Copyright (C) 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
|
||||
#
|
||||
#############################################################################
|
||||
#
|
||||
# This script converts a *.png file into a *.cpp file.
|
||||
# The *.cpp file will contain a BITMAP_DEF structure, which is simply a byte
|
||||
# array and a length of bytes which were found in the *.png file.
|
||||
#
|
||||
#
|
||||
# Invocation Parameters are: inputFile, outCppFile
|
||||
#
|
||||
# inputFile - Required, full path and file name of the input PNG file
|
||||
#
|
||||
# outCppFile - Required, full path and file name of where to save the
|
||||
# generated cpp file.
|
||||
|
||||
|
||||
file( READ ${inputFile} file_contents HEX )
|
||||
|
||||
get_filename_component( png_name "${inputFile}" NAME_WE )
|
||||
|
||||
# split into pairs of ASCII, where each pair gives a single byte's value
|
||||
string( REGEX MATCHALL "[0-9a-fA-F][0-9a-fA-F]" byte_list ${file_contents} )
|
||||
|
||||
set( output_begin "
|
||||
/* Do not modify this file, it was automatically generated by the
|
||||
* PNG2cpp CMake script, using a *.png file as input.
|
||||
*/
|
||||
|
||||
#include <bitmaps_png/bitmaps_list.h>
|
||||
|
||||
static const unsigned char png[] = {"
|
||||
)
|
||||
|
||||
set( output_end "};
|
||||
|
||||
const BITMAP_OPAQUE ${png_name}_xpm[1] = {{ png, sizeof( png ), \"${png_name}_xpm\" }};
|
||||
|
||||
//EOF
|
||||
" )
|
||||
|
||||
set( byte_count 0 )
|
||||
set( byte_array "" )
|
||||
|
||||
foreach( byte ${byte_list} )
|
||||
|
||||
math( EXPR modulus "${byte_count} % 16" )
|
||||
if( modulus EQUAL 0 )
|
||||
set( byte_array "${byte_array}\n" )
|
||||
endif()
|
||||
|
||||
set( byte_array "${byte_array} 0x${byte}," )
|
||||
math( EXPR byte_count "${byte_count} + 1" )
|
||||
endforeach()
|
||||
|
||||
set( byte_array "${byte_array}\n" )
|
||||
|
||||
file( WRITE ${outCppFile} "${output_begin}" )
|
||||
file( APPEND ${outCppFile} "${byte_array}" )
|
||||
file( APPEND ${outCppFile} "${output_end}" )
|
||||
|
||||
|
|
@ -40,7 +40,6 @@
|
|||
#include <asset_archive.h>
|
||||
#include <bitmaps.h>
|
||||
#include <bitmap_store.h>
|
||||
#include <bitmaps/bitmap_opaque.h> // for pcb_calculator compatibility shim
|
||||
#include <pgm_base.h>
|
||||
#include <paths.h>
|
||||
#include <kiplatform/ui.h>
|
||||
|
|
@ -108,17 +107,6 @@ wxBitmap KiBitmap( BITMAPS aBitmap, int aHeightTag )
|
|||
}
|
||||
|
||||
|
||||
// TODO: Remove this once pcb_calculator images are moved into the main bitmap system
|
||||
wxBitmap KiBitmap( const BITMAP_OPAQUE* aBitmap )
|
||||
{
|
||||
wxMemoryInputStream is( aBitmap->png, aBitmap->byteCount );
|
||||
wxImage image( is, wxBITMAP_TYPE_PNG );
|
||||
wxBitmap bitmap( image );
|
||||
|
||||
return bitmap;
|
||||
}
|
||||
|
||||
|
||||
int KiIconScale( wxWindow* aWindow )
|
||||
{
|
||||
#if defined( __WXMSW__)
|
||||
|
|
|
|||
|
|
@ -1,40 +0,0 @@
|
|||
/*
|
||||
* This program source code file is part of KiCad, a free EDA CAD application.
|
||||
*
|
||||
* Copyright (C) 2007-2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
|
||||
* Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.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 3 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, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef KICAD_BITMAP_OPAQUE_H
|
||||
#define KICAD_BITMAP_OPAQUE_H
|
||||
|
||||
/// PNG memory record (file in memory).
|
||||
struct BITMAP_OPAQUE
|
||||
{
|
||||
const unsigned char* png;
|
||||
int byteCount;
|
||||
const char* name; // for debug, or future lazy dynamic linking
|
||||
};
|
||||
|
||||
// declared as single element _array_, so its name assigns to pointer
|
||||
#define EXTERN_BITMAP( x ) extern const BITMAP_OPAQUE x[1];
|
||||
|
||||
|
||||
/// a BITMAP_DEF is really a const pointer to an opaque
|
||||
/// structure. So you should never need to use 'const' with it.
|
||||
typedef const BITMAP_OPAQUE *BITMAP_DEF;
|
||||
|
||||
#endif // KICAD_BITMAP_OPAQUE_H
|
||||
|
|
@ -32,7 +32,6 @@
|
|||
class wxBitmap; // only to define wxBitmap
|
||||
class wxWindow;
|
||||
class wxString;
|
||||
struct BITMAP_OPAQUE;
|
||||
class BITMAP_STORE;
|
||||
|
||||
enum class BITMAPS : unsigned int;
|
||||
|
|
@ -54,11 +53,6 @@ BITMAP_STORE* GetBitmapStore();
|
|||
*/
|
||||
wxBitmap KiBitmap( BITMAPS aBitmap, int aHeightTag = -1 );
|
||||
|
||||
/**
|
||||
* Compatibility shim for pcb_calculator until its images are pulled into the PNG pipeline
|
||||
*/
|
||||
wxBitmap KiBitmap( const BITMAP_OPAQUE* aBitmap );
|
||||
|
||||
/**
|
||||
* Wipes out the scaled bitmap cache so that the icon theme can be changed.
|
||||
* TODO: move scaling system into BITMAP_STORE so this global doesn't need to exist
|
||||
|
|
|
|||
|
|
@ -750,20 +750,6 @@ function( png2png inputFile outFile )
|
|||
)
|
||||
endfunction()
|
||||
|
||||
# Function png2cpp
|
||||
# converts a single *.png to *.cpp
|
||||
function( png2cpp inputFile outFile )
|
||||
add_custom_command(
|
||||
OUTPUT ${outFile}
|
||||
|
||||
COMMAND ${CMAKE_COMMAND} -DinputFile=${inputFile} -DoutCppFile=${outFile}
|
||||
-P ${KICAD_CMAKE_MODULE_PATH}/BuildSteps/PNG2cpp.cmake
|
||||
|
||||
DEPENDS ${inputFile} ${KICAD_CMAKE_MODULE_PATH}/BuildSteps/PNG2cpp.cmake
|
||||
COMMENT "Creating ${outFile}"
|
||||
)
|
||||
endfunction()
|
||||
|
||||
|
||||
# Function bitmap_dir
|
||||
# Creates build targets for all the source SVGs in the given list, output at the given resolution
|
||||
|
|
|
|||
Loading…
Reference in New Issue