[vlc-devel] commit: Rename Kate Function to avoid naming conflicts with GDI+ on windows targets . (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Aug 11 14:29:23 2008 -0700| [59bd93a80ccc406e8f665d99da5c118fdbbf5c4f] | committer: Jean-Baptiste Kempf 

Rename Kate Function to avoid naming conflicts with GDI+ on windows targets.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=59bd93a80ccc406e8f665d99da5c118fdbbf5c4f
---

 modules/codec/kate.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/codec/kate.c b/modules/codec/kate.c
index 8eece1e..09f2ed2 100644
--- a/modules/codec/kate.c
+++ b/modules/codec/kate.c
@@ -473,7 +473,7 @@ static void GetVideoSize( decoder_t *p_dec, int *w, int *h )
 
 #ifdef ENABLE_BITMAPS
 
-static void CreateBitmap( picture_t *pic, const kate_bitmap *bitmap )
+static void CreateKateBitmap( picture_t *pic, const kate_bitmap *bitmap )
 {
     size_t y;
 
@@ -485,7 +485,7 @@ static void CreateBitmap( picture_t *pic, const kate_bitmap *bitmap )
     }
 }
 
-static void CreatePalette( video_palette_t *fmt_palette, const kate_palette *palette )
+static void CreateKatePalette( video_palette_t *fmt_palette, const kate_palette *palette )
 {
     size_t n;
 
@@ -639,10 +639,10 @@ static subpicture_t *DecodePacket( decoder_t *p_dec, kate_packet *p_kp, block_t
         }
 
         /* create the palette */
-        CreatePalette( fmt.p_palette, ev->palette );
+        CreateKatePalette( fmt.p_palette, ev->palette );
 
         /* create the bitmap */
-        CreateBitmap( &p_bitmap_region->picture, ev->bitmap );
+        CreateKateBitmap( &p_bitmap_region->picture, ev->bitmap );
 
         msg_Dbg(p_dec, "Created bitmap, %zux%zu, %zu colors\n", ev->bitmap->width, ev->bitmap->height, ev->palette->ncolors);
     }