jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=69cbfc75304de7ea5c8b30285d3338648f0ebe35
commit 69cbfc75304de7ea5c8b30285d3338648f0ebe35 Author: Jean-Philippe Andre <[email protected]> Date: Wed May 28 12:04:36 2014 +0900 Evas rg_etc2: Fix Windows build Use unsigned char/int instead of stdint in the header file. --- src/static_libs/rg_etc/rg_etc1.h | 4 ++-- src/static_libs/rg_etc/rg_etc2.c | 6 +++--- 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 8a96cc5..275b0db 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(); 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); //------------------------------------------------------------------------------ // diff --git a/src/static_libs/rg_etc/rg_etc2.c b/src/static_libs/rg_etc/rg_etc2.c index 5571846..537540d 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. #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) --
