[Mplayer-cvslog] CVS: main/postproc rgb2rgb.c,1.21,1.22 rgb2rgb.h,1.8,1.9

[Nick Kurshev]

Update of /cvsroot/mplayer/main/postproc
In directory mplayer:/var/tmp.root/cvs-serv12664/main/postproc

Modified Files:
	rgb2rgb.c rgb2rgb.h 
Log Message:
More standards compilance

Index: rgb2rgb.c
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/rgb2rgb.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- rgb2rgb.c	5 Nov 2001 02:25:30 -0000	1.21
+++ rgb2rgb.c	5 Nov 2001 08:37:27 -0000	1.22
@@ -186,9 +186,9 @@
 /**
  * Pallete is assumed to contain bgr32
  */
-void palette8torgb32(uint8_t *src, uint8_t *dst, int num_pixels, uint8_t *palette)
+void palette8torgb32(const uint8_t *src, uint8_t *dst, uint32_t num_pixels, const uint8_t *palette)
 {
-	int i;
+	uint32_t i;
 	for(i=0; i<num_pixels; i++)
 		((uint32_t *)dst)[i] = ((uint32_t *)palette)[ src[i] ];
 }
@@ -196,9 +196,9 @@
 /**
  * Pallete is assumed to contain bgr32
  */
-void palette8torgb24(uint8_t *src, uint8_t *dst, int num_pixels, uint8_t *palette)
+void palette8torgb24(const uint8_t *src, uint8_t *dst, uint32_t num_pixels, const uint8_t *palette)
 {
-	int i;
+	uint32_t i;
 /*
 	writes 1 byte o much and might cause alignment issues on some architectures?
 	for(i=0; i<num_pixels; i++)
@@ -214,9 +214,9 @@
 	}
 }
 
-void rgb32to16(uint8_t *src, uint8_t *dst, int num_pixels)
+void rgb32to16(const uint8_t *src, uint8_t *dst, uint32_t num_pixels)
 {
-	int i;
+	uint32_t i;
 	for(i=0; i<num_pixels; i+=4)
 	{
 		const int b= src[i+0];
@@ -227,9 +227,9 @@
 	}
 }
 
-void rgb32to15(uint8_t *src, uint8_t *dst, int num_pixels)
+void rgb32to15(const uint8_t *src, uint8_t *dst, uint32_t num_pixels)
 {
-	int i;
+	uint32_t i;
 	for(i=0; i<num_pixels; i+=4)
 	{
 		const int b= src[i+0];
@@ -244,9 +244,9 @@
 /**
  * Palette is assumed to contain bgr16, see rgb32to16 to convert the palette
  */
-void palette8torgb16(uint8_t *src, uint8_t *dst, int num_pixels, uint8_t *palette)
+void palette8torgb16(const uint8_t *src, uint8_t *dst, uint32_t num_pixels, const uint8_t *palette)
 {
-	int i;
+	uint32_t i;
 	for(i=0; i<num_pixels; i++)
 		((uint16_t *)dst)[i] = ((uint16_t *)palette)[ src[i] ];
 }
@@ -254,9 +254,9 @@
 /**
  * Pallete is assumed to contain bgr15, see rgb32to15 to convert the palette
  */
-void palette8torgb15(uint8_t *src, uint8_t *dst, int num_pixels, uint8_t *palette)
+void palette8torgb15(const uint8_t *src, uint8_t *dst, uint32_t num_pixels, const uint8_t *palette)
 {
-	int i;
+	uint32_t i;
 	for(i=0; i<num_pixels; i++)
 		((uint16_t *)dst)[i] = ((uint16_t *)palette)[ src[i] ];
 }
@@ -264,7 +264,7 @@
  *
  * num_pixels must be a multiple of 16 for the MMX version
  */
-void yv12toyuy2(uint8_t *ysrc, uint8_t *usrc, uint8_t *vsrc, uint8_t *dst, int num_pixels)
+void yv12toyuy2(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst, uint32_t num_pixels)
 {
 #ifdef HAVE_MMX
 	asm volatile(
@@ -315,7 +315,7 @@
 #endif
 }
 
-void yuy2toyv12(uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst, int num_pixels)
+void yuy2toyv12(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst, uint32_t num_pixels)
 {
 #ifdef HAVE_MMX
 	asm volatile(

Index: rgb2rgb.h
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/rgb2rgb.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rgb2rgb.h	5 Nov 2001 01:21:05 -0000	1.8
+++ rgb2rgb.h	5 Nov 2001 08:37:27 -0000	1.9
@@ -10,16 +10,16 @@
 extern void rgb24to32(const uint8_t *src,uint8_t *dst,uint32_t src_size);
 extern void rgb32to24(const uint8_t *src,uint8_t *dst,uint32_t src_size);
 extern void rgb15to16(const uint8_t *src,uint8_t *dst,uint32_t src_size);
+extern void rgb32to16(const uint8_t *src,uint8_t *dst,uint32_t num_pixels);
+extern void rgb32to15(const uint8_t *src,uint8_t *dst,uint32_t num_pixels);
 
-void rgb32to16(uint8_t *src, uint8_t *dst, int num_pixels);
-void rgb32to15(uint8_t *src, uint8_t *dst, int num_pixels);
-void palette8torgb32(uint8_t *src, uint8_t *dst, int num_pixels, uint8_t *palette);
-void palette8torgb16(uint8_t *src, uint8_t *dst, int num_pixels, uint8_t *palette);
-void palette8torgb15(uint8_t *src, uint8_t *dst, int num_pixels, uint8_t *palette);
-void palette8torgb24(uint8_t *src, uint8_t *dst, int num_pixels, uint8_t *palette);
+extern void palette8torgb32(const uint8_t *src, uint8_t *dst, uint32_t num_pixels, const uint8_t *palette);
+extern void palette8torgb16(const uint8_t *src, uint8_t *dst, uint32_t num_pixels, const uint8_t *palette);
+extern void palette8torgb15(const uint8_t *src, uint8_t *dst, uint32_t num_pixels, const uint8_t *palette);
+extern void palette8torgb24(const uint8_t *src, uint8_t *dst, uint32_t num_pixels, const uint8_t *palette);
 
-void yv12toyuy2(uint8_t *ysrc, uint8_t *usrc, uint8_t *vsrc, uint8_t *dst, int num_pixels);
-void yuy2toyv12(uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst, int num_pixels);
+extern void yv12toyuy2(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst, uint32_t num_pixels);
+extern void yuy2toyv12(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst, uint32_t num_pixels);
 
 
 #endif