summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Muizelaar <jmuizelaar@mozilla.com>2009-11-06 19:05:29 -0500
committerJeff Muizelaar <jmuizelaar@mozilla.com>2010-02-18 15:01:35 -0500
commitf8e37ec9fb21386e757003d55e040c34f6c5d4ea (patch)
tree6feef64b505cddd37b2b0e1ebb269097399b8c0a
parent5e77549bb4a8e7ec0e2adc5d7b8bd4f257e9507b (diff)
Warning fixes from timeless.
These are from https://bugzilla.mozilla.org/show_bug.cgi?id=491195
-rw-r--r--iccread.c8
-rw-r--r--transform.c20
2 files changed, 14 insertions, 14 deletions
diff --git a/iccread.c b/iccread.c
index 2b9926d..d68bb26 100644
--- a/iccread.c
+++ b/iccread.c
@@ -200,7 +200,7 @@ struct tag_index {
static struct tag_index read_tag_table(qcms_profile *profile, struct mem_source *mem)
{
struct tag_index index = {0, NULL};
- int i;
+ unsigned int i;
index.count = read_u32(mem, 128);
if (index.count > MAX_TAG_COUNT) {
@@ -297,7 +297,7 @@ qcms_bool qcms_profile_is_bogus(qcms_profile *profile)
static struct tag *find_tag(struct tag_index index, uint32_t tag_id)
{
- int i;
+ unsigned int i;
struct tag *tag = NULL;
for (i = 0; i < index.count; i++) {
if (index.tags[i].signature == tag_id) {
@@ -314,7 +314,7 @@ static struct tag *find_tag(struct tag_index index, uint32_t tag_id)
static struct XYZNumber read_tag_XYZType(struct mem_source *src, struct tag_index index, uint32_t tag_id)
{
- struct XYZNumber num = {0};
+ struct XYZNumber num = {0, 0, 0};
struct tag *tag = find_tag(index, tag_id);
if (tag) {
uint32_t offset = tag->offset;
@@ -339,7 +339,7 @@ static struct curveType *read_tag_curveType(struct mem_source *src, struct tag_i
uint32_t offset = tag->offset;
uint32_t type = read_u32(src, offset);
uint32_t count = read_u32(src, offset+8);
- int i;
+ unsigned int i;
if (type != CURVE_TYPE) {
invalid_source(src, "unexpected type, expected CURV");
diff --git a/transform.c b/transform.c
index 6ba0ef7..727622c 100644
--- a/transform.c
+++ b/transform.c
@@ -651,7 +651,7 @@ static void qcms_transform_data_rgb_out_pow(qcms_transform *transform, unsigned
static void qcms_transform_data_gray_out_lut(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
{
- int i;
+ unsigned int i;
for (i = 0; i < length; i++) {
float out_device_r, out_device_g, out_device_b;
unsigned char device = *src++;
@@ -676,7 +676,7 @@ static void qcms_transform_data_gray_out_lut(qcms_transform *transform, unsigned
static void qcms_transform_data_graya_out_lut(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
{
- int i;
+ unsigned int i;
for (i = 0; i < length; i++) {
float out_device_r, out_device_g, out_device_b;
unsigned char device = *src++;
@@ -698,7 +698,7 @@ static void qcms_transform_data_graya_out_lut(qcms_transform *transform, unsigne
static void qcms_transform_data_gray_out_precache(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
{
- int i;
+ unsigned int i;
for (i = 0; i < length; i++) {
unsigned char device = *src++;
uint16_t gray;
@@ -716,7 +716,7 @@ static void qcms_transform_data_gray_out_precache(qcms_transform *transform, uns
static void qcms_transform_data_graya_out_precache(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
{
- int i;
+ unsigned int i;
for (i = 0; i < length; i++) {
unsigned char device = *src++;
unsigned char alpha = *src++;
@@ -806,7 +806,7 @@ void qcms_transform_data_rgb_out_lut_sse_intrin(qcms_transform *transform, unsig
static void qcms_transform_data_rgb_out_lut_sse(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
{
- int i;
+ unsigned int i;
float (*mat)[4] = transform->matrix;
char input_back[32];
/* Ensure we have a buffer that's 16 byte aligned regardless of the original
@@ -944,7 +944,7 @@ static void qcms_transform_data_rgb_out_lut_sse(qcms_transform *transform, unsig
static void qcms_transform_data_rgba_out_lut_sse(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
{
- int i;
+ unsigned int i;
float (*mat)[4] = transform->matrix;
char input_back[32];
/* align input on 16 byte boundary */
@@ -1082,7 +1082,7 @@ static void qcms_transform_data_rgba_out_lut_sse(qcms_transform *transform, unsi
static void qcms_transform_data_rgb_out_lut_precache(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
{
- int i;
+ unsigned int i;
float (*mat)[4] = transform->matrix;
for (i = 0; i < length; i++) {
unsigned char device_r = *src++;
@@ -1115,7 +1115,7 @@ static void qcms_transform_data_rgb_out_lut_precache(qcms_transform *transform,
static void qcms_transform_data_rgba_out_lut_precache(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
{
- int i;
+ unsigned int i;
float (*mat)[4] = transform->matrix;
for (i = 0; i < length; i++) {
unsigned char device_r = *src++;
@@ -1150,7 +1150,7 @@ static void qcms_transform_data_rgba_out_lut_precache(qcms_transform *transform,
static void qcms_transform_data_rgb_out_lut(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
{
- int i;
+ unsigned int i;
float (*mat)[4] = transform->matrix;
for (i = 0; i < length; i++) {
unsigned char device_r = *src++;
@@ -1182,7 +1182,7 @@ static void qcms_transform_data_rgb_out_lut(qcms_transform *transform, unsigned
static void qcms_transform_data_rgba_out_lut(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
{
- int i;
+ unsigned int i;
float (*mat)[4] = transform->matrix;
for (i = 0; i < length; i++) {
unsigned char device_r = *src++;