Changeset e1c0a5c02b0d1a564aba82c4e133b5e000c5a700

Show
Ignore:
Timestamp:
24/10/03 16:13:59 (5 years ago)
Author:
Sam Hocevar <sam@videolan.org>
git-committer:
Sam Hocevar <sam@videolan.org> 1067004839 +0000
git-parent:

[f581e336a959ce4c1b1d0fe7e004fcce7953df3d]

git-author:
Sam Hocevar <sam@videolan.org> 1067004839 +0000
Message:
  • modules/misc/freetype.c: Compilation fixes.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/misc/freetype.c

    r9ed7b9f re1c0a5c  
    33 ***************************************************************************** 
    44 * Copyright (C) 2002, 2003 VideoLAN 
    5  * $Id: freetype.c,v 1.26 2003/10/24 11:28:57 sam Exp $ 
     5 * $Id: freetype.c,v 1.27 2003/10/24 14:13:59 sam Exp $ 
    66 * 
    77 * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no> 
    …… 
    3232#include <osd.h> 
    3333#include <math.h> 
    34   
     34 
     35#ifdef HAVE_ERRNO_H 
     36#   include <errno.h> 
     37#endif 
     38 
    3539#include <ft2build.h> 
    3640#include FT_FREETYPE_H 
    …… 
    720724        goto error; 
    721725    } 
    722     { 
    723         char *p_in_buffer; 
    724         uint32_t *p_out_buffer; 
     726 
     727    { 
     728        char *p_in_buffer, *p_out_buffer; 
    725729        int i_in_bytes, i_out_bytes, i_out_bytes_left, i_ret; 
    726730        i_in_bytes = strlen( psz_string ); 
    …… 
    728732        i_out_bytes_left = i_out_bytes; 
    729733        p_in_buffer = psz_string; 
    730         p_out_buffer = p_unicode_string; 
    731         i_ret = iconv( iconv_handle, &p_in_buffer, &i_in_bytes, (char**)&p_out_buffer, &i_out_bytes_left ); 
     734        p_out_buffer = (char *)p_unicode_string; 
     735        i_ret = iconv( iconv_handle, &p_in_buffer, &i_in_bytes, &p_out_buffer, &i_out_bytes_left ); 
    732736        if( i_in_bytes ) 
    733737        { 
    …… 
    735739            goto error; 
    736740        } 
    737         *p_out_buffer = 0; 
     741        *(uint32_t*)p_out_buffer = 0; 
    738742        i_string_length = ( i_out_bytes - i_out_bytes_left ) / sizeof(uint32_t); 
    739743    }