[x265] [PATCH] pixel.h and primitives.h, int replaced with intptr_t

[praveen at multicorewareinc.com]

# HG changeset patch
# User Praveen Tiwari
# Date 1384955240 -19800
# Node ID 7eb930dac6dc7d9df9bde995cdb5231abfb246f2
# Parent  ce1c38cd5e4373a6fe2d8df5bacd97536c7574c5
pixel.h and primitives.h, int replaced with intptr_t

diff -r ce1c38cd5e43 -r 7eb930dac6dc source/common/primitives.h
--- a/source/common/primitives.h	Wed Nov 20 18:45:32 2013 +0530
+++ b/source/common/primitives.h	Wed Nov 20 19:17:20 2013 +0530
@@ -218,7 +218,7 @@
 typedef void (*copy_ps_t)(int16_t *dst, intptr_t dstStride, pixel *src, intptr_t srcStride);
 
 typedef void (*pixel_sub_ps_t)(int16_t *dst, intptr_t dstride, pixel *src0, pixel *src1, intptr_t sstride0, intptr_t sstride1);
-typedef void (*pixel_add_ps_t)(pixel *a, int dstride, pixel *b0, int16_t *b1, int sstride0, int sstride1);
+typedef void (*pixel_add_ps_t)(pixel *a, intptr_t dstride, pixel *b0, int16_t *b1, intptr_t sstride0, intptr_t sstride1);
 
 /* Define a structure containing function pointers to optimized encoder
  * primitives.  Each pointer can reference either an assembly routine,
diff -r ce1c38cd5e43 -r 7eb930dac6dc source/common/x86/pixel.h
--- a/source/common/x86/pixel.h	Wed Nov 20 18:45:32 2013 +0530
+++ b/source/common/x86/pixel.h	Wed Nov 20 19:17:20 2013 +0530
@@ -285,7 +285,7 @@
 
 #define SETUP_CHROMA_PIXELSUB_PS_FUNC(W, H, cpu) \
     void x265_pixel_sub_ps_ ## W ## x ## H ## cpu(int16_t *dest, intptr_t destride, pixel *src0, pixel *src1, intptr_t srcstride0, intptr_t srcstride1);\
-    void x265_pixel_add_ps_ ## W ## x ## H ## cpu(pixel *dest, int destride, pixel *src0, int16_t *scr1, int srcStride0, int srcStride1);
+    void x265_pixel_add_ps_ ## W ## x ## H ## cpu(pixel *dest, intptr_t destride, pixel *src0, int16_t *scr1, intptr_t srcStride0, intptr_t srcStride1);
 
 #define CHROMA_PIXELSUB_DEF(cpu) \
     SETUP_CHROMA_PIXELSUB_PS_FUNC(4, 4, cpu); \
@@ -315,7 +315,7 @@
 
 #define SETUP_LUMA_PIXELSUB_PS_FUNC(W, H, cpu) \
     void x265_pixel_sub_ps_ ## W ## x ## H ## cpu(int16_t *dest, intptr_t destride, pixel *src0, pixel *src1, intptr_t srcstride0, intptr_t srcstride1);\
-    void x265_pixel_add_ps_ ## W ## x ## H ## cpu(pixel *dest, int destride, pixel *src0, int16_t *scr1, int srcStride0, int srcStride1);
+    void x265_pixel_add_ps_ ## W ## x ## H ## cpu(pixel *dest, intptr_t destride, pixel *src0, int16_t *scr1, intptr_t srcStride0, intptr_t srcStride1);
 
 #define LUMA_PIXELSUB_DEF(cpu) \
     SETUP_LUMA_PIXELSUB_PS_FUNC(4,   4, cpu); \