Sophie

Sophie

distrib > Mandriva > current > i586 > media > contrib-release-src > by-pkgid > 5cf4aec45c3984489869f4b47b986b29 > files > 2

rawstudio-1.2-4mdv2010.1.src.rpm

backported from upstream revision 2534
http://bugzilla.rawstudio.org/show_bug.cgi?id=259

diff -ru rawstudio-1.2.orig/src/dcraw.cc rawstudio-1.2/src/dcraw.cc
--- rawstudio-1.2.orig/src/dcraw.cc	2009-08-08 09:09:30.000000000 +0200
+++ rawstudio-1.2/src/dcraw.cc	2009-08-08 09:11:07.000000000 +0200
@@ -8446,7 +8446,7 @@
   static int user_qual=-1, user_black=-1, user_sat=-1, user_flip=-1;
   static int use_fuji_rotate=1, write_to_stdout=0, quality, i, c;
   static char opm, opt, *ofname, *cp, *bpfile=0;
-  static const char *sp, *dark_frame=0, *write_ext;
+  static const char *dark_frame=0, *write_ext;
   static struct utimbuf ut;
   static FILE *ofp;
 #ifndef NO_LCMS
@@ -8510,8 +8510,9 @@
   argv[argc] = "";
   for (arg=1; (((opm = argv[arg][0]) - 2) | 2) == '+'; ) {
     opt = argv[arg++][1];
-    if ((cp = strchr (sp="nbrkStqmHACg", opt)))
-      for (i=0; i < "114111111422"[cp-sp]-'0'; i++)
+	  /* creates warning on newer gcc's - doesn't matter, we'll never call main() */
+//    if ((cp = strchr (sp="nbrkStqmHACg", opt)))
+//      for (i=0; i < "114111111422"[cp-sp]-'0'; i++)
 	if (!isdigit(argv[arg+i][0])) {
 	  dcraw_message (DCRAW_ERROR,_("Non-numeric argument to \"-%c\"\n"), opt);
 	  return 1;