-updated freetype configuration, now the fonts should look

like with the old versions again
-made a few default theme pics to jpg, you wont even notice a
difference, just in size :P
This commit is contained in:
fix94.1 2012-07-23 13:41:13 +00:00
parent e8c66b7278
commit e78f710d1b
26 changed files with 116 additions and 205 deletions

BIN
data/images/background.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 854 B

BIN
data/images/esrb_ao.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
data/images/esrb_e.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
data/images/esrb_ec.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
data/images/esrb_eten.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
data/images/esrb_m.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
data/images/esrb_t.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
data/images/flatloading.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

BIN
data/images/norating.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@ -1,10 +1,11 @@
/* ftconfig.h. Generated from ftconfig.in by configure. */
/***************************************************************************/ /***************************************************************************/
/* */ /* */
/* ftconfig.h */ /* ftconfig.in */
/* */ /* */
/* ANSI-specific configuration file (specification only). */ /* UNIX-specific configuration file (specification only). */
/* */ /* */
/* Copyright 1996-2004, 2006-2008, 2010-2011 by */ /* Copyright 1996-2004, 2006-2009, 2011 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */
@ -31,10 +32,9 @@
/* contains system-specific files that are always included first when */ /* contains system-specific files that are always included first when */
/* building the library. */ /* building the library. */
/* */ /* */
/* This ANSI version should stay in `include/freetype/config'. */
/* */
/*************************************************************************/ /*************************************************************************/
#ifndef __FTCONFIG_H__ #ifndef __FTCONFIG_H__
#define __FTCONFIG_H__ #define __FTCONFIG_H__
@ -58,6 +58,11 @@ FT_BEGIN_HEADER
/*************************************************************************/ /*************************************************************************/
#define HAVE_UNISTD_H 1
#define HAVE_FCNTL_H 1
#define HAVE_STDINT_H 1
/* There are systems (like the Texas Instruments 'C54x) where a `char' */ /* There are systems (like the Texas Instruments 'C54x) where a `char' */
/* has 16 bits. ANSI C says that sizeof(char) is always 1. Since an */ /* has 16 bits. ANSI C says that sizeof(char) is always 1. Since an */
/* `int' has 16 bits also for this system, sizeof(int) gives 1 which */ /* `int' has 16 bits also for this system, sizeof(int) gives 1 which */
@ -71,6 +76,22 @@ FT_BEGIN_HEADER
#endif #endif
/* #undef FT_USE_AUTOCONF_SIZEOF_TYPES */
#ifdef FT_USE_AUTOCONF_SIZEOF_TYPES
#define SIZEOF_INT 4
#define SIZEOF_LONG 4
#define FT_SIZEOF_INT SIZEOF_INT
#define FT_SIZEOF_LONG SIZEOF_LONG
#else /* !FT_USE_AUTOCONF_SIZEOF_TYPES */
/* Following cpp computation of the bit length of int and long */
/* is copied from default include/freetype/config/ftconfig.h. */
/* If any improvement is required for this file, it should be */
/* applied to the original header file for the builders that */
/* does not use configure script. */
/* The size of an `int' type. */ /* The size of an `int' type. */
#if FT_UINT_MAX == 0xFFFFUL #if FT_UINT_MAX == 0xFFFFUL
#define FT_SIZEOF_INT (16 / FT_CHAR_BIT) #define FT_SIZEOF_INT (16 / FT_CHAR_BIT)
@ -94,6 +115,8 @@ FT_BEGIN_HEADER
#error "Unsupported size of `long' type!" #error "Unsupported size of `long' type!"
#endif #endif
#endif /* !FT_USE_AUTOCONF_SIZEOF_TYPES */
/* FT_UNUSED is a macro used to indicate that a given parameter is not */ /* FT_UNUSED is a macro used to indicate that a given parameter is not */
/* used -- this is only used to get rid of unpleasant compiler warnings */ /* used -- this is only used to get rid of unpleasant compiler warnings */
@ -143,73 +166,29 @@ FT_BEGIN_HEADER
#endif #endif
/*************************************************************************/ /* Fix compiler warning with sgi compiler */
/* */ #if defined( __sgi ) && !defined( __GNUC__ )
/* <Section> */ #if defined( _COMPILER_VERSION ) && ( _COMPILER_VERSION >= 730 )
/* basic_types */ #pragma set woff 3505
/* */ #endif
/*************************************************************************/
/*************************************************************************/
/* */
/* <Type> */
/* FT_Int16 */
/* */
/* <Description> */
/* A typedef for a 16bit signed integer type. */
/* */
typedef signed short FT_Int16;
/*************************************************************************/
/* */
/* <Type> */
/* FT_UInt16 */
/* */
/* <Description> */
/* A typedef for a 16bit unsigned integer type. */
/* */
typedef unsigned short FT_UInt16;
/* */
/* this #if 0 ... #endif clause is for documentation purposes */
#if 0
/*************************************************************************/
/* */
/* <Type> */
/* FT_Int32 */
/* */
/* <Description> */
/* A typedef for a 32bit signed integer type. The size depends on */
/* the configuration. */
/* */
typedef signed XXX FT_Int32;
/*************************************************************************/
/* */
/* <Type> */
/* FT_UInt32 */
/* */
/* A typedef for a 32bit unsigned integer type. The size depends on */
/* the configuration. */
/* */
typedef unsigned XXX FT_UInt32;
/* */
#endif #endif
#if FT_SIZEOF_INT == (32 / FT_CHAR_BIT)
/*************************************************************************/
/* */
/* IntN types */
/* */
/* Used to guarantee the size of some specific integers. */
/* */
typedef signed short FT_Int16;
typedef unsigned short FT_UInt16;
#if FT_SIZEOF_INT == 4
typedef signed int FT_Int32; typedef signed int FT_Int32;
typedef unsigned int FT_UInt32; typedef unsigned int FT_UInt32;
#elif FT_SIZEOF_LONG == (32 / FT_CHAR_BIT) #elif FT_SIZEOF_LONG == 4
typedef signed long FT_Int32; typedef signed long FT_Int32;
typedef unsigned long FT_UInt32; typedef unsigned long FT_UInt32;
@ -220,12 +199,12 @@ FT_BEGIN_HEADER
/* look up an integer type that is at least 32 bits */ /* look up an integer type that is at least 32 bits */
#if FT_SIZEOF_INT >= (32 / FT_CHAR_BIT) #if FT_SIZEOF_INT >= 4
typedef int FT_Fast; typedef int FT_Fast;
typedef unsigned int FT_UFast; typedef unsigned int FT_UFast;
#elif FT_SIZEOF_LONG >= (32 / FT_CHAR_BIT) #elif FT_SIZEOF_LONG >= 4
typedef long FT_Fast; typedef long FT_Fast;
typedef unsigned long FT_UFast; typedef unsigned long FT_UFast;
@ -235,7 +214,7 @@ FT_BEGIN_HEADER
/* determine whether we have a 64-bit int type for platforms without */ /* determine whether we have a 64-bit int type for platforms without */
/* Autoconf */ /* Autoconf */
#if FT_SIZEOF_LONG == (64 / FT_CHAR_BIT) #if FT_SIZEOF_LONG == 8
/* FT_LONG64 must be defined if a 64-bit type is available */ /* FT_LONG64 must be defined if a 64-bit type is available */
#define FT_LONG64 #define FT_LONG64
@ -271,7 +250,7 @@ FT_BEGIN_HEADER
#define FT_LONG64 #define FT_LONG64
#define FT_INT64 long long int #define FT_INT64 long long int
#endif /* FT_SIZEOF_LONG == (64 / FT_CHAR_BIT) */ #endif /* FT_SIZEOF_LONG == 8 */
/*************************************************************************/ /*************************************************************************/
@ -285,7 +264,10 @@ FT_BEGIN_HEADER
#ifdef __STDC__ #ifdef __STDC__
/* undefine the 64-bit macros in strict ANSI compilation mode */ /* Undefine the 64-bit macros in strict ANSI compilation mode. */
/* Since `#undef' doesn't survive in configuration header files */
/* we use the postprocessing facility of AC_CONFIG_HEADERS to */
/* replace the leading `/' with `#'. */
#undef FT_LONG64 #undef FT_LONG64
#undef FT_INT64 #undef FT_INT64

View File

@ -309,7 +309,7 @@ FT_BEGIN_HEADER
/* */ /* */
/* Note that the `FOND' resource isn't checked. */ /* Note that the `FOND' resource isn't checked. */
/* */ /* */
#define FT_CONFIG_OPTION_MAC_FONTS /* #define FT_CONFIG_OPTION_MAC_FONTS */
/*************************************************************************/ /*************************************************************************/
@ -555,7 +555,7 @@ FT_BEGIN_HEADER
/* Do not #undef this macro here, since the build system might */ /* Do not #undef this macro here, since the build system might */
/* define it for certain configurations only. */ /* define it for certain configurations only. */
/* */ /* */
#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER /* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
/*************************************************************************/ /*************************************************************************/
@ -605,7 +605,7 @@ FT_BEGIN_HEADER
/* ... */ /* ... */
/* } */ /* } */
/* */ /* */
/* #define TT_CONFIG_OPTION_UNPATENTED_HINTING */ #define TT_CONFIG_OPTION_UNPATENTED_HINTING
/*************************************************************************/ /*************************************************************************/

View File

@ -1,102 +0,0 @@
/***************************************************************************/
/* */
/* ftbzip2.h */
/* */
/* Bzip2-compressed stream support. */
/* */
/* Copyright 2010 by */
/* Joel Klinghed. */
/* */
/* This file is part of the FreeType project, and may only be used, */
/* modified, and distributed under the terms of the FreeType project */
/* license, LICENSE.TXT. By continuing to use, modify, or distribute */
/* this file you indicate that you have read the license and */
/* understand and accept it fully. */
/* */
/***************************************************************************/
#ifndef __FTBZIP2_H__
#define __FTBZIP2_H__
#include <ft2build.h>
#include FT_FREETYPE_H
#ifdef FREETYPE_H
#error "freetype.h of FreeType 1 has been loaded!"
#error "Please fix the directory search order for header files"
#error "so that freetype.h of FreeType 2 is found first."
#endif
FT_BEGIN_HEADER
/*************************************************************************/
/* */
/* <Section> */
/* bzip2 */
/* */
/* <Title> */
/* BZIP2 Streams */
/* */
/* <Abstract> */
/* Using bzip2-compressed font files. */
/* */
/* <Description> */
/* This section contains the declaration of Bzip2-specific functions. */
/* */
/*************************************************************************/
/************************************************************************
*
* @function:
* FT_Stream_OpenBzip2
*
* @description:
* Open a new stream to parse bzip2-compressed font files. This is
* mainly used to support the compressed `*.pcf.bz2' fonts that come
* with XFree86.
*
* @input:
* stream ::
* The target embedding stream.
*
* source ::
* The source stream.
*
* @return:
* FreeType error code. 0~means success.
*
* @note:
* The source stream must be opened _before_ calling this function.
*
* Calling the internal function `FT_Stream_Close' on the new stream will
* *not* call `FT_Stream_Close' on the source stream. None of the stream
* objects will be released to the heap.
*
* The stream implementation is very basic and resets the decompression
* process each time seeking backwards is needed within the stream.
*
* In certain builds of the library, bzip2 compression recognition is
* automatically handled when calling @FT_New_Face or @FT_Open_Face.
* This means that if no font driver is capable of handling the raw
* compressed file, the library will try to open a bzip2 compressed stream
* from it and re-open the face with it.
*
* This function may return `FT_Err_Unimplemented_Feature' if your build
* of FreeType was not compiled with bzip2 support.
*/
FT_EXPORT( FT_Error )
FT_Stream_OpenBzip2( FT_Stream stream,
FT_Stream source );
/* */
FT_END_HEADER
#endif /* __FTBZIP2_H__ */
/* END */

View File

@ -2,10 +2,9 @@
/* */ /* */
/* ft2build.h */ /* ft2build.h */
/* */ /* */
/* FreeType 2 build and setup macros. */ /* Build macros of the FreeType 2 library. */
/* (Generic version) */
/* */ /* */
/* Copyright 1996-2001, 2006 by */ /* Copyright 1996-2001, 2003, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */
@ -19,21 +18,44 @@
/*************************************************************************/ /*************************************************************************/
/* */ /* */
/* This file corresponds to the default `ft2build.h' file for */ /* This is a Unix-specific version of <ft2build.h> that should be used */
/* FreeType 2. It uses the `freetype' include root. */ /* exclusively *after* installation of the library. */
/* */ /* */
/* Note that specific platforms might use a different configuration. */ /* It assumes that `/usr/local/include/freetype2' (or whatever is */
/* See builds/unix/ft2unix.h for an example. */ /* returned by the `freetype-config --cflags' or `pkg-config --cflags' */
/* command) is in your compilation include path. */
/* */
/* We don't need to do anything special in this release. However, for */
/* a future FreeType 2 release, the following installation changes will */
/* be performed: */
/* */
/* - The contents of `freetype-2.x/include/freetype' will be installed */
/* to `/usr/local/include/freetype2' instead of */
/* `/usr/local/include/freetype2/freetype'. */
/* */
/* - This file will #include <freetype2/config/ftheader.h>, instead */
/* of <freetype/config/ftheader.h>. */
/* */
/* - The contents of `ftheader.h' will be processed with `sed' to */
/* replace all `<freetype/xxx>' with `<freetype2/xxx>'. */
/* */
/* - Adding `/usr/local/include/freetype2' to your compilation include */
/* path will not be necessary anymore. */
/* */
/* These changes will be transparent to client applications which use */
/* freetype-config (or pkg-config). No modifications will be necessary */
/* to compile with the new scheme. */
/* */ /* */
/*************************************************************************/ /*************************************************************************/
#ifndef __FT2_BUILD_GENERIC_H__ #ifndef __FT2_BUILD_UNIX_H__
#define __FT2_BUILD_GENERIC_H__ #define __FT2_BUILD_UNIX_H__
/* `<prefix>/include/freetype2' must be in your current inclusion path */
#include <freetype/config/ftheader.h> #include <freetype/config/ftheader.h>
#endif /* __FT2_BUILD_GENERIC_H__ */ #endif /* __FT2_BUILD_UNIX_H__ */
/* END */ /* END */

Binary file not shown.

View File

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

View File

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

Before

Width:  |  Height:  |  Size: 9.3 KiB

After

Width:  |  Height:  |  Size: 9.3 KiB

View File

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

@ -33,7 +33,8 @@ extern const u32 dvdskin_greentwo_jpg_size;
extern const u8 nopic_png[]; extern const u8 nopic_png[];
extern const u8 loading_png[]; extern const u8 loading_png[];
extern const u8 flatnopic_png[]; extern const u8 flatnopic_png[];
extern const u8 flatloading_png[]; extern const u8 flatloading_jpg[];
extern const u32 flatloading_jpg_size;
static const int black_len = 16; static const int black_len = 16;
static const char* black[black_len] = {"RZZJEL","RZNJ01","SEKJ99","SX3J01","SX3P01","R5WJA4","RUYJ99","S3HJ08","SJBJ01","CKBE88","CCPE01","SMMP01","MDUE01","SL2J01","APR","AFR"}; static const char* black[black_len] = {"RZZJEL","RZNJ01","SEKJ99","SX3J01","SX3P01","R5WJA4","RUYJ99","S3HJ08","SJBJ01","CKBE88","CCPE01","SMMP01","MDUE01","SL2J01","APR","AFR"};
@ -1857,7 +1858,7 @@ bool CCoverFlow::start(const char *id)
else else
{ {
if (m_pngLoadCoverFlat.empty() || STexture::TE_OK != m_loadingTexture.fromImageFile(m_pngLoadCoverFlat.c_str(), GX_TF_CMPR, ALLOC_MEM2, 32, 512)) if (m_pngLoadCoverFlat.empty() || STexture::TE_OK != m_loadingTexture.fromImageFile(m_pngLoadCoverFlat.c_str(), GX_TF_CMPR, ALLOC_MEM2, 32, 512))
if (STexture::TE_OK != m_loadingTexture.fromPNG(flatloading_png, GX_TF_CMPR, ALLOC_MEM2, 32, 512)) return false; if (STexture::TE_OK != m_loadingTexture.fromJPG(flatloading_jpg, flatloading_jpg_size, GX_TF_CMPR, ALLOC_MEM2, 32, 512)) return false;
if (m_pngNoCoverFlat.empty() || STexture::TE_OK != m_noCoverTexture.fromImageFile(m_pngNoCoverFlat.c_str(), GX_TF_CMPR, ALLOC_MEM2, 32, 512)) if (m_pngNoCoverFlat.empty() || STexture::TE_OK != m_noCoverTexture.fromImageFile(m_pngNoCoverFlat.c_str(), GX_TF_CMPR, ALLOC_MEM2, 32, 512))
if (STexture::TE_OK != m_noCoverTexture.fromPNG(flatnopic_png, GX_TF_CMPR, ALLOC_MEM2, 32, 512)) return false; if (STexture::TE_OK != m_noCoverTexture.fromPNG(flatnopic_png, GX_TF_CMPR, ALLOC_MEM2, 32, 512)) return false;

View File

@ -40,7 +40,8 @@ extern const u8 btnplus_png[];
extern const u8 btnpluss_png[]; extern const u8 btnpluss_png[];
extern const u8 btnminus_png[]; extern const u8 btnminus_png[];
extern const u8 btnminuss_png[]; extern const u8 btnminuss_png[];
extern const u8 background_png[]; extern const u8 background_jpg[];
extern const u32 background_jpg_size;
extern const u8 butleft_png[]; extern const u8 butleft_png[];
extern const u8 butcenter_png[]; extern const u8 butcenter_png[];
extern const u8 butright_png[]; extern const u8 butright_png[];
@ -1077,8 +1078,8 @@ void CMenu::_buildMenus(void)
theme.btnTexMinusS.fromPNG(btnminuss_png); theme.btnTexMinusS.fromPNG(btnminuss_png);
theme.btnTexMinusS = _texture(theme.texSet, "GENERAL", "minus_button_texture_selected", theme.btnTexMinusS); theme.btnTexMinusS = _texture(theme.texSet, "GENERAL", "minus_button_texture_selected", theme.btnTexMinusS);
// Default background // Default background
theme.bg.fromPNG(background_png, GX_TF_RGBA8, ALLOC_MEM2); theme.bg.fromJPG(background_jpg, background_jpg_size);
m_mainBgLQ.fromPNG(background_png, GX_TF_CMPR, ALLOC_MEM2, 64, 64); m_mainBgLQ.fromJPG(background_jpg, background_jpg_size, GX_TF_CMPR, ALLOC_MEM2, 64, 64);
m_gameBgLQ = m_mainBgLQ; m_gameBgLQ = m_mainBgLQ;
// Build menus // Build menus

View File

@ -48,14 +48,21 @@ extern const u8 keyboard_png[];
extern const u8 wiispeak_png[]; extern const u8 wiispeak_png[];
//Ratings //Ratings
extern const u8 norating_png[]; extern const u8 norating_jpg[];
extern const u32 norating_jpg_size;
extern const u8 esrb_ec_png[]; extern const u8 esrb_ec_jpg[];
extern const u8 esrb_e_png[]; extern const u32 esrb_ec_jpg_size;
extern const u8 esrb_eten_png[]; extern const u8 esrb_e_jpg[];
extern const u8 esrb_t_png[]; extern const u32 esrb_e_jpg_size;
extern const u8 esrb_m_png[]; extern const u8 esrb_eten_jpg[];
extern const u8 esrb_ao_png[]; extern const u32 esrb_eten_jpg_size;
extern const u8 esrb_t_jpg[];
extern const u32 esrb_t_jpg_size;
extern const u8 esrb_m_jpg[];
extern const u32 esrb_m_jpg_size;
extern const u8 esrb_ao_jpg[];
extern const u32 esrb_ao_jpg_size;
extern const u8 cero_a_png[]; extern const u8 cero_a_png[];
extern const u8 cero_b_png[]; extern const u8 cero_b_png[];
@ -343,7 +350,7 @@ void CMenu::_textGameInfo(void)
} }
//Ratings //Ratings
m_rating.fromPNG(norating_png); m_rating.fromJPG(norating_jpg, norating_jpg_size);
switch(gameinfo.RatingType) switch(gameinfo.RatingType)
{ {
case GAMETDB_RATING_TYPE_CERO: case GAMETDB_RATING_TYPE_CERO:
@ -360,17 +367,17 @@ void CMenu::_textGameInfo(void)
break; break;
case GAMETDB_RATING_TYPE_ESRB: case GAMETDB_RATING_TYPE_ESRB:
if (gameinfo.RatingValue == "E") if (gameinfo.RatingValue == "E")
m_rating.fromPNG(esrb_e_png); m_rating.fromJPG(esrb_e_jpg, esrb_e_jpg_size);
else if (gameinfo.RatingValue == "EC") else if (gameinfo.RatingValue == "EC")
m_rating.fromPNG(esrb_ec_png); m_rating.fromJPG(esrb_ec_jpg, esrb_ec_jpg_size);
else if (gameinfo.RatingValue == "E10+") else if (gameinfo.RatingValue == "E10+")
m_rating.fromPNG(esrb_eten_png); m_rating.fromJPG(esrb_eten_jpg, esrb_eten_jpg_size);
else if (gameinfo.RatingValue == "T") else if (gameinfo.RatingValue == "T")
m_rating.fromPNG(esrb_t_png); m_rating.fromJPG(esrb_t_jpg, esrb_t_jpg_size);
else if (gameinfo.RatingValue == "M") else if (gameinfo.RatingValue == "M")
m_rating.fromPNG(esrb_m_png); m_rating.fromJPG(esrb_m_jpg, esrb_m_jpg_size);
else if (gameinfo.RatingValue == "AO") else if (gameinfo.RatingValue == "AO")
m_rating.fromPNG(esrb_ao_png); m_rating.fromJPG(esrb_ao_jpg, esrb_ao_jpg_size);
break; break;
case GAMETDB_RATING_TYPE_PEGI: case GAMETDB_RATING_TYPE_PEGI:
if (gameinfo.RatingValue == "3") if (gameinfo.RatingValue == "3")