[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/extragear/kde3/libs/libkdcraw
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2009-01-16 19:31:47
Message-ID: 1232134307.617149.6351.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 912142 by cgilles:

libkdcraw from KDE3 branch: updated internal LibRaw to 0.6.9


 M  +3 -0      NEWS  
 M  +9 -8      libraw/internal/dcraw_common.cpp  
 M  +1 -1      libraw/internal/defines.h  
 M  +1 -1      libraw/internal/foveon.cpp  
 M  +1 -1      libraw/libraw/libraw_version.h  


--- branches/extragear/kde3/libs/libkdcraw/NEWS #912141:912142
@@ -1,6 +1,9 @@
 0.1.8
 ------------------------------------------------------------------------
 Fix PPM color preview extraction.
+Updated to libraw 0.6.9:
+ - Better support for Samsung S85.
+ - Fixed possible integer overflow in wavelet denoising code.
 Updated to libraw 0.6.8:
  - Changes in QuickTake 100 files processing.
 Updated to libraw 0.6.7:
--- branches/extragear/kde3/libs/libkdcraw/libraw/internal/dcraw_common.cpp #912141:912142
@@ -1,6 +1,6 @@
 /* 
    GENERATED FILE, DO NOT EDIT
-   Generated from dcraw/dcraw.c at Wed Jan 14 09:49:32 2009
+   Generated from dcraw/dcraw.c at Fri Jan 16 12:04:06 2009
    Look into original file (probably http://cybercom.net/~dcoffin/dcraw/dcraw.c)
    for copyright information.
 */
@@ -2854,7 +2854,7 @@
   if ((nc = colors) == 3 && filters) nc++;
   FORC(nc) {			/* denoise R,G1,B,G3 individually */
     for (i=0; i < size; i++)
-        fimg[i] = sqrt((double)((unsigned) (image[i][c] << (scale+16))));
+        fimg[i] = 256 * sqrt((double)(image[i][c] << scale));
     for (hpass=lev=0; lev < 5; lev++) {
       lpass = size*((lev & 1)+1);
       for (row=0; row < iheight; row++) {
@@ -2935,7 +2935,7 @@
     FORC(nc) {			/* denoise R,G1,B,G3 individually */
 #pragma omp for 
       for (i=0; i < size; i++)
-	fimg[i] = sqrt((unsigned) (image[i][c] << (scale+16)));
+          fimg[i] = 256 * sqrt((double)(image[i][c] << scale));
       for (hpass=lev=0; lev < 5; lev++) {
 	lpass = size*((lev & 1)+1);
 #pragma omp for 
@@ -5991,6 +5991,7 @@
     {  6114240, "PENTAX",   "Optio S4"        ,1 },  /* or S4i, CASIO EX-Z4 */
     { 10702848, "PENTAX",   "Optio 750Z"      ,1 },
     { 16098048, "SAMSUNG",  "S85"             ,1 },
+    { 16215552, "SAMSUNG",  "S85"             ,1 },
     { 12582980, "Sinar",    ""                ,0 },
     { 33292868, "Sinar",    ""                ,0 },
     { 44390468, "Sinar",    ""                ,0 } };
@@ -6673,10 +6674,10 @@
   } else if (!strcmp(model,"S85")) {
     height = 2448;
     width  = 3264;
-    raw_width = 3288;
+    raw_width = fsize/height/2;
     order = 0x4d4d;
     load_raw = &CLASS unpacked_load_raw;
-    maximum = 0xfef8;
+    maximum = 0xffff;
   } else if (!strcmp(model,"STV680 VGA")) {
     height = 484;
     width  = 644;
@@ -7272,7 +7273,7 @@
   if (strcmp (input, "embed"))
     hInProfile = cmsOpenProfileFromFile (input, "r");
   else if (profile_length) {
-#line 8415 "dcraw/dcraw.c"
+#line 8416 "dcraw/dcraw.c"
 hInProfile = cmsOpenProfileFromMem (imgdata.color.profile, profile_length); 
   } else
       {
@@ -7422,7 +7423,7 @@
 
 #endif
 memset(histogram,0,sizeof(int)*LIBRAW_HISTOGRAM_SIZE*4); 
-#line 8567 "dcraw/dcraw.c"
+#line 8568 "dcraw/dcraw.c"
   for (img=image[0], row=0; row < height; row++)
     for (col=0; col < width; col++, img+=4) {
       if (!raw_color) {
@@ -7563,7 +7564,7 @@
 }
 
 
-#line 8732 "dcraw/dcraw.c"
+#line 8733 "dcraw/dcraw.c"
 void CLASS tiff_set (ushort *ntag,
 	ushort tag, ushort type, int count, int val)
 {
--- branches/extragear/kde3/libs/libkdcraw/libraw/internal/defines.h #912141:912142
@@ -1,6 +1,6 @@
 /* 
    GENERATED FILE, DO NOT EDIT
-   Generated from dcraw/dcraw.c at Wed Jan 14 09:49:32 2009
+   Generated from dcraw/dcraw.c at Fri Jan 16 12:04:06 2009
    Look into original file (probably http://cybercom.net/~dcoffin/dcraw/dcraw.c)
    for copyright information.
 */
--- branches/extragear/kde3/libs/libkdcraw/libraw/internal/foveon.cpp #912141:912142
@@ -1,6 +1,6 @@
 /* 
    GENERATED FILE, DO NOT EDIT
-   Generated from dcraw/dcraw.c at Wed Jan 14 09:49:32 2009
+   Generated from dcraw/dcraw.c at Fri Jan 16 12:04:06 2009
    Look into original file (probably http://cybercom.net/~dcoffin/dcraw/dcraw.c)
    for copyright information.
 */
--- branches/extragear/kde3/libs/libkdcraw/libraw/libraw/libraw_version.h #912141:912142
@@ -26,7 +26,7 @@
 
 #define LIBRAW_MAJOR_VERSION  0
 #define LIBRAW_MINOR_VERSION  6
-#define LIBRAW_PATCH_VERSION  8
+#define LIBRAW_PATCH_VERSION  9
 #define LIBRAW_VERSION_TAIL   Release
 
 #define _LIBRAW_VERSION_MAKE(a,b,c,d) #a"."#b"."#c"-"#d
[prev in list] [next in list] [prev in thread] [next in thread]