|
Line
Link Here
|
| 0 |
-- ufraw-0.11.orig/configure.ac |
0 |
++ ufraw-0.11/configure.ac |
|
Lines 185-196
Link Here
|
| 185 |
AC_MSG_RESULT($with_exiv2) |
185 |
AC_MSG_RESULT($with_exiv2) |
| 186 |
have_exiv2=no |
186 |
have_exiv2=no |
| 187 |
if test $with_exiv2 = yes; then |
187 |
if test $with_exiv2 = yes; then |
| 188 |
AC_CHECK_PROGS(EXIV2_CONFIG, exiv2-config, , $PATH) |
188 |
PKG_CHECK_MODULES(EXIV2, exiv2, |
| 189 |
if test -n "$EXIV2_CONFIG"; then |
189 |
[ have_exiv2=yes |
| 190 |
have_exiv2=yes |
190 |
AC_DEFINE(HAVE_EXIV2, 1, have exiv2)], |
| 191 |
AC_DEFINE(HAVE_EXIV2, 1, have exiv2) |
191 |
AC_MSG_RESULT($EXIV2_PKG_ERRORS)) |
| 192 |
EXIV2_LIBS=`$EXIV2_CONFIG --libs` |
|
|
| 193 |
fi |
| 194 |
fi |
192 |
fi |
| 195 |
|
193 |
|
| 196 |
UFRAW_CFLAGS="$UFRAW_CFLAGS $EXIF_CFLAGS $GIMP_CFLAGS $GTK_CFLAGS $GLIB_CFLAGS $LCMS_CFLAGS" |
194 |
UFRAW_CFLAGS="$UFRAW_CFLAGS $EXIF_CFLAGS $GIMP_CFLAGS $GTK_CFLAGS $GLIB_CFLAGS $LCMS_CFLAGS" |
| 197 |
-- ufraw-0.11.orig/nikon_curve.c |
195 |
++ ufraw-0.11/nikon_curve.c |
|
Lines 110-116
Link Here
|
| 110 |
printf("NOTE: If a resolution is not specified, a default one will be used.\n"); |
110 |
printf("NOTE: If a resolution is not specified, a default one will be used.\n"); |
| 111 |
printf(" If the -o option is not specified, default files will be used.\n\n"); |
111 |
printf(" If the -o option is not specified, default files will be used.\n\n"); |
| 112 |
printf("Example:\n"); |
112 |
printf("Example:\n"); |
| 113 |
printf("NikonCurveGenerator -sr 65536 -or 256 curveFile -o exportFile\n"); |
113 |
printf("%s -sr 65536 -or 256 curveFile -o exportFile\n", args[0]); |
| 114 |
|
114 |
|
| 115 |
//signal that processing cannot occur |
115 |
//signal that processing cannot occur |
| 116 |
return NC_ERROR; |
116 |
return NC_ERROR; |
| 117 |
-- ufraw-0.11.orig/ufraw_exiv2.cc |
117 |
++ ufraw-0.11/ufraw_exiv2.cc |
|
Lines 201-207
Link Here
|
| 201 |
} |
201 |
} |
| 202 |
catch (Exiv2::AnyError& e) { |
202 |
catch (Exiv2::AnyError& e) { |
| 203 |
std::cerr.rdbuf(savecerr); |
203 |
std::cerr.rdbuf(savecerr); |
| 204 |
ufraw_message(UFRAW_SET_WARNING, "%s\n", e.what().c_str()); |
204 |
ufraw_message(UFRAW_SET_WARNING, "%s\n", e.what()); |
| 205 |
return UFRAW_ERROR; |
205 |
return UFRAW_ERROR; |
| 206 |
} |
206 |
} |
| 207 |
|
207 |
|
