enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Evas rg_etc2: Fix Windows build 

Use unsigned char/int instead of stdint in the header file.
This commit is contained in:
Jean-Philippe Andre 2014-05-28 12:04:36 +09:00
parent 9952699820
commit 69cbfc7530
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/static_libs/rg_etc/rg_etc1.h
View File

@ -38,10 +38,10 @@ void rg_etc1_pack_block_init();
unsigned int rg_etc1_pack_block(void* pETC1_block, const unsigned int* pSrc_pixels_BGRA, rg_etc1_pack_params *pack_params);
// ETC2 support: RGB8_ETC2
void rg_etc2_rgb8_decode_block(const uint8_t *etc_block, uint32_t *bgra);
void rg_etc2_rgb8_decode_block(const unsigned char *etc_block, unsigned int *bgra);
// ETC2 support: RGBA8_ETC2_EAC
void rg_etc2_rgba8_decode_block(const uint8_t *etc_block, uint32_t *bgra);
void rg_etc2_rgba8_decode_block(const unsigned char *etc_block, unsigned int *bgra);
//------------------------------------------------------------------------------
//

6
src/static_libs/rg_etc/rg_etc2.c
View File

@ -36,8 +36,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <Eina.h>
#include "rg_etc1.h"
void rg_etc2_rgb8_decode_block(const uint8_t *etc_block, uint32_t *bgra);
void rg_etc2_rgba8_decode_block(const uint8_t *etc_block, uint32_t *bgra);
void rg_etc2_rgb8_decode_block(const unsigned char *etc_block, unsigned int *bgra);
void rg_etc2_rgba8_decode_block(const unsigned char *etc_block, unsigned int *bgra);
typedef const uint8_t etc_block;
@ -244,7 +244,7 @@ _TH_paint(const uint8_t *etc, uint32_t paint_colors[4], uint32_t *bgra)
}
void
rg_etc2_rgb8_decode_block(const uint8_t *etc, uint32_t *bgra)
rg_etc2_rgb8_decode_block(const unsigned char *etc, unsigned int *bgra)
{
// Check differential mode bit
if ((etc[3] & 0x2) == 0)