summaryrefslogtreecommitdiff
path: root/src/static_libs/rg_etc
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2014-05-28 12:04:36 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2014-05-28 12:11:05 +0900
commit69cbfc75304de7ea5c8b30285d3338648f0ebe35 (patch)
tree5325b59f5e59e93d54366468303781ea15863b22 /src/static_libs/rg_etc
parent995269982066db3b402e6cbde02d65743c722b1d (diff)
Evas rg_etc2: Fix Windows build
Use unsigned char/int instead of stdint in the header file.
Diffstat (limited to 'src/static_libs/rg_etc')
-rw-r--r--src/static_libs/rg_etc/rg_etc1.h4
-rw-r--r--src/static_libs/rg_etc/rg_etc2.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/static_libs/rg_etc/rg_etc1.h b/src/static_libs/rg_etc/rg_etc1.h
index 8a96cc52e3..275b0dbb3d 100644
--- a/src/static_libs/rg_etc/rg_etc1.h
+++ b/src/static_libs/rg_etc/rg_etc1.h
@@ -38,10 +38,10 @@ void rg_etc1_pack_block_init();
38unsigned int rg_etc1_pack_block(void* pETC1_block, const unsigned int* pSrc_pixels_BGRA, rg_etc1_pack_params *pack_params); 38unsigned int rg_etc1_pack_block(void* pETC1_block, const unsigned int* pSrc_pixels_BGRA, rg_etc1_pack_params *pack_params);
39 39
40// ETC2 support: RGB8_ETC2 40// ETC2 support: RGB8_ETC2
41void rg_etc2_rgb8_decode_block(const uint8_t *etc_block, uint32_t *bgra); 41void rg_etc2_rgb8_decode_block(const unsigned char *etc_block, unsigned int *bgra);
42 42
43// ETC2 support: RGBA8_ETC2_EAC 43// ETC2 support: RGBA8_ETC2_EAC
44void rg_etc2_rgba8_decode_block(const uint8_t *etc_block, uint32_t *bgra); 44void rg_etc2_rgba8_decode_block(const unsigned char *etc_block, unsigned int *bgra);
45 45
46//------------------------------------------------------------------------------ 46//------------------------------------------------------------------------------
47// 47//
diff --git a/src/static_libs/rg_etc/rg_etc2.c b/src/static_libs/rg_etc/rg_etc2.c
index 557184651b..537540d543 100644
--- a/src/static_libs/rg_etc/rg_etc2.c
+++ b/src/static_libs/rg_etc/rg_etc2.c
@@ -36,8 +36,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36#include <Eina.h> 36#include <Eina.h>
37#include "rg_etc1.h" 37#include "rg_etc1.h"
38 38
39void rg_etc2_rgb8_decode_block(const uint8_t *etc_block, uint32_t *bgra); 39void rg_etc2_rgb8_decode_block(const unsigned char *etc_block, unsigned int *bgra);
40void rg_etc2_rgba8_decode_block(const uint8_t *etc_block, uint32_t *bgra); 40void rg_etc2_rgba8_decode_block(const unsigned char *etc_block, unsigned int *bgra);
41 41
42typedef const uint8_t etc_block; 42typedef const uint8_t etc_block;
43 43
@@ -244,7 +244,7 @@ _TH_paint(const uint8_t *etc, uint32_t paint_colors[4], uint32_t *bgra)
244} 244}
245 245
246void 246void
247rg_etc2_rgb8_decode_block(const uint8_t *etc, uint32_t *bgra) 247rg_etc2_rgb8_decode_block(const unsigned char *etc, unsigned int *bgra)
248{ 248{
249 // Check differential mode bit 249 // Check differential mode bit
250 if ((etc[3] & 0x2) == 0) 250 if ((etc[3] & 0x2) == 0)