Update of /cvsroot/ufraw/ufraw
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3376
Modified Files:
ufraw.h ufraw_ufraw.c
Log Message:
Fix some redundant warnings that showed up.
Suppress some other warnings that are still relevant, but will be fixed later.
Index: ufraw.h
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw.h,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- ufraw.h 6 Nov 2009 06:42:03 -0000 1.133
+++ ufraw.h 8 Nov 2009 02:22:30 -0000 1.134
@@ -253,7 +253,7 @@
the validity of the respective subarea of the whole image. The subarea
sizes are determined by dividing the width by 4 and height by 8.
This field must always contain at least 32 bits. */
- long valid;
+ guint32 valid;
gboolean rgbg;
gboolean invalidate_event;
} ufraw_image_data;
Index: ufraw_ufraw.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_ufraw.c,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -d -r1.210 -r1.211
--- ufraw_ufraw.c 6 Nov 2009 06:42:03 -0000 1.210
+++ ufraw_ufraw.c 8 Nov 2009 02:22:30 -0000 1.211
@@ -1304,7 +1304,7 @@
#endif /* HAVE_LENSFUN */
int i;
- if (dbg && uf->Images[phase].valid != (long)0xffffffff)
+ if (dbg && uf->Images[phase].valid != 0xffffffff)
g_warning("%s->%s: conversion necessary (suboptimal).\n", dbg,
G_STRFUNC);
for (i = 0; i < 32; ++i) {
@@ -1330,14 +1330,15 @@
* pixbuf. That can be fixed but is suboptimal anyway. The best
* we can do is print a warning in case we need to finish the
* conversion and finish it here. */
- if (uf->Images[phase].valid != (long)0xffffffff) {
+ if (uf->Images[phase].valid != 0xffffffff) {
g_warning("%s: fixing unfinished conversion.\n", G_STRFUNC);
for (i = 0; i < 32; ++i)
ufraw_convert_image_area(uf, i, phase);
}
} else {
if (uf->Images[phase].valid == 0) {
- g_warning("%s: starting conversion.\n", G_STRFUNC);
+ // TODO: this warning should be avoided
+ //g_warning("%s: starting conversion.\n", G_STRFUNC);
/* this will update all buffer sizes (e.g. due to rotate) */
ufraw_convert_image_area(uf, 0, ufraw_first_phase);
}
@@ -1358,7 +1359,7 @@
* pixbuf. That can be fixed but is suboptimal anyway. The best
* we can do is print a warning in case we need to finish the
* conversion and finish it here. */
- if (uf->Images[phase].valid != (long)0xffffffff) {
+ if (uf->Images[phase].valid != 0xffffffff) {
g_warning("%s: fixing unfinished conversion.\n", G_STRFUNC);
int i;
for (i = 0; i < 32; ++i)
@@ -1366,7 +1367,8 @@
}
} else {
if (uf->Images[phase].valid == 0) {
- g_warning("%s: starting conversion.\n", G_STRFUNC);
+ // TODO: this warning should be avoided
+ //g_warning("%s: starting conversion.\n", G_STRFUNC);
/* this will update all buffer sizes (e.g. due to rotate) */
ufraw_convert_image_area(uf, 0, ufraw_first_phase);
}
@@ -1399,13 +1401,13 @@
switch (phase)
{
case ufraw_raw_phase:
- if (out->valid != (long)0xffffffff) {
+ if (out->valid != 0xffffffff) {
ufraw_convert_image_raw(uf, phase);
}
return out;
case ufraw_first_phase:
- if (out->valid != (long)0xffffffff) {
+ if (out->valid != 0xffffffff) {
ufraw_convert_image_first(uf, phase);
ufraw_rotate_image_buffer(&uf->Images[phase],
uf->conf->rotationAngle);
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
ufraw-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
