hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-27 19:24:06 +00:00
Code Issues Actions Projects Releases Wiki Activity

Fix compiler warnings for VS2010 /W4 in picture.c.

Browse source 
- Working towards issue #11.
This commit is contained in:
Ari Koivula 2014-02-10 16:48:50 +02:00
parent 6dbae48268
commit e66fe65f8b
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/picture.c
View file

@ -101,9 +101,6 @@ void picture_blit_pixels(const pixel *orig, pixel *dst,
{ {
unsigned y, x; unsigned y, x;
const pixel *borig = orig;
const pixel *bdst = dst;
for (y = 0; y < height; ++y) { for (y = 0; y < height; ++y) {
for (x = 0; x < width; ++x) { for (x = 0; x < width; ++x) {
dst[x] = orig[x]; dst[x] = orig[x];
@ -163,7 +160,7 @@ picture_list * picture_list_init(int size)
* \param size new array size * \param size new array size
* \return 1 on success, 0 on failure * \return 1 on success, 0 on failure
*/ */
int picture_list_resize(picture_list *list, int size) int picture_list_resize(picture_list *list, unsigned size)
{ {
unsigned int i; unsigned int i;
picture** old_pics = NULL; picture** old_pics = NULL;
@ -243,12 +240,12 @@ int picture_list_add(picture_list *list,picture* pic)
* \param picture_list list to use * \param picture_list list to use
* \return 1 on success * \return 1 on success
*/ */
int picture_list_rem(picture_list *list, int n, int8_t destroy) int picture_list_rem(picture_list *list, unsigned n, int8_t destroy)
{ {
int i; int i;
// Must be within list boundaries // Must be within list boundaries
if ((unsigned)n >= list->used_size) if (n >= list->used_size)
{ {
return 0; return 0;
} }
@ -264,7 +261,7 @@ int picture_list_rem(picture_list *list, int n, int8_t destroy)
list->used_size--; list->used_size--;
} else { } else {
// Shift all following pics one backward in the list // Shift all following pics one backward in the list
for (i = n; (unsigned)n < list->used_size - 1; ++n) { for (i = n; n < list->used_size - 1; ++n) {
list->pics[n] = list->pics[n + 1]; list->pics[n] = list->pics[n + 1];
} }
list->pics[list->used_size - 1] = NULL; list->pics[list->used_size - 1] = NULL;

4
src/picture.h
View file

@ -165,10 +165,10 @@ void picture_blit_pixels(const pixel* orig, pixel *dst,
unsigned orig_stride, unsigned dst_stride); unsigned orig_stride, unsigned dst_stride);
picture_list * picture_list_init(int size); picture_list * picture_list_init(int size);
int picture_list_resize(picture_list *list, int size); int picture_list_resize(picture_list *list, unsigned size);
int picture_list_destroy(picture_list *list); int picture_list_destroy(picture_list *list);
int picture_list_add(picture_list *list, picture *pic); int picture_list_add(picture_list *list, picture *pic);
int picture_list_rem(picture_list *list, int n, int8_t destroy); int picture_list_rem(picture_list *list, unsigned n, int8_t destroy);
typedef unsigned (*cost_16bit_nxn_func)(pixel *block1, pixel *block2); typedef unsigned (*cost_16bit_nxn_func)(pixel *block1, pixel *block2);