projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into opengl-es-v2
[mesa.git]
/
src
/
gallium
/
auxiliary
/
util
/
u_rect.c
diff --git
a/src/gallium/auxiliary/util/u_rect.c
b/src/gallium/auxiliary/util/u_rect.c
index 298fbacecbae7c09411cf6b32e9bd55ab856cb2f..8479161c74494b18c37170e431fe6f345517ae89 100644
(file)
--- a/
src/gallium/auxiliary/util/u_rect.c
+++ b/
src/gallium/auxiliary/util/u_rect.c
@@
-41,7
+41,7
@@
/**
* Copy 2D rect from one place to another.
* Position and sizes are in pixels.
/**
* Copy 2D rect from one place to another.
* Position and sizes are in pixels.
- * src_
pitch
may be negative to do vertical flip of pixels from source.
+ * src_
stride
may be negative to do vertical flip of pixels from source.
*/
void
util_copy_rect(ubyte * dst,
*/
void
util_copy_rect(ubyte * dst,
@@
-54,7
+54,7
@@
util_copy_rect(ubyte * dst,
const ubyte * src,
int src_stride,
unsigned src_x,
const ubyte * src,
int src_stride,
unsigned src_x,
-
int
src_y)
+
unsigned
src_y)
{
unsigned i;
int src_stride_pos = src_stride < 0 ? -src_stride : src_stride;
{
unsigned i;
int src_stride_pos = src_stride < 0 ? -src_stride : src_stride;
@@
-65,10
+65,6
@@
util_copy_rect(ubyte * dst,
assert(blocksize > 0);
assert(blockwidth > 0);
assert(blockheight > 0);
assert(blocksize > 0);
assert(blockwidth > 0);
assert(blockheight > 0);
- assert(src_x >= 0);
- assert(src_y >= 0);
- assert(dst_x >= 0);
- assert(dst_y >= 0);
dst_x /= blockwidth;
dst_y /= blockheight;
dst_x /= blockwidth;
dst_y /= blockheight;
@@
-113,8
+109,6
@@
util_fill_rect(ubyte * dst,
assert(blocksize > 0);
assert(blockwidth > 0);
assert(blockheight > 0);
assert(blocksize > 0);
assert(blockwidth > 0);
assert(blockheight > 0);
- assert(dst_x >= 0);
- assert(dst_y >= 0);
dst_x /= blockwidth;
dst_y /= blockheight;
dst_x /= blockwidth;
dst_y /= blockheight;